[Da-tools-commits] ./da-tools/famke-common r3: * Update packaging to 21th century

Stephen Gran steve at lobefin.net
Mon Jan 7 00:17:20 UTC 2008


------------------------------------------------------------
revno: 3
committer: Stephen Gran <steve at lobefin.net>
branch nick: famke-common
timestamp: Mon 2008-01-07 00:17:20 +0000
message:
  * Update packaging to 21th century
  * Use debhelper commands (add Build-Depend on debhelper)
  * Add debian/compat
  * Eliminate debian/conffiles
  * Test for existance of default file before sourcing it
  * Update Standards-Version to 3.7.3 (no changes)
  * Correct FSF address in copyright
  * Add Depends: on python
removed:
  debian/conffiles
added:
  debian/compat
  debian/dirs
  debian/famke.conf
  debian/install
  famke.conf
renamed:
  debian/famke.cron => debian/famke.cron.daily
  debian/kristin.cron => debian/kristin.cron.d
  debian/kristin.daily => debian/kristin.cron.daily
modified:
  debian/changelog
  debian/control
  debian/copyright
  debian/rules
  debian/famke.cron.daily
-------------- next part --------------
=== removed file 'debian/conffiles'
--- a/debian/conffiles	2004-11-30 10:17:17 +0000
+++ b/debian/conffiles	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-/etc/default/famke
-/etc/cron.daily/famke
-/etc/cron.d/kristin
-/etc/famke.conf

=== added file 'debian/compat'
--- a/debian/compat	1970-01-01 00:00:00 +0000
+++ b/debian/compat	2008-01-07 00:17:20 +0000
@@ -0,0 +1,1 @@
+5

=== added file 'debian/dirs'
--- a/debian/dirs	1970-01-01 00:00:00 +0000
+++ b/debian/dirs	2008-01-07 00:17:20 +0000
@@ -0,0 +1,1 @@
+/var/lib/famke

=== added file 'debian/famke.conf'
=== added file 'debian/install'
--- a/debian/install	1970-01-01 00:00:00 +0000
+++ b/debian/install	2008-01-07 00:17:20 +0000
@@ -0,0 +1,3 @@
+famke usr/bin
+kristin usr/bin
+famke.conf etc/

=== added file 'famke.conf'
=== renamed file 'debian/famke.cron' => 'debian/famke.cron.daily'
--- a/debian/famke.cron	2004-11-30 10:03:32 +0000
+++ b/debian/famke.cron.daily	2008-01-07 00:17:20 +0000
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-. /etc/default/famke
+if [ -f /etc/default/famke ]; then
+  . /etc/default/famke
+fi
 
 [ -z "$MAILTO" ] && exit 1
 

=== renamed file 'debian/kristin.cron' => 'debian/kristin.cron.d'
=== renamed file 'debian/kristin.daily' => 'debian/kristin.cron.daily'
=== modified file 'debian/changelog'
--- a/debian/changelog	2004-11-30 10:17:17 +0000
+++ b/debian/changelog	2008-01-07 00:17:20 +0000
@@ -1,3 +1,16 @@
+famke (0.06) unstable; urgency=low
+
+  * Update packaging to 21th century
+  * Use debhelper commands (add Build-Depend on debhelper)
+  * Add debian/compat
+  * Eliminate debian/conffiles
+  * Test for existance of default file before sourcing it
+  * Update Standards-Version to 3.7.3 (no changes)
+  * Correct FSF address in copyright
+  * Add Depends: on python
+
+ -- Stephen Gran <sgran at debian.org>  Mon, 07 Jan 2008 00:15:44 +0000
+
 famke (0.05) unstable; urgency=low
 
   * kristin fixes for bogus mtime check and support for buildd chroots.

=== modified file 'debian/control'
--- a/debian/control	2004-11-30 10:17:17 +0000
+++ b/debian/control	2008-01-07 00:17:20 +0000
@@ -2,11 +2,12 @@
 Section: utils
 Priority: extra
 Maintainer: James Troup <james at nocrew.org>
-Standards-Version: 3.6.1.0
+Standards-Version: 3.7.3
+Build-Depends: debhelper (>> 5.0)
 
 Package: famke
 Architecture: all
