Update to SPF 2.0 and opkhelper 3.0.

18 files changed, 31 insertions, 31 deletions

diff --git a/build b/build
index 1700de2..78fa765 100755
--- a/build
+++ b/build
@@ -1,18 +1,15 @@
-#! /usr/bin/make -f
+#!/usr/bin/make -f
 
-opkg opkg-doc libopkg.1 libopkg.1-dbg libopkg.1-dev: opkg.buildstamp
-
-.SILENT: opkg.buildstamp
-opkg.buildstamp:
-	cd src && chmod a+x configure && \
-		./configure --prefix=/usr \
-		--build=${OH_BUILD_ARCH_GNU} --host=${OH_HOST_ARCH_GNU} \
+build:
+	chmod a+x src/configure
+	oh-autoconfigure -- \
 		--disable-static \
-		--disable-curl --disable-ssl-curl --disable-gpg && \
-		make && make DESTDIR=$$(pwd)/../dest install
-	oh-strip -gl /usr/lib/libopkg.so.1.0.0
-	oh-installfiles opkg opkg-doc libopkg.1 libopkg.1-dbg libopkg.1-dev
-	oh-installdocs libopkg.1
-	oh-gencontrol opkg opkg-doc libopkg.1 libopkg.1-dbg libopkg.1-dev
-	oh-buildopk opkg opkg-doc libopkg.1 libopkg.1-dbg libopkg.1-dev
-	touch opkg.buildstamp
+		--disable-curl --disable-ssl-curl --disable-gpg
+	oh-autobuild
+	touch $@
+
+install: build
+	oh-autoinstall
+	oh-fixperms
+	oh-strip -k
+	oh-installfiles
diff --git a/changelog b/changelog
index d15eb75..a063fa0 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+opkg (0.1.8~r635-2) trunk
+
+  * Update packaging to SPF 2.0 and opkhelper 3.0.
+
+ -- "P. J. McDermott" <pjm@nac.net>  Sun, 02 Jun 2013 09:07:00 -0400
+
 opkg (0.1.8+r635-1)
 
   * Initial release.
diff --git a/config b/config
deleted file mode 100644
index 887381d..0000000
--- a/config
+++ /dev/null
@@ -1 +0,0 @@
-runtime opkg.conf /etc/opkg/opkg.conf
diff --git a/control b/control
index 8761b90..e7abf3a 100644
--- a/control
+++ b/control
@@ -1,5 +1,3 @@
-Source: opkg
-Version: 0.1.8+r635-1
 Maintainer: "P. J. McDermott" <pjm@nac.net>
-Build-Depends: make, gcc-4.6, libgcc.1, libc-dev, opkg-config.1
+Build-Depends: opkhelper-3.0
 Homepage: https://code.google.com/p/opkg/
diff --git a/format b/format
index d3827e7..cd5ac03 100644
--- a/format
+++ b/format
@@ -1 +1 @@
-1.0
+2.0
diff --git a/libopkg.1-dbg.pkg/control b/libopkg.1-dbg.pkg/control
index c2587fa..19a2b4a 100644
--- a/libopkg.1-dbg.pkg/control
+++ b/libopkg.1-dbg.pkg/control
@@ -1,6 +1,6 @@
-Package: libopkg.1-dbg
 Architecture: any
-Depends: libopkg.1 (= 0.1.8+r635-1)
+Platform: all
+Depends: libopkg.1 (= ${Binary-Version})
 Description: Open PacKaGe Management - library debugging symbols
  Opkg is a lightweight package management system. It is written in C and
  resembles apt/dpkg in operation. It is intended for use on embedded Linux
diff --git a/libopkg.1-dbg.pkg/files b/libopkg.1-dbg.pkg/files
new file mode 100644
index 0000000..1acc2ff
--- /dev/null
+++ b/libopkg.1-dbg.pkg/files
@@ -0,0 +1 @@
+/usr/lib/debug
diff --git a/libopkg.1-dbg.pkg/install b/libopkg.1-dbg.pkg/install
deleted file mode 100644
index f4a3df7..0000000
--- a/libopkg.1-dbg.pkg/install
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/debug/usr/lib/libopkg*
diff --git a/libopkg.1-dev.pkg/control b/libopkg.1-dev.pkg/control
index a65ef93..aa32a01 100644
--- a/libopkg.1-dev.pkg/control
+++ b/libopkg.1-dev.pkg/control
@@ -1,5 +1,5 @@
-Package: libopkg.1-dev
 Architecture: all
+Platform: all
 Depends: libopkg.1
 Description: Open PacKaGe Management - development files
  Opkg is a lightweight package management system. It is written in C and
diff --git a/libopkg.1-dev.pkg/install b/libopkg.1-dev.pkg/files
index 2d56f53..2d56f53 100644
--- a/libopkg.1-dev.pkg/install
+++ b/libopkg.1-dev.pkg/files
diff --git a/libopkg.1.pkg/control b/libopkg.1.pkg/control
index 408500e..5517ee4 100644
--- a/libopkg.1.pkg/control
+++ b/libopkg.1.pkg/control
@@ -1,5 +1,5 @@
-Package: libopkg.1
 Architecture: any
+Platform: all
 Description: Open PacKaGe Management - library
  Opkg is a lightweight package management system. It is written in C and
  resembles apt/dpkg in operation. It is intended for use on embedded Linux
diff --git a/libopkg.1.pkg/docs b/libopkg.1.pkg/docs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/libopkg.1.pkg/docs
diff --git a/libopkg.1.pkg/files b/libopkg.1.pkg/files
new file mode 100644
index 0000000..05426aa
--- /dev/null
+++ b/libopkg.1.pkg/files
@@ -0,0 +1,3 @@
+/usr/lib/*/libopkg*
+/usr/lib/*/pkgconfig
+/usr/share/opkg
diff --git a/libopkg.1.pkg/install b/libopkg.1.pkg/install
deleted file mode 100644
index aa1f5af..0000000
--- a/libopkg.1.pkg/install
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/lib/libopkg*
-/usr/lib/pkgconfig
-/usr/share/opkg
diff --git a/opkg-doc.pkg/control b/opkg-doc.pkg/control
index fa7274a..40616d1 100644
--- a/opkg-doc.pkg/control
+++ b/opkg-doc.pkg/control
@@ -1,5 +1,5 @@
-Package: opkg-doc
 Architecture: all
+Platform: all
 Depends: opkg
 Description: Open PacKaGe Management - documentation
  Opkg is a lightweight package management system. It is written in C and
diff --git a/opkg-doc.pkg/install b/opkg-doc.pkg/files
index 0ddb634..0ddb634 100644
--- a/opkg-doc.pkg/install
+++ b/opkg-doc.pkg/files
diff --git a/opkg.pkg/control b/opkg.pkg/control
index 69af4b3..7426951 100644
--- a/opkg.pkg/control
+++ b/opkg.pkg/control
@@ -1,5 +1,5 @@
-Package: opkg
 Architecture: any
+Platform: all
 Essential: yes
 Depends: libopkg.1
 Description: Open PacKaGe Management
diff --git a/opkg.pkg/install b/opkg.pkg/files
index 03d9de7..03d9de7 100644
--- a/opkg.pkg/install
+++ b/opkg.pkg/files