[Da-tools-commits] ./debian/userdir-ldap r376: Merge packaging cleanup from alioth (including template dir install location fix)

Peter Palfrader peter at palfrader.org
Thu Jan 10 15:03:07 UTC 2008 

------------------------------------------------------------
revno: 376
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 16:03:07 +0100
message:
  Merge packaging cleanup from alioth (including template dir install location fix)
added:
  debian/dirs
  debian/docs
  debian/install
  debian/manpages
  generate.conf
  userdir_ldap.pth
renamed:
  doc/makefile => doc/Makefile
modified:
  debian/changelog
  debian/control
  debian/copyright
  debian/rules
  doc/Makefile
    ------------------------------------------------------------
    revno: 349.1.23
    committer: Stephen Gran <steve at lobefin.net>
    branch nick: userdir-ldap-common
    timestamp: Mon 2008-01-07 01:51:34 +0000
    message:
      * Packaging cleanup
      * Use standard debhelper tools
      * Create all files we ship instead of echoing them into creation at build
        time
      * Typo fix in copyright
      * Update Standards-Version to 3.7.3 (no changes)
      * Build manpages at build time (add Build-Depend on yodl)
      * Install built manpages
    added:
      debian/dirs
      debian/docs
      debian/install
      debian/manpages
      generate.conf
      userdir_ldap.pth
    renamed:
      doc/makefile => doc/Makefile
    modified:
      debian/changelog
      debian/control
      debian/copyright
      debian/rules
      doc/Makefile
    ------------------------------------------------------------
    revno: 349.1.24
    committer: Stephen Gran <steve at lobefin.net>
    branch nick: userdir-ldap-common
    timestamp: Mon 2008-01-07 02:03:12 +0000
    message:
      we should really run make in doc before we touch build
    modified:
      debian/rules
-------------- next part --------------
=== added file 'debian/dirs'
--- a/debian/dirs	1970-01-01 00:00:00 +0000
+++ b/debian/dirs	2008-01-07 01:51:34 +0000
@@ -0,0 +1,3 @@
+usr/share/python-support/userdir_ldap
+etc/userdir-ldap/templates
+etc/ldap/schema 

=== added file 'debian/docs'
--- a/debian/docs	1970-01-01 00:00:00 +0000
+++ b/debian/docs	2008-01-07 01:51:34 +0000
@@ -0,0 +1,2 @@
+doc/slapd-config.txt
+doc/samples

=== added file 'debian/install'
--- a/debian/install	1970-01-01 00:00:00 +0000
+++ b/debian/install	2008-01-10 15:03:07 +0000
@@ -0,0 +1,25 @@
+userdir_ldap.pth usr/share/python-support/
+userdir_ldap.py usr/share/python-support/userdir_ldap/
+userdir_gpg.py usr/share/python-support/userdir_ldap/
+ud-forwardlist usr/bin
+ud-gpgimport usr/bin
+ud-info usr/bin
+ud-ldapshow usr/bin
+ud-userimport usr/bin
+ud-mailgate usr/bin
+ud-generate usr/bin
+ud-passchk usr/bin
+ud-useradd usr/bin
+ud-replicate usr/bin
+ud-xearth usr/bin
+ud-fingerserv usr/bin
+ud-echelon usr/bin
+ud-groupadd usr/bin
+ud-host usr/bin
+ud-zoneupdate usr/bin
+ud-roleadd usr/bin
+sigcheck usr/bin
+userdir-ldap.conf etc/userdir-ldap/
+generate.conf etc/userdir-ldap/
+templates/ etc/userdir-ldap/
+userdir-ldap.schema etc/ldap/schema/

=== added file 'debian/manpages'
--- a/debian/manpages	1970-01-01 00:00:00 +0000
+++ b/debian/manpages	2008-01-07 01:51:34 +0000
@@ -0,0 +1,7 @@
+doc/ud-generate.8
+doc/ud-info.1
+doc/ud-useradd.8
+doc/ud-xearth.1
+doc/ud-gpgimport.8
+doc/ud-mailgate.8
+doc/ud-userimport.8

=== added file 'generate.conf'
--- a/generate.conf	1970-01-01 00:00:00 +0000
+++ b/generate.conf	2008-01-07 01:51:34 +0000
@@ -0,0 +1,1 @@
+# See /usr/share/doc/userdir-ldap

=== added file 'userdir_ldap.pth'
--- a/userdir_ldap.pth	1970-01-01 00:00:00 +0000
+++ b/userdir_ldap.pth	2008-01-07 01:51:34 +0000
@@ -0,0 +1,2 @@
+userdir_ldap
+userdir_gpg

=== renamed file 'doc/makefile' => 'doc/Makefile'
--- a/doc/makefile	1999-10-01 01:43:30 +0000
+++ b/doc/Makefile	2008-01-07 01:51:34 +0000
@@ -9,3 +9,5 @@
 	echo Creating man page $@
 	yodl2man -o $@ $<
 		
+clean:
+	rm -f $(MANPAGES)

=== modified file 'debian/changelog'
--- a/debian/changelog	2008-01-10 14:56:17 +0000
+++ b/debian/changelog	2008-01-10 15:03:07 +0000
@@ -51,8 +51,16 @@
 
   [ Stephen Gran ]
   * ud-fingerserv: implement daemonize() for non-inetd mode.