-Depends: python-xml, python-apt, wget, cron
+Depends: python, python-xml, python-apt, wget, cron
 Description: crappy scripts to help maintain debian.org
  famke - what's uptodate script.
  kristin - monitor set{u,g}id changes.

=== modified file 'debian/copyright'
--- a/debian/copyright	2004-11-30 10:17:17 +0000
+++ b/debian/copyright	2008-01-07 00:17:20 +0000
@@ -19,5 +19,5 @@
 You should have received a copy of the GNU General Public License with
 your Debian GNU system, in /usr/share/common-licenses/GPL, or with the
 Debian GNU gnupg source package as the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, 
+MA 02110-1301, USA.

=== modified file 'debian/rules'
--- a/debian/rules	2004-11-30 10:17:17 +0000
+++ b/debian/rules	2008-01-07 00:17:20 +0000
@@ -3,74 +3,43 @@
 # Based on sample debian/rules file - for GNU Hello (1.3).
 # Copyright 1994,1995 by Ian Jackson.
 # Copyright 2003, 2004 James Troup
+# Rewritten for debhelper 2008 Stephen Gran
 # I hereby give you perpetual unlimited permission to copy,
 # modify and relicense this file, provided that you do not remove
 # my name from the file itself.  (I assert my moral right of
 # paternity under the Copyright, Designs and Patents Act 1988.)
 # This file may have to be extensively modified
 
-install_dir=install -d -m 755
-install_file=install -m 644
-install_script=install -m 755
-install_binary=install -m 755 -s
-
 build:
-	$(checkdir)
+	dh_testdir
 	touch build
 
 clean:
-	$(checkdir)
-	-rm -f build
-	find . -name \*~ | xargs rm -vf
-	-rm -rf debian/tmp debian/files* debian/substvars
-
-binary-indep:	checkroot build
-	$(checkdir)
-	-rm -rf debian/tmp
-	$(install_dir) debian/tmp/DEBIAN/
-	$(install_file) debian/conffiles debian/tmp/DEBIAN/
-
-	$(install_dir) debian/tmp/etc/cron.daily/
-	$(install_script) debian/famke.cron debian/tmp/etc/cron.daily/famke
-
-	$(install_dir) debian/tmp/etc/cron.d/
-	$(install_file) debian/kristin.cron debian/tmp/etc/cron.d/kristin
-
-	$(install_dir) debian/tmp/etc/default/
-	$(install_file) debian/famke.default debian/tmp/etc/default/famke
-
-	touch debian/tmp/etc/famke.conf
-
-	$(install_dir) debian/tmp/usr/bin/
-	$(install_script) famke kristin debian/tmp/usr/bin/
-
-	$(install_dir) debian/tmp/usr/share/kristin/
-	$(install_script) debian/kristin.daily debian/tmp/usr/share/kristin/daily
-
-	$(install_dir) debian/tmp/var/lib/famke/
-
-	$(install_dir) debian/tmp/usr/share/doc/famke/
-	$(install_file) debian/changelog debian/tmp/usr/share/doc/famke/changelog.Debian
-	gzip -9v debian/tmp/usr/share/doc/famke/*
-	$(install_file) debian/copyright debian/tmp/usr/share/doc/famke/
-
-	dpkg-gencontrol -isp
-	chown -R root.root debian/tmp
-	chmod -R go=rX debian/tmp
-	dpkg --build debian/tmp ..
-
-binary-arch:
-
-define checkdir
-	test -f famke -a -f debian/rules
-endef
-
-# Below here is fairly generic really
-
-binary: 	binary-indep binary-arch
-
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+	dh_testdir
+	dh_testroot
+	dh_clean
+	rm -f build
+	find . -name \*~ -print0 | xargs -0 --no-run-if-empty rm -vf
+
+binary-indep: build
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+	dh_install
+	dh_installcron
+	dh_installcron --name=kristin
+	dh_installinit -n
+	dh_installdocs
+	dh_installchangelogs
+	dh_compress
+	dh_md5sums
+	dh_installdeb
+	dh_fixperms
+	dh_gencontrol
+	dh_builddeb
+
+binary-arch: build
+
+binary:	binary-indep binary-arch
+
+.PHONY: binary binary-arch binary-indep clean



More information about the Da-tools-commits mailing list