* 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

diff --git a/debian/changelog b/debian/changelog
index d2071e6..64a6dcd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,8 +45,16 @@ userdir-ldap (0.3.15+xxx) XXunstable; urgency=low
 
   [ Stephen Gran ]
   * ud-fingerserv: implement daemonize() for non-inetd mode.
-
- -- Joerg Jaspert <joerg@debian.org>  Fri, 28 Dec 2007 16:29:35 +0100
+  * 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
+
+ -- Stephen Gran <sgran@debian.org>  Mon, 07 Jan 2008 01:50:15 +0000
 
 userdir-ldap (0.3.15) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 4639a48..1450230 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: userdir-ldap
 Section: admin
 Priority: optional
 Maintainer: Debian Administration team <debian-admin@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@debian.org>, Peter Palfrader <weasel@debian.org>
 
 Package: userdir-ldap

diff --git a/debian/copyright b/debian/copyright
index 9372234..7e8397c 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,7 +19,7 @@ userdir-ldap has been released under the GNU General Public License.
 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

diff --git a/debian/dirs b/debian/dirs
new file mode 100644 (file)
index 0000000..5e72314
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,3 @@
+usr/share/python-support/userdir_ldap
+etc/userdir-ldap/templates
+etc/ldap/schema 

diff --git a/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..17ae9c1
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+doc/slapd-config.txt
+doc/samples

diff --git a/debian/install b/debian/install
new file mode 100644 (file)
index 0000000..348510a
--- /dev/null
+++ b/debian/install
@@ -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/templates/
+userdir-ldap.schema etc/ldap/schema/

diff --git a/debian/manpages b/debian/manpages
new file mode 100644 (file)
index 0000000..a5ed1bc
--- /dev/null
+++ b/debian/manpages
@@ -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

diff --git a/debian/rules b/debian/rules
index 1ca73bf..b92d586 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -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
        touch build
+       $(MAKE) -C doc
 
 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 @@ binary-indep: build
        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.

diff --git a/doc/Makefile b/doc/Makefile
new file mode 100644 (file)
index 0000000..03a9f4d
--- /dev/null
+++ b/doc/Makefile
@@ -0,0 +1,13 @@
+.SILENT:
+
+MANPAGES = ud-generate.8 ud-gpgimport.8 ud-info.1 ud-xearth.1 ud-useradd.8 \
+           ud-userimport.8 ud-mailgate.8
+
+all: $(MANPAGES)
+
+$(MANPAGES) :: % : %.yo
+       echo Creating man page $@
+       yodl2man -o $@ $<
+               
+clean:
+       rm -f $(MANPAGES)

diff --git a/doc/makefile b/doc/makefile
deleted file mode 100644 (file)
index 9dcefb4..0000000
--- a/doc/makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-.SILENT:
-
-MANPAGES = ud-generate.8 ud-gpgimport.8 ud-info.1 ud-xearth.1 ud-useradd.8 \
-           ud-userimport.8 ud-mailgate.8
-
-all: $(MANPAGES)
-
-$(MANPAGES) :: % : %.yo
-       echo Creating man page $@
-       yodl2man -o $@ $<
-               

diff --git a/generate.conf b/generate.conf
new file mode 100644 (file)
index 0000000..bc427ad
--- /dev/null
+++ b/generate.conf
@@ -0,0 +1 @@
+# See /usr/share/doc/userdir-ldap

diff --git a/userdir_ldap.pth b/userdir_ldap.pth
new file mode 100644 (file)
index 0000000..002ef2e
--- /dev/null
+++ b/userdir_ldap.pth
@@ -0,0 +1,2 @@
+userdir_ldap
+userdir_gpg