+  * Packaging cleanup
+  * Use standard debhelper tools
+  * Create all files we ship instead of echoing them into creation at build
+    time
+  * Typo fix in copyright
+  * Update Standards-Version to 3.7.3 (no changes)
+  * Build manpages at build time (add Build-Depend on yodl)
+  * Install built manpages
 
- -- Joerg Jaspert <joerg at debian.org>  Fri, 28 Dec 2007 16:29:35 +0100
+ -- Stephen Gran <sgran at debian.org>  Mon, 07 Jan 2008 01:50:15 +0000
 
 userdir-ldap (0.3.15) unstable; urgency=low
 

=== modified file 'debian/control'
--- a/debian/control	2007-12-25 19:35:12 +0000
+++ b/debian/control	2008-01-07 01:51:34 +0000
@@ -2,8 +2,8 @@
 Section: admin
 Priority: optional
 Maintainer: Debian Administration team <debian-admin at lists.debian.org>
-Build-Depends: debhelper (>= 5), python-support (>= 0.3)
-Standards-Version: 3.5.8.0
+Build-Depends: debhelper (>= 5), python-support (>= 0.3), yodl
+Standards-Version: 3.7.3
 Uploaders: Ryan Murray <rmurray at debian.org>, Peter Palfrader <weasel at debian.org>
 
 Package: userdir-ldap

=== modified file 'debian/copyright'
--- a/debian/copyright	2007-12-28 15:30:07 +0000
+++ b/debian/copyright	2008-01-07 01:51:34 +0000
@@ -19,7 +19,7 @@
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
-The source of the Debian package was managed through CVS.  It was publically
+The source of the Debian package was managed through CVS.  It was publicly
 available at <http://cvs.debian.org/userdir-ldap/?cvsroot=debian-admin>.
 
 It is now managed using bzr and is publically available at

=== modified file 'debian/rules'
--- a/debian/rules	2007-12-25 10:22:37 +0000
+++ b/debian/rules	2008-01-07 02:03:12 +0000
@@ -3,51 +3,25 @@
 # Made with the aid of debmake, by Christoph Lameter,
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
-package:=userdir-ldap
-i:=./debian/$(package)
-pysite:=usr/share/python-support
-
 build:
 	dh_testdir
+	$(MAKE) -C doc
 	touch build
 
 clean:
 	dh_testdir
-	-rm -f build
-	-find . -name '*.py[co]' | xargs rm -f
-	-rm -rf $(i) debian/files* core debian/substvars
-
-instdirs = \
-	usr/bin \
-	$(pysite)/userdir_ldap \
-	usr/share/doc/$(package)/samples \
-	etc/userdir-ldap/templates \
-	etc/cron.d \
-	etc/ldap/schema	
+	rm -f build
+	find . -name '*.py[co]' -print0 | xargs -0 --no-run-if-empty rm -f
+	$(MAKE) -C doc clean
+	dh_clean
 
 binary-indep: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs $(instdirs)
-
-	echo "userdir_ldap" > $(i)/$(pysite)/userdir_ldap.pth
-	echo "userdir_gpg" >> $(i)/$(pysite)/userdir_ldap.pth
-	install -m 644 userdir_ldap.py userdir_gpg.py \
-		$(i)/$(pysite)/userdir_ldap/
-	install -m 755 {ud-forwardlist,ud-gpgimport,ud-info,ud-ldapshow,ud-userimport,ud-mailgate,ud-generate,ud-passchk,ud-useradd,ud-replicate,ud-xearth,ud-fingerserv,ud-echelon,ud-groupadd,ud-host,ud-zoneupdate,ud-roleadd} $(i)/usr/bin/
-	install -m 755 sigcheck $(i)/usr/bin/
-	install -m 644 debian/ud-replicate.cron.d $(i)/etc/cron.d/ud-replicate
-
-	install -m 644 doc/slapd-config.txt $(i)/usr/share/doc/$(package)
-	install -m 644 doc/samples/ud-* $(i)/usr/share/doc/$(package)/samples
-	gzip -9 $(i)/usr/share/doc/$(package)/*.txt
-	install -m 644 userdir-ldap.conf $(i)/etc/userdir-ldap/
-	echo "# See /usr/share/doc/userdir-ldap" > $(i)/etc/userdir-ldap/generate.conf
-	chmod 644 $(i)/etc/userdir-ldap/generate.conf
-	install -m 644 templates/*-* $(i)/etc/userdir-ldap/templates/
-	install -m 644 userdir-ldap.schema $(i)/etc/ldap/schema/
-
+	dh_installdirs
+	dh_install
+	dh_installcron --name=ud-replicate
 	dh_installdocs
 	dh_installchangelogs
 	dh_installman
@@ -56,12 +30,10 @@
 	dh_installdeb
 	dh_pysupport
 	dh_gencontrol
-#	dh_makeshlibs
 	dh_md5sums
 	dh_builddeb
 
 binary-arch: build
-	dh_testdir
 # There are no architecture-dependent files to be uploaded
 # generated by this package.  If there were any they would be
 # made here.

More information about the Da-tools-commits mailing list