From ed70b5d604c8a0d1239d5d2bac267d98fbdbd707 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Tue, 02 Oct 2012 21:38:19 -0400
Subject: Update packaging to SPF 2.0.

---
diff --git a/build b/build
index 6cc5a80..d64d859 100755
--- a/build
+++ b/build
@@ -1,18 +1,28 @@
 #! /usr/bin/make -f
 
-PKGS = xmlwf xmlwf-doc libexpat.1 libexpat.1-dev libexpat.1-dbg
+build-arch:
+	cd src && \
+		./configure --prefix=/usr \
+		--build=$${OB_BUILD_ARCH_GNU} --host=$${OB_HOST_ARCH_GNU} && \
+		make
 
-$(PKGS): expat.buildstamp
+install-arch:
+	cd src && \
+		make DESTDIR="$$(pwd)/../dest" install-exec && \
+		cd ..
+	oh-strip -g
+	oh-installfiles -B
 
-.SILENT: expat.buildstamp
-expat.buildstamp:
+build-indep:
 	cd src && \
-		./configure --prefix=/usr \
-		--build=$${OH_BUILD_ARCH_GNU} --host=$${OH_HOST_ARCH_GNU} && \
-		make && make DESTDIR=$$(pwd)/../dest install
-	oh-strip -gl /usr/lib/libexpat.so.1.6.0
-	oh-installfiles $(PKGS)
-	oh-installdocs libexpat.1
-	oh-gencontrol $(PKGS)
-	oh-buildopk $(PKGS)
-	touch expat.buildstamp
+		./configure --prefix=/usr
+
+install-indep:
+	cd src && \
+		make DESTDIR="$$(pwd)/../dest" install-data && \
+		cd ..
+	oh-installfiles -A
+
+build: build-arch build-indep
+
+install: install-arch install-indep
diff --git a/changelog b/changelog
index 8cae380..8a08e25 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+expat (2.1.0-2) dev/trunk
+
+  * Update to SPF 2.0.
+
+ -- P. J. McDermott <pjm@nac.net>  Tue, 02 Oct 2012 21:01:23 -0400
+
 expat (2.1.0-1)
 
   * Initial release.
diff --git a/control b/control
index 6677d02..23df385 100644
--- a/control
+++ b/control
@@ -1,4 +1,2 @@
-Source: expat
-Version: 2.1.0-1
 Maintainer: "P. J. McDermott" <pjm@nac.net>
 Homepage: http://expat.sourceforge.net/
diff --git a/format b/format
index d3827e7..cd5ac03 100644
--- a/format
+++ b/format
@@ -1 +1 @@
-1.0
+2.0
diff --git a/libexpat.1-dbg.pkg/control b/libexpat.1-dbg.pkg/control
index f51d2c0..3e1f970 100644
--- a/libexpat.1-dbg.pkg/control
+++ b/libexpat.1-dbg.pkg/control
@@ -1,5 +1,5 @@
-Package: libexpat.1-dbg
 Architecture: any
+Platform: all
 Depends: libexpat.1 (= 2.1.0-1)
 Description: XML parser library - debugging symbols
  Expat is an XML parser library written in C. It is a stream-oriented parser in
diff --git a/libexpat.1-dev.pkg/control b/libexpat.1-dev.pkg/control
index 2b347cc..4ae2a5f 100644
--- a/libexpat.1-dev.pkg/control
+++ b/libexpat.1-dev.pkg/control
@@ -1,5 +1,5 @@
-Package: libexpat.1-dev
 Architecture: any
+Platform: all
 Depends: libexpat.1 (= 2.1.0-1)
 Description: XML parser library - development files
  Expat is an XML parser library written in C. It is a stream-oriented parser in
diff --git a/libexpat.1.pkg/control b/libexpat.1.pkg/control
index 4946bb3..d9f987a 100644
--- a/libexpat.1.pkg/control
+++ b/libexpat.1.pkg/control
@@ -1,5 +1,5 @@
-Package: libexpat.1
 Architecture: any
+Platform: all
 Description: XML parser library
  Expat is an XML parser library written in C. It is a stream-oriented parser in
  which an application registers handlers for things the parser might find in the
diff --git a/xmlwf-doc.pkg/control b/xmlwf-doc.pkg/control
index 813fef0..a5f3255 100644
--- a/xmlwf-doc.pkg/control
+++ b/xmlwf-doc.pkg/control
@@ -1,5 +1,5 @@
-Package: xmlwf-doc
 Architecture: any
+Platform: all
 Depends: libexpat.1 (= 2.1.0-1), xmlwf
 Description: XML parser library - example application documentation files
  This package provides the manual page for xmlwf, an example application of
diff --git a/xmlwf.pkg/control b/xmlwf.pkg/control
index ff1a6e9..89ecd2a 100644
--- a/xmlwf.pkg/control
+++ b/xmlwf.pkg/control
@@ -1,5 +1,5 @@
-Package: xmlwf
 Architecture: any
+Platform: all
 Depends: libexpat.1 (= 2.1.0-1)
 Description: XML parser library - example application
  This package provides an example application of Expat that determines if an XML
--
cgit v0.9.1