Merge lp:~vagrantc/ltsp/ltsp-ubuntu-debian-packaging-sync into lp:~stgraber/ltsp/ltsp.karmic

[Vagrant Cascadian]

[Vagrant Cascadian (vagrantc)]

some minor fixes, and a switch to debhelper 7, bringing it closer in sync with Debian.

[Stéphane Graber (stgraber)]

Marking as Rejected as we've got a new batch of patches done by Alkis.

Unmerged revisions

45. By Vagrant Cascadian on 2009-09-10

switch to debhelper 7

44. By Vagrant Cascadian on 2009-09-10

updated upstream and debian dir URLs in copyright

43. By Vagrant Cascadian on 2009-09-10

sync updates to reportbug hooks

=== modified file 'debian/bugs/ltsp-server/script'
--- debian/bugs/ltsp-server/script	2009-02-09 18:58:17 +0000
+++ debian/bugs/ltsp-server/script	2009-09-10 02:20:36 +0000
@@ -3,10 +3,15 @@
 for chroot in $(find /opt/ltsp/ -mindepth 1 -maxdepth 1 -type d) ; do
     if [ -f $chroot/var/lib/dpkg/status ]; then
         echo "packages in chroot: $chroot" >&3
-        COLUMNS=120 dpkg --root=$chroot -l ltsp-client ldm initramfs-tools | egrep 'ltsp-client|ldm|initramfs-tools' >&3
+        COLUMNS=120 dpkg --root=$chroot -l 'ltsp*' ldm | egrep 'ltsp-client|ldm|ltspfs' >&3
     fi
     if [ -f $chroot/etc/lts.conf ]; then
         echo "lts.conf from chroot: $chroot" >&3
         cat $chroot/etc/lts.conf >&3
     fi
 done
+if [ -d "/opt/ltsp/images" ]; then
+    for image in $(find /opt/ltsp/images/ -type f -name '*.img' ); do
+        echo found image $image >&3
+    done
+fi

=== modified file 'debian/compat'
--- debian/compat	2009-06-14 17:57:34 +0000
+++ debian/compat	2009-09-10 03:19:42 +0000
@@ -1,1 +1,1 @@
-5
+7

=== modified file 'debian/control'
--- debian/control	2009-09-07 02:40:18 +0000
+++ debian/control	2009-09-10 03:19:42 +0000
@@ -2,7 +2,7 @@
 Section: misc
 Priority: extra
 Maintainer: Stephane Graber <[e-mail]>
-Build-Depends: debhelper (>= 5), flex, bison, libpopt-dev, po-debconf, libgtk2.0-dev
+Build-Depends: debhelper (>= 7), flex, bison, libpopt-dev, po-debconf, libgtk2.0-dev
 Standards-Version: 3.8.3
 Homepage: http://www.ltsp.org
 Vcs-Bzr: http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk

=== modified file 'debian/copyright'
--- debian/copyright	2009-02-09 18:58:17 +0000
+++ debian/copyright	2009-09-10 02:26:08 +0000
@@ -4,13 +4,13 @@
 Modifications for use with debian by Vagrant Cascadian <[e-mail]>
 in August of 2005.
 
-The Ubuntu upstream source tree can be found on launchpad:
-
-bzr get http://bazaar.lauchpad.net/~ogra/ltsp-mainline
-
-The source tree for Debian packages can be downloaded using bzr:
-
-bzr get http://bzr.debian.org/bzr/pkg-ltsp/main
+The upstream source tree can be found on launchpad:
+
+ bzr get http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk
+
+The debian dir for ltsp packages in Debian is maintained in bzr:
+
+ bzr get http://bzr.debian.org/bzr/pkg-ltsp/ltsp-debian-packaging
 
 The original LTSP sources can be downloaded from: http://ltsp.org
 

=== modified file 'debian/rules'
--- debian/rules	2009-09-07 02:40:18 +0000
+++ debian/rules	2009-09-10 03:19:42 +0000
@@ -1,21 +1,15 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# This file is public domain software, originally written by Joey Hess. 
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
-DEB_SRC_BUILD_PROG:=dpkg-buildpackage -rfakeroot -S -sa
 
 build: build-stamp
 build-stamp:
-	dh_testdir
+	dh --before dh_auto_configure build
 	cd localapps; ./configure --prefix=/usr --libexecdir=/usr/lib; cd -
 
 	$(MAKE) -C client/getltscfg
 	$(MAKE) -C localapps
 	$(MAKE) -C po update-po
+	dh --after dh_auto_configure build
+
 	touch build-stamp
 
 clean:
@@ -23,8 +17,9 @@
 	dh_testroot
 	rm -f build-stamp
 
-#	$(MAKE) -C client/getltscfg clean
-#	$(MAKE) -C localapps clean
+	[ ! -f client/getltscfg/Makefile ] || $(MAKE) -C client/getltscfg clean
+
+	[ ! -f localapps/Makefile ] || $(MAKE) -C localapps clean
 
 	# Using po specific Makefile to clean message catalogs
 	$(MAKE) -C po clean
@@ -32,70 +27,32 @@
 	# Debconf translation update
 	debconf-updatepo
 
+	chmod +x debian/bugs/ltsp-server/script
+
 	dh_clean
 
 install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Make the bug reporting script executable
-	chmod +x debian/bugs/ltsp-server/script
-
-	# Using po specific Makefile to install message catalogs
-	$(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ltsp-server/
 
 	# Copy default and init scripts from upstream code
 	cp $(CURDIR)/client/initscripts/ltsp-core $(CURDIR)/debian/ltsp-client-core.init
 	cp $(CURDIR)/client/initscripts/ltsp-setup $(CURDIR)/debian/ltsp-client-core.ltsp-client-setup.init
 	cp $(CURDIR)/client/initscripts/ltsp-setup.default $(CURDIR)/debian/ltsp-client-core.ltsp-client-setup.default
 
+	dh --before dh_installinit install
+	dh_installinit -pltsp-client-core --name=ltsp-client-setup --no-start -u"start 32 S ."
+	dh_installinit -a --no-start -u"start 25 2 ."
+	dh --after dh_installinit install
+
+	# Using po specific Makefile to install message catalogs
+	$(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ltsp-server/
+
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_install -i -Xarch-ids
-	dh_installdebconf -i
-	dh_installman -pltsp-server -pltsp-client-core
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+	dh binary-indep
 
 # Build architecture-dependent files here.
 binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs -a
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_install -a
-	dh_installdebconf -a
-	dh_installinit -a --no-start -u"start 25 2 ."
-	dh_installinit --name=ltsp-client-setup --no-start -u"start 32 S ."
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-bzr-release:
-	bzr export ltsp-$(DEB_UPSTREAM_VERSION) 
-	rm -rf ltsp-$(DEB_UPSTREAM_VERSION)/debian
-	tar czf ../ltsp_$(DEB_UPSTREAM_VERSION).orig.tar.gz ltsp-$(DEB_UPSTREAM_VERSION)
-	rm -rf ltsp-$(DEB_UPSTREAM_VERSION)
+	dh binary-arch
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install bzr-release
+.PHONY: build clean binary-indep binary-arch binary install