From 25ee26514d39284ba7752f8b9aeb2140e8cadb3c Mon Sep 17 00:00:00 2001 From: Kevin Rosenberg Date: Sun, 2 Aug 2009 01:36:49 -0600 Subject: [PATCH] Updates for new debian standards --- debian/changelog | 11 +++++++++++ debian/compat | 2 +- debian/control | 10 ++++++---- debian/copyright | 2 +- debian/postinst | 21 --------------------- debian/prerm | 17 +---------------- debian/rules | 36 ++++++++++++------------------------ debian/upload.sh | 2 +- debian/watch | 2 ++ 9 files changed, 35 insertions(+), 68 deletions(-) create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog index 4b41975..e0f24c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +cl-puri (1.5.1-2) unstable; urgency=low + + * debian/watch: New file + * debian/control: Require debhelper 7. Change to new lisp section. + Add Vcs-Git and Homepage fields. + * debian/compat: Update to version 7 + * debian/rules: Update for debhelper 7, architecture-independent build + * debian/{prerm,postrm}: Remove path from binary function + + -- Kevin M. Rosenberg Sun, 02 Aug 2009 01:36:28 -0600 + cl-puri (1.5.1-1) unstable; urgency=low * New upstream diff --git a/debian/compat b/debian/compat index b8626c4..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +7 diff --git a/debian/control b/debian/control index ec21f0a..68b2947 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,15 @@ Source: cl-puri -Section: devel +Section: lisp Priority: optional Maintainer: Kevin M. Rosenberg -Build-Depends: debhelper (>= 4.0.0) -Standards-Version: 3.7.2.2 +Build-Depends: debhelper (>= 7.0.0) +Standards-Version: 3.8.2.0 +Homepage: http://files.b9.com/puri/ +Vcs-Git: git://git.b9.com/puri/ Package: cl-puri Architecture: all -Depends: ${shlibs:Depends}, common-lisp-controller (>= 3.47) +Depends: common-lisp-controller (>= 3.47) Recommends: cl-ptester Description: Common Lisp Portable URI Library This is portable Universal Resource Identifier (RFC 2396) diff --git a/debian/copyright b/debian/copyright index 85917e7..4a53ce1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -22,7 +22,7 @@ merchantability or fitness for a particular purpose. See the GNU Lesser General Public License for more details. The GNU Lessor General Public License can be found in your Debian file -system in /usr/share/common-licenses/LGPL. +system in /usr/share/common-licenses/LGPL-3. Preamble to the Gnu Lesser General Public License ------------------------------------------------- diff --git a/debian/postinst b/debian/postinst index c53065e..b031648 100644 --- a/debian/postinst +++ b/debian/postinst @@ -3,24 +3,6 @@ set -e LISP_PKG=puri -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package -# -# quoting from the policy: -# Any necessary prompting should almost always be confined to the -# post-installation script, and should be protected with a conditional -# so that unnecessary prompting doesn't happen if a package's -# installation fails and the `postinst' is called with `abort-upgrade', -# `abort-remove' or `abort-deconfigure'. - case "$1" in configure) /usr/sbin/register-common-lisp-source ${LISP_PKG} @@ -33,9 +15,6 @@ case "$1" in ;; esac -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - #DEBHELPER# exit 0 diff --git a/debian/prerm b/debian/prerm index 3e18302..b8fbe63 100644 --- a/debian/prerm +++ b/debian/prerm @@ -3,21 +3,9 @@ set -e LISP_PKG=puri -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - case "$1" in remove|upgrade|deconfigure) - /usr/sbin/unregister-common-lisp-source ${LISP_PKG} + unregister-common-lisp-source ${LISP_PKG} ;; failed-upgrade) ;; @@ -27,9 +15,6 @@ case "$1" in ;; esac -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - #DEBHELPER# exit 0 diff --git a/debian/rules b/debian/rules index 165756b..b05fc0f 100755 --- a/debian/rules +++ b/debian/rules @@ -3,64 +3,52 @@ pkg := puri debpkg := cl-puri - clc-source := usr/share/common-lisp/source clc-systems := usr/share/common-lisp/systems clc-puri := $(clc-source)/$(pkg) - doc-dir := usr/share/doc/$(debpkg) configure: configure-stamp configure-stamp: dh_testdir - # Add here commands to configure the package. - touch configure-stamp - build: build-stamp build-stamp: configure-stamp dh_testdir - # Add here commands to compile the package. touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp - # Add here commands to clean up after the build process. rm -f debian/cl-puri.postinst.* debian/cl-puri.prerm.* dh_clean install: build dh_testdir dh_testroot - dh_clean -k - # Add here commands to install the package into debian/puri. + dh_prep dh_installdirs $(clc-systems) $(clc-puri) dh_install *.asd $(shell echo *.lisp) $(clc-puri) dh_link $(clc-puri)/puri.asd $(clc-systems)/puri.asd -# Build architecture-independent files here. binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installdocs -i README uri.html + dh_installchangelogs -i + dh_strip -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i - -# Build architecture-dependent files here. binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs README uri.html - dh_installchangelogs - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/upload.sh b/debian/upload.sh index 20ad156..75dd214 100755 --- a/debian/upload.sh +++ b/debian/upload.sh @@ -1,3 +1,3 @@ #!/bin/bash -e -dup puri -Uftp.b9.com -D/home/ftp/puri -C"(umask 022; /home/kevin/bin/remove-old-versions puri latest)" -su $* +dup puri -Ufiles.b9.com -D/home/ftp/puri -C"(umask 022; /home/kevin/bin/remove-old-versions puri latest)" -su $* diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..1dd81cf --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://files.b9.com/puri/puri-([\d\.]*)\.tar\.gz -- 1.7.10.4