diff options
| -rwxr-xr-x | build | 44 | ||||
| -rw-r--r-- | changelog | 10 | ||||
| -rw-r--r-- | control | 2 | ||||
| -rw-r--r-- | format | 2 | ||||
| -rw-r--r-- | opkhelper-doc.pkg/control | 11 | ||||
| -rw-r--r-- | opkhelper-doc.pkg/install | 1 | ||||
| -rw-r--r-- | opkhelper.pkg/control | 11 | ||||
| -rw-r--r-- | opkhelper.pkg/docs | 0 | ||||
| -rw-r--r-- | opkhelper.pkg/install | 1 | ||||
| -rw-r--r-- | substvars | 6 |
10 files changed, 29 insertions, 59 deletions
@@ -1,43 +1,3 @@ -#! /usr/bin/make -f +#!/usr/bin/make -f -VER = 1.0 -PKGS = opkhelper opkhelper-doc -BIN_DATA = /usr/bin/oh-applypatches \ - /usr/bin/oh-buildopk \ - /usr/bin/oh-checkbuilddeps \ - /usr/bin/oh-copyconfig \ - /usr/bin/oh-gencontrol \ - /usr/bin/oh-installdocs \ - /usr/bin/oh-installfiles \ - /usr/bin/oh-strip \ - /usr/bin/opkbuild -MAN_DATA = /usr/share/man/man1/oh-applypatches.1 \ - /usr/share/man/man1/oh-buildopk.1 \ - /usr/share/man/man1/oh-checkbuilddeps.1 \ - /usr/share/man/man1/oh-copyconfig.1 \ - /usr/share/man/man1/oh-gencontrol.1 \ - /usr/share/man/man1/oh-installdocs.1 \ - /usr/share/man/man1/oh-installfiles.1 \ - /usr/share/man/man1/oh-strip.1 \ - /usr/share/man/man1/opkbuild.1 \ - /usr/share/man/man7/opkhelper.7 - -$(PKGS): opkhelper.buildstamp - -.SILENT: opkhelper.buildstamp -opkhelper.buildstamp: - for file in $(BIN_DATA); do \ - mkdir -p "dest/$${file%/*}"; \ - basename="$${file##*/}"; \ - ln -s "$${basename}-$(VER)" "dest/$${file}"; \ - done - for file in $(MAN_DATA); do \ - mkdir -p "dest/$${file%/*}"; \ - basename="$${file##*/}"; \ - ln -s "$${basename%.*}-$(VER).$${basename##*.}" "dest/$${file}"; \ - done - oh-installfiles $(PKGS) - oh-installdocs opkhelper - oh-gencontrol $(PKGS) - oh-buildopk $(PKGS) - touch $@ +build install: @@ -1,3 +1,13 @@ +opkhelper-default (3.0) trunk + + * New upstream version. + * Update packaging to SPF 2.0. + * Don't provide links to versioned files. + - opkhelper-3.0 provides files in /usr/share/opkhelper-3.0/. + - opkhelper-*-doc packages will just conflict with each other. + + -- "P. J. McDermott" <pjm@nac.net> Sun, 30 Jun 2013 17:00:59 -0400 + opkhelper-default (1.0) * Initial release. @@ -1,3 +1 @@ -Source: opkhelper-default -Version: 1.0 Maintainer: "P. J. McDermott" <pjm@nac.net> @@ -1 +1 @@ -1.0 +2.0 diff --git a/opkhelper-doc.pkg/control b/opkhelper-doc.pkg/control index a345d3b..a3fb4c8 100644 --- a/opkhelper-doc.pkg/control +++ b/opkhelper-doc.pkg/control @@ -1,9 +1,8 @@ -Package: opkhelper-doc Architecture: all -Depends: opkhelper (>= 1.0-1), opkhelper-1.0-doc (>= 1.0.0-1) -Description: opkg build helper tools - documentation - A set of programs to assist in building binary packages installable by the - lightweight package manager "opkg". +Platform: all +Depends: opkhelper (= ${Binary-Version}), opkhelper-3.0-doc (>= 3.0.0~beta3-1) +Description: package build helper tools - documentation + ${Common-Description} . - This package depends on the default version of the opkg build helper tools + This package depends on the default version of the package build helper tools documentation. diff --git a/opkhelper-doc.pkg/install b/opkhelper-doc.pkg/install deleted file mode 100644 index 0ddb634..0000000 --- a/opkhelper-doc.pkg/install +++ /dev/null @@ -1 +0,0 @@ -/usr/share/man diff --git a/opkhelper.pkg/control b/opkhelper.pkg/control index 01b2474..6626c16 100644 --- a/opkhelper.pkg/control +++ b/opkhelper.pkg/control @@ -1,8 +1,7 @@ -Package: opkhelper Architecture: all -Depends: opkhelper-1.0 (>= 1.0.0-1) -Description: opkg build helper tools - A set of programs to assist in building binary packages installable by the - lightweight package manager "opkg". +Platform: all +Depends: opkhelper-3.0 (>= 3.0.0~beta3-1) +Description: package build helper tools + ${Common-Description} . - This package depends on the default version of the opkg build helper tools. + This package depends on the default version of the package build helper tools. diff --git a/opkhelper.pkg/docs b/opkhelper.pkg/docs new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/opkhelper.pkg/docs diff --git a/opkhelper.pkg/install b/opkhelper.pkg/install deleted file mode 100644 index 415f082..0000000 --- a/opkhelper.pkg/install +++ /dev/null @@ -1 +0,0 @@ -/usr/bin diff --git a/substvars b/substvars new file mode 100644 index 0000000..e8a3f22 --- /dev/null +++ b/substvars @@ -0,0 +1,6 @@ +Common-Description: + opkhelper is a collection of utilities to help build software packages using + opkbuild. + . + opkhelper includes utilities to automatically build software, install files + into binary packages, fix file permissions, and strip binary files. |