From bca7dbbc209e2256ab1bf3054bbc6e2638bb8cbb Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Mon, 03 Jun 2013 13:11:27 -0400 Subject: Use SPF 2.0, opkhelper 3.0, and new upstream ver. --- diff --git a/build b/build index 0bbac7d..6038f29 100755 --- a/build +++ b/build @@ -1,26 +1,14 @@ -#! /usr/bin/make -f +#!/usr/bin/make -f -VER = 1.0 -PKGS = opkhelper-$(VER) opkhelper-$(VER)-doc +include ../source.mk -$(PKGS): opkhelper.buildstamp +build: + oh-autoconfigure -- \ + --bindir=/usr/share/$(OPK_SOURCE) \ + --libdir=/usr/share \ + --with-libopkbuild.1=/usr/share/libopkbuild.1 + oh-autobuild -.SILENT: opkhelper.buildstamp -opkhelper.buildstamp: - mkdir build && cd build && \ - ../src/configure --prefix=/usr --libdir=/usr/share && \ - make && make DESTDIR=$$(pwd)/../dest install - mv dest/usr/share/opkhelper dest/usr/share/opkhelper-$(VER) - for file in dest/usr/bin/*; do \ - basename="$${file##*/}"; \ - mv "$${file}" "$${file}-$(VER)"; \ - done - for file in dest/usr/share/man/man*/*; do \ - basename="$${file##*/}"; \ - mv "$${file}" "$${file%.*}-$(VER).$${basename##*.}"; \ - done - oh-installfiles $(PKGS) - oh-installdocs opkhelper-$(VER) - oh-gencontrol $(PKGS) - oh-buildopk $(PKGS) - touch $@ +install: build + oh-autoinstall + oh-installfiles diff --git a/changelog b/changelog index a4af632..7e576b2 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,10 @@ +opkhelper-3.0 (3.0.0~beta3-1) trunk + + * New upstream version. + * Update packaging to SPF 2.0 and opkhelper 3.0. + + -- "P. J. McDermott" Mon, 03 Jun 2013 12:53:00 -0400 + opkhelper (1.0.0-1) * Initial release. diff --git a/control b/control index cfb00eb..d16c80d 100644 --- a/control +++ b/control @@ -1,5 +1,2 @@ -Source: opkhelper-1.0 -Version: 1.0.0-1 Maintainer: "P. J. McDermott" -Build-Depends: make -Homepage: http://www.pehjota.net/projects/opkhelper/ +Build-Depends: opkhelper-3.0 diff --git a/copyright b/copyright index bef876f..bc38b0e 100644 --- a/copyright +++ b/copyright @@ -1,13 +1,13 @@ Upstream Source =============== -Location: +Location: -Copyright (C) 2012 Patrick "P. J." McDermott +Copyright (C) 2012-2013 Patrick "P. J." McDermott This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or +the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,17 +19,17 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . On this system, a copy of the GNU General Public License may be found at -. +. Distribution Packaging ====================== -Copyright (C) 2012 Patrick "P. J." McDermott +Copyright (C) 2012-2013 Patrick "P. J." McDermott This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or +the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -41,4 +41,4 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . On this system, a copy of the GNU General Public License may be found at -. +. diff --git a/format b/format index d3827e7..cd5ac03 100644 --- a/format +++ b/format @@ -1 +1 @@ -1.0 +2.0 diff --git a/opkhelper-1.0-doc.pkg/control b/opkhelper-1.0-doc.pkg/control deleted file mode 100644 index 7b9bdac..0000000 --- a/opkhelper-1.0-doc.pkg/control +++ /dev/null @@ -1,15 +0,0 @@ -Package: opkhelper-1.0-doc -Architecture: all -Depends: opkg -Description: opkg build helper tools - documentation - A set of programs to assist in building binary packages installable by the - lightweight package manager "opkg" [1]. These tools are inspired by - "debhelper" [2], a similar set of programs written primarily by Joey Hess for - Debian. They are designed to build source packages that comply with draft - version 1.0 of this source package format: - - . - 1: - 2: - . - This package provides manual pages for the opkhelper utilities. diff --git a/opkhelper-1.0.0.tar.bz2 b/opkhelper-1.0.0.tar.bz2 deleted file mode 100644 index 773bae4..0000000 --- a/opkhelper-1.0.0.tar.bz2 +++ /dev/null Binary files differ diff --git a/opkhelper-1.0.pkg/control b/opkhelper-1.0.pkg/control deleted file mode 100644 index a2b0651..0000000 --- a/opkhelper-1.0.pkg/control +++ /dev/null @@ -1,13 +0,0 @@ -Package: opkhelper-1.0 -Architecture: all -Depends: opkg -Description: opkg build helper tools - A set of programs to assist in building binary packages installable by the - lightweight package manager "opkg" [1]. These tools are inspired by - "debhelper" [2], a similar set of programs written primarily by Joey Hess for - Debian. They are designed to build source packages that comply with draft - version 1.0 of this source package format: - - . - 1: - 2: diff --git a/opkhelper-1.0.pkg/install b/opkhelper-1.0.pkg/install deleted file mode 100644 index 095765d..0000000 --- a/opkhelper-1.0.pkg/install +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin -/usr/share/opkhelper-1.0 diff --git a/opkhelper-3.0-doc.pkg/control b/opkhelper-3.0-doc.pkg/control new file mode 100644 index 0000000..df94ffa --- /dev/null +++ b/opkhelper-3.0-doc.pkg/control @@ -0,0 +1,6 @@ +Architecture: all +Platform: all +Description: package build helper tools - documentation + ${Common-Description} + . + This package provides manual pages for the opkhelper utilities. diff --git a/opkhelper-1.0-doc.pkg/install b/opkhelper-3.0-doc.pkg/files index 0ddb634..0ddb634 100644 --- a/opkhelper-1.0-doc.pkg/install +++ b/opkhelper-3.0-doc.pkg/files diff --git a/opkhelper-3.0.pkg/control b/opkhelper-3.0.pkg/control new file mode 100644 index 0000000..bfba64a --- /dev/null +++ b/opkhelper-3.0.pkg/control @@ -0,0 +1,4 @@ +Architecture: all +Platform: all +Description: package build helper tools + ${Common-Description} diff --git a/opkhelper-3.0.pkg/docs b/opkhelper-3.0.pkg/docs new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/opkhelper-3.0.pkg/docs diff --git a/opkhelper-3.0.pkg/files b/opkhelper-3.0.pkg/files new file mode 100644 index 0000000..3884c08 --- /dev/null +++ b/opkhelper-3.0.pkg/files @@ -0,0 +1,2 @@ +/usr/share/opkhelper-* +/usr/share/libopkhelper* diff --git a/patches/01_fix-build-system.patch b/patches/01_fix-build-system.patch deleted file mode 100644 index 4e51d8f..0000000 --- a/patches/01_fix-build-system.patch +++ /dev/null @@ -1,46 +0,0 @@ -Description: Make configure act more like a GNU Autoconf one -Author: "P. J. McDermott" - -diff -Naur opkhelper-1.0.0.orig/configure opkhelper-1.0.0/configure ---- opkhelper-1.0.0.orig/configure 2012-04-25 00:43:02.492677186 -0400 -+++ opkhelper-1.0.0/configure 2012-06-21 11:52:54.867945276 -0400 -@@ -98,23 +98,19 @@ - shift 2 - ;; - --bindir) -- # Leave PREFIX unexpanded for now, in case it isn't set yet. -- BINDIR="\${PREFIX}/${2}" -+ BINDIR="${2}" - shift 2 - ;; - --libdir) -- # Leave PREFIX unexpanded for now, in case it isn't set yet. -- LIBDIR="\${PREFIX}/${2}" -+ LIBDIR="${2}" - shift 2 - ;; - --datadir) -- # Leave PREFIX unexpanded for now, in case it isn't set yet. -- DATADIR="\${PREFIX}/${2}" -+ DATADIR="${2}" - shift 2 - ;; - --mandir) -- # Leave PREFIX unexpanded for now, in case it isn't set yet. -- MANDIR="\${PREFIX}/${2}" -+ MANDIR="${2}" - shift 2 - ;; - --) -@@ -152,11 +148,6 @@ - if [ -z "${MANDIR}" ]; then - MANDIR=${PREFIX}/share/man - fi --# Expand PREFIX if it's there. --eval "BINDIR=${BINDIR}" --eval "LIBDIR=${LIBDIR}" --eval "DATADIR=${DATADIR}" --eval "MANDIR=${MANDIR}" - - find_dependency() - { diff --git a/source.mk b/source.mk new file mode 100644 index 0000000..3246a4c --- /dev/null +++ b/source.mk @@ -0,0 +1,16 @@ +upstream_version = $$(printf '%s\n' '$(OPK_SOURCE_VERSION_UPSTREAM)' | \ + sed 's/~/-/') +upstream_archive = opkhelper-$(upstream_version).tar.bz2 +upstream_dir_url = http://files.proteanos.com/pub/opkhelper/$(upstream_version) +upstream_url = $(upstream_dir_url)/$(upstream_archive) +upstream_sum = $(upstream_dir_url)/SHA256SUMS +source_archive = ../$(OPK_SOURCE)-$(OPK_SOURCE_VERSION_UPSTREAM).orig.tar.bz2 + +$(source_archive): + wget "$(upstream_url)" + wget -O - "$(upstream_sum)" | grep -F "$(upstream_archive)" >SHA256SUMS + sha256sum -c SHA256SUMS + rm -f SHA256SUMS + mv "$(upstream_archive)" "$(source_archive)" + +source: $(source_archive) 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. -- cgit v0.9.1