16 files changed, 84 insertions, 40 deletions
diff --git a/debian/NEWS b/debian/NEWS
index db1335eb..ca0b9de0 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,6 +1,6 @@
 hurd (20110319-1) unstable; urgency=low
 
-  * To harmonize with Debian security conventions, the Debian
+    To harmonize with Debian security conventions, the Debian
     GNU/Hurd login prompt is now a standard login/password prompt,
     and not a login shell any more. To revert to a standard login, set the
     shell of the login user to /bin/bash.
@@ -9,7 +9,7 @@ hurd (20110319-1) unstable; urgency=low
 
 hurd (20050513-4) unstable; urgency=low
 
-  * The Hurd console may now be started automatically on bootup.  The
+    The Hurd console may now be started automatically on bootup.  The
     file `/etc/default/hurd-console' controls whether the Hurd console
     will be started, and if so, which options are used.  To get the 
     Hurd console on bootup, change ENABLE to `true' and adjust the
@@ -19,7 +19,7 @@ hurd (20050513-4) unstable; urgency=low
 
 hurd (20050119-1) unstable; urgency=low
 
-  * The command line syntax for the console client has slightly
+    The command line syntax for the console client has slightly
     changed.  It is no longer necessary or even allowed to specify the
     consnode path to the short `-c' option (e.g. `-c /dev/cons'),
     /dev/cons is implied as default (but can be changed using the long
diff --git a/debian/changelog b/debian/changelog
index 081b0c96..892d19f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+hurd (20130105-2) UNRELEASED; urgency=low
+
+  [ Samuel Thibault ]
+  * local/finish-install.d/51hurd_config-console: Disable the Hurd console on
+    the installed system if installation was done without it.
+
+  [ Pino Toscano ]
+  * Bump debhelper compatibility to 7:
+    - Bump compat to 7.
+    - Bump the debhelper build dependency to >= 7.
+    - Fix the dh_strip parameters.
+  * Rename hurd-console.default to hurd.hurd-console.default, and let it be
+    installed by dh_installinit.
+  * hurd/hurd-dev: install more stuff via dh_install, instead of copying them
+    manually.
+  * Turn the X11 compose data into static files in the debian directory
+    (instead of being generated at build time), and install them in hurd-udeb.
+  * Drop hurd-dbg.dirs, useless.
+  * hurd-udeb: remove XC-Package-Type, redundant with Package-Type.
+  * Fix Vcs-* keys to point to anonscm.debian.org.
+  * Remove asterisks from NEWS file.
+  * Update lintian overrides.
+  * Switch rules from cdbs to the sequential `dh':
+    - Bump the debhelper build dependency to >= 7.0.50~.
+    - Drop the cdbs build dependency.
+    - Install BUGS, NEWS, README, and TODO only in hurd.
+
+ -- Samuel Thibault <sthibault@debian.org>  Sun, 27 Jan 2013 20:38:39 +0100
+
 hurd (20130105-1) unstable; urgency=low
 
   [ Samuel Thibault ]
diff --git a/debian/compat b/debian/compat
index b8626c4c..7f8f011e 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 823ee556..256988bf 100644
--- a/debian/control
+++ b/debian/control
@@ -4,16 +4,16 @@ Priority: required
 Maintainer: GNU Hurd Maintainers <debian-hurd@lists.debian.org>
 Standards-Version: 3.9.3
 Build-Depends: mig (>= 1.3-2), gnumach-dev (>= 2:1.3.99.dfsg.cvs20070526),
- libc0.3-dev (>= 2.13-38~), texinfo, texi2html, libncursesw5-dev, cdbs,
- debhelper (>= 4.2.0), gcc-4.7, dpkg (>= 1.15.4) | install-info, autoconf,
+ libc0.3-dev (>= 2.13-38~), texinfo, texi2html, libncursesw5-dev,
+ debhelper (>= 7.0.50~), gcc-4.7, dpkg (>= 1.15.4) | install-info, autoconf,
  libparted-dev, libpciaccess-dev, libx11-dev, x11proto-core-dev, pkg-config,
  xkb-data, flex, bison
 Uploaders: Jeff Bailey <jbailey@raspberryginger.com>,
  Neal H. Walfield <neal@debian.org>, Michael Banck <mbanck@debian.org>, 
  Samuel Thibault <sthibault@debian.org>
 Homepage: http://www.gnu.org/software/hurd/hurd.html
-Vcs-Browser: http://git.debian.org/?p=pkg-hurd/hurd.git
-Vcs-Git: git://git.debian.org/pkg-hurd/hurd.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-hurd/hurd.git
+Vcs-Git: git://anonscm.debian.org/pkg-hurd/hurd.git
 
 Package: hurd
 Essential: yes
@@ -62,7 +62,6 @@ Package-Type: udeb
 Priority: optional
 Section: debian-installer
 Architecture: hurd-any
-XC-Package-Type: udeb
 Depends: ${misc:Depends}, xkb-data-udeb
 Provides: hurd, ext2-modules, fat-modules, ipv6-modules, isofs-modules, loop-modules, mouse-modules, nfs-modules, socket-modules, ufs-modules
 Description: GNU Hurd - udeb
diff --git a/debian/hurd-dbg.dirs b/debian/hurd-dbg.dirs
deleted file mode 100644
index 08d9e7ae..00000000
--- a/debian/hurd-dbg.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/debug
diff --git a/debian/hurd-dev.install b/debian/hurd-dev.install
index 2bfce014..181fc63f 100644
--- a/debian/hurd-dev.install
+++ b/debian/hurd-dev.install
@@ -5,3 +5,5 @@ libdde_linux26/lib/src/libdde_*.a usr/lib
 libdde_linux26/mk usr/share/libdde_linux26
 libdde_linux26/Makeconf* usr/share/libdde_linux26
 debian/tmp/usr/share/libdde_linux26/build usr/share/libdde_linux26
+debian/local/cdrom.h usr/include/sys
+debian/local/soundcard.h usr/include/sys
diff --git a/debian/hurd-udeb.install b/debian/hurd-udeb.install
index 69e6a751..486763b8 100644
--- a/debian/hurd-udeb.install
+++ b/debian/hurd-udeb.install
@@ -2,6 +2,7 @@ debian/local/runsystem etc/hurd
 debian/local/setup-translators usr/lib/hurd
 debian/local/partman lib
 debian/local/finish-install.d usr/lib
+debian/local/X11/locale usr/share/X11
 debian/tmp/lib/*.so.*
 debian/tmp/lib/hurd/console/pc_kbd.so.* usr/lib/hurd/console
 debian/tmp/lib/hurd/console/pc_mouse.so.* usr/lib/hurd/console
diff --git a/debian/hurd-udeb.lintian-overrides b/debian/hurd-udeb.lintian-overrides
index 0f8c470e..7f67c429 100644
--- a/debian/hurd-udeb.lintian-overrides
+++ b/debian/hurd-udeb.lintian-overrides
@@ -1,2 +1,3 @@
 non-standard-toplevel-dir hurd/
 non-standard-toplevel-dir servers/
+package-contains-empty-directory servers/
diff --git a/debian/hurd.docs b/debian/hurd.docs
new file mode 100644
index 00000000..b5c73628
--- /dev/null
+++ b/debian/hurd.docs
@@ -0,0 +1,4 @@
+BUGS
+NEWS
+README
+TODO
diff --git a/debian/hurd-console.default b/debian/hurd.hurd-console.default
index db67f3fa..db67f3fa 100644
--- a/debian/hurd-console.default
+++ b/debian/hurd.hurd-console.default
diff --git a/debian/hurd.install b/debian/hurd.install
index 6dff36c9..4d0b2599 100644
--- a/debian/hurd.install
+++ b/debian/hurd.install
@@ -68,3 +68,5 @@ debian/tmp/etc/ttys
 debian/tmp/dev/MAKEDEV
 debian/tmp/share/msgids/*.msgids usr/share/msgids
 debian/tmp/usr/share/X11/xkb
+console/motd.UTF8 etc
+release/servers.boot boot
diff --git a/debian/hurd.lintian-overrides b/debian/hurd.lintian-overrides
index 4a82454d..9b19749e 100644
--- a/debian/hurd.lintian-overrides
+++ b/debian/hurd.lintian-overrides
@@ -1,7 +1,7 @@
-new-essential-package
 statically-linked-binary hurd/mach-defpager
 setuid-binary bin/ids 4755 root/root
 setuid-binary bin/login 4755 root/root
 setuid-binary bin/ps-hurd 4755 root/root
 setuid-binary usr/bin/w-hurd 4755 root/root
-possibly-insecure-handling-of-tmp-files-in-maintainer-script postinst:65
+possibly-insecure-handling-of-tmp-files-in-maintainer-script postinst:75
+package-contains-empty-directory servers/socket/
diff --git a/debian/local/X11/locale/Compose b/debian/local/X11/locale/Compose
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/debian/local/X11/locale/Compose
diff --git a/debian/local/X11/locale/compose.dir b/debian/local/X11/locale/compose.dir
new file mode 100644
index 00000000..875529f9
--- /dev/null
+++ b/debian/local/X11/locale/compose.dir
@@ -0,0 +1 @@
+Compose C
diff --git a/debian/local/finish-install.d/51hurd_config-console b/debian/local/finish-install.d/51hurd_config-console
new file mode 100755
index 00000000..03cc7697
--- /dev/null
+++ b/debian/local/finish-install.d/51hurd_config-console
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+[ -f /var/run/hurd-console.pid ] || sed -i -e "s/ENABLE='true'/ENABLE='false'/" /target/etc/default/hurd-console
diff --git a/debian/rules b/debian/rules
index a64762cc..7a4e78ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,29 +17,35 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307 USA.
 
-DEB_BUILDDIR = $(DEB_SRCDIR)/build
+DEB_DESTDIR = $(CURDIR)/debian/tmp
+
+CONFIGURE_ARGS = --disable-profile --enable-static-progs='ext2fs,ufs,iso9660fs'
+SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /usr/bin/w-hurd
 
 CC=gcc-4.7
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+%:
+	dh $@ -Bbuild --with autotools_dev
 
-DEB_CONFIGURE_USER_FLAGS := --disable-profile --enable-static-progs='ext2fs,ufs,iso9660fs'
-DEB_MAKE_INSTALL_TARGET = install prefix=$(DEB_DESTDIR) sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb
-DEB_DH_STRIP_ARGS := --dbg-package=hurd
-DEB_DH_MAKESHLIBS_ARGS_hurd := --add-udeb="hurd-udeb"
+override_dh_auto_configure:
+	dh_auto_configure -Bbuild -- $(CONFIGURE_ARGS) $(shell dpkg-buildflags --export=configure)
 
-build/hurd::
-	cd $(DEB_BUILDDIR)/doc && texi2html -split chapter ../../doc/hurd.texi
+override_dh_auto_build:
+	dh_auto_build -Bbuild
+	cd build/doc && texi2html -split chapter ../../doc/hurd.texi
 	$(MAKE) -C libdde_linux26 BUILDDIR=$(CURDIR)/build
 
-clean::
+override_dh_auto_clean:
+	dh_auto_clean
 	$(MAKE) -C libdde_linux26 cleanall
 	rm -f $$(find libdde_linux26 -name \*.d)
 	rm -fr libdde_linux26/build
 	rm -fr libdde_linux26/lib/src/gen_crc32table libdde_linux26/lib/src/crc32table.h libdde_linux26/lib/src/timeconst.h
 
-install/hurd::
+override_dh_auto_install:
+	dh_auto_install -Bbuild --destdir= -- prefix=$(DEB_DESTDIR) sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb
+	$(MAKE) -C libdde_linux26 INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install
+
 	# runsystem is managed by update-alternatives
 	mv debian/tmp/lib/hurd/runsystem debian/tmp/lib/hurd/runsystem.gnu
 
@@ -57,25 +63,22 @@ install/hurd::
 	mv debian/tmp/sbin/halt debian/tmp/sbin/halt-hurd
 	mv debian/tmp/sbin/reboot debian/tmp/sbin/reboot-hurd
 
-	install -m664 debian/hurd-console.default debian/hurd/etc/default/hurd-console
+	# remove PIC static libraries
+	rm -f debian/tmp/lib/*_pic.a
 
-	install -m664 $(DEB_SRCDIR)/console/motd.UTF8 debian/hurd/etc/
-	install -m664 $(DEB_SRCDIR)/release/servers.boot debian/hurd/boot/
+override_dh_installinit:
+	dh_installinit -phurd --name=hurd-console
+	dh_installinit --remaining-packages
 
-	$(MAKE) -C libdde_linux26 INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install
-
-	mkdir -p debian/tmp/usr/share/X11/locale
-	echo Compose C > debian/tmp/usr/share/X11/locale/compose.dir
-	touch debian/tmp/usr/share/X11/locale/Compose
+override_dh_strip:
+	dh_strip -phurd --dbg-package=hurd-dbg
+	dh_strip --remaining-packages
 
-install/hurd-dev::
-	install -m644 debian/local/soundcard.h debian/tmp/include/sys
-	install -m644 debian/local/cdrom.h debian/tmp/include/sys
-
-SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /usr/bin/w-hurd
+override_dh_fixperms:
+	dh_fixperms
+	chmod u+s $(patsubst %,$(CURDIR)/debian/hurd%,$(SUID_PROGRAMS))
 
-binary-predeb/hurd::
-	chmod u+s $(patsubst %, $(CURDIR)/debian/$(cdbs_curpkg)%, $(SUID_PROGRAMS))
-binary-predeb/hurd-dev:: 
-	rm -f $(CURDIR)/debian/hurd-dev/lib/*_pic.a
+override_dh_makeshlibs:
+	dh_makeshlibs -phurd --add-udeb=hurd-udeb
+	dh_makeshlibs --remaining-packages