[Da-tools-commits] ./debian/dchroot-dsa r31: merge from alioth
Peter Palfrader
peter at palfrader.org
Wed Jan 9 22:00:40 UTC 2008
------------------------------------------------------------
revno: 31
committer: Peter Palfrader <peter at palfrader.org>
branch nick: dchroot-dsa
timestamp: Wed 2008-01-09 23:00:40 +0100
message:
merge from alioth
removed:
debian/conffiles
added:
debian/compat
debian/copyright
debian/install
debian/manpages
modified:
debian/changelog
debian/control
debian/postinst
debian/postrm
debian/rules
------------------------------------------------------------
revno: 30.1.1
committer: Stephen Gran <steve at lobefin.net>
branch nick: dchroot-dsa-common
timestamp: Mon 2008-01-07 00:55:24 +0000
message:
* Clean up packaging
* Update standards version to 3.7.3 (no changes)
* Use standard debhelper tools
* Eliminate obsolete debian/conffiles
* Switch from obsolete dh_installmanpages to dh_installman
* Add debian/copyright
* Change from Build-Depends-Indep to Build-Depends, since we need debhelper
in the clean target
* Update compat level to 5 (add debian/compat and versioned Build-Dep on
debhelper)
* Add #DEBHELPER# tokens to maintainer scripts
removed:
debian/conffiles
added:
debian/compat
debian/copyright
debian/install
debian/manpages
modified:
debian/changelog
debian/control
debian/postinst
debian/postrm
debian/rules
-------------- next part --------------
=== removed file 'debian/conffiles'
--- a/debian/conffiles 2004-11-08 19:26:46 +0000
+++ b/debian/conffiles 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-/etc/dchroot.conf
=== added file 'debian/compat'
--- a/debian/compat 1970-01-01 00:00:00 +0000
+++ b/debian/compat 2008-01-07 00:55:24 +0000
@@ -0,0 +1,1 @@
+5
=== added file 'debian/copyright'
--- a/debian/copyright 1970-01-01 00:00:00 +0000
+++ b/debian/copyright 2008-01-07 00:55:24 +0000
@@ -0,0 +1,30 @@
+This package was created a long, long time ago in a galaxy far, far away.
+
+Unfortunately, the copyright file was forgotten.
+
+This copyright file was put together by Stephen Gran <sgran at debian.org>
+on Mon, 07 Jan 2008 00:46:05 +0000
+
+Authors:
+ 2004, Martin Schulze <joey at infodrom.org>
+ 1999-2002, Ben Collins <bcollins at debian.org>
+
+The copyright of all files in this package are:
+
+ 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 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301, USA
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
=== added file 'debian/install'
--- a/debian/install 1970-01-01 00:00:00 +0000
+++ b/debian/install 2008-01-07 00:55:24 +0000
@@ -0,0 +1,2 @@
+dchroot usr/bin/
+dchroot.conf etc/
=== added file 'debian/manpages'
--- a/debian/manpages 1970-01-01 00:00:00 +0000
+++ b/debian/manpages 2008-01-07 00:55:24 +0000
@@ -0,0 +1,1 @@
+dchroot.1
=== modified file 'debian/changelog'
--- a/debian/changelog 2007-11-04 21:23:33 +0000
+++ b/debian/changelog 2008-01-07 00:55:24 +0000
@@ -1,3 +1,19 @@
+dchroot-dsa (2:1.0-4) stable; urgency=low
+
+ * Clean up packaging
+ * Update standards version to 3.7.3 (no changes)
+ * Use standard debhelper tools
+ * Eliminate obsolete debian/conffiles
+ * Switch from obsolete dh_installmanpages to dh_installman
+ * Add debian/copyright
+ * Change from Build-Depends-Indep to Build-Depends, since we need debhelper
+ in the clean target
+ * Update compat level to 5 (add debian/compat and versioned Build-Dep on
+ debhelper)
+ * Add #DEBHELPER# tokens to maintainer scripts
+
+ -- Stephen Gran <sgran at debian.org> Mon, 07 Jan 2008 00:52:10 +0000
+
dchroot-dsa (2:1.0-3) stable; urgency=low
* Added an epoch since somebody hiding behind Debian buildd-tools
=== modified file 'debian/control'
--- a/debian/control 2004-11-08 19:26:46 +0000
+++ b/debian/control 2008-01-07 00:55:24 +0000
@@ -2,8 +2,8 @@
Section: admin
Priority: optional
Maintainer: Martin Schulze <joey at debian.org>
-Build-Depends-Indep: debhelper
-Standards-Version: 3.5.8.0
+Build-Depends: debhelper (>> 5.0)
+Standards-Version: 3.7.3.0
Package: dchroot-dsa
Architecture: any
=== modified file 'debian/postinst'
--- a/debian/postinst 2004-11-09 09:33:02 +0000
+++ b/debian/postinst 2008-01-07 00:55:24 +0000
@@ -7,3 +7,5 @@
dpkg-statoverride --update --add root root 4755 /usr/bin/dchroot
fi
fi
+
+#DEBHELPER#
=== modified file 'debian/postrm'
--- a/debian/postrm 2004-11-08 19:26:46 +0000
+++ b/debian/postrm 2008-01-07 00:55:24 +0000
@@ -5,3 +5,5 @@
dpkg-statoverride --remove /usr/bin/dchroot >/dev/null 2>&1 || true
;;
esac
+
+#DEBHELPER#
=== modified file 'debian/rules'
--- a/debian/rules 2004-11-09 09:49:18 +0000
+++ b/debian/rules 2008-01-07 00:55:24 +0000
@@ -10,21 +10,13 @@
$(MAKE)
touch build
-debclean:
-# Cleans debian binary directories to allow binary creation
- rm -rf debian/tmp
- rm -f debian/{files,substvars}
-
-clean: debclean
+clean:
dh_testdir
- -rm -f build
+ dh_testroot
+ rm -f build
+ dh_clean
$(MAKE) clean
-instdirs = \
- usr/bin \
- usr/share/man/man1 \
- etc
-
binary-indep:
# Nothing to be done here
@@ -32,13 +24,10 @@
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs $(instdirs)
-
- install -m 755 dchroot debian/tmp/usr/bin/
- install -m 644 dchroot.conf debian/tmp/etc/
-
+ dh_install
dh_installchangelogs
- dh_installmanpages
+ dh_installman
+ dh_installdocs
dh_fixperms
dh_compress
dh_installdeb
More information about the Da-tools-commits
mailing list