Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd

Conflicts:
	debian/changelog
	debian/hurd-udeb.install.in

1 files changed, 29 insertions, 14 deletions

diff --git a/debian/rules b/debian/rules
index a1aa0674..99fafdea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,30 +18,34 @@
 # 02111-1307 USA.
 
 DEB_DESTDIR = $(CURDIR)/debian/tmp
+DEB_DESTDIR_UDEB = $(CURDIR)/debian/tmp-udeb
 
-CONFIGURE_ARGS = --disable-profile --enable-static-progs='ext2fs,ufs,iso9660fs'
+CONFIGURE_ARGS = --disable-profile --enable-static-progs='ext2fs,iso9660fs'
+CONFIGURE_ARGS_deb =
+CONFIGURE_ARGS_udeb =
 SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /usr/bin/w-hurd
 
-CC=gcc-4.7
-
 DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 INSTALL_in := $(wildcard debian/*.install.in)
 INSTALL_generated := $(patsubst %.in,%,$(INSTALL_in))
 
 %:
-	dh $@ -Bbuild --with autotools_dev,autoreconf
+	dh $@ -Bbuild-deb --with autotools_dev,autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -Bbuild -- $(CONFIGURE_ARGS) $(shell dpkg-buildflags --export=configure)
+	dh_auto_configure -Bbuild-deb -- $(CONFIGURE_ARGS) $(CONFIGURE_ARGS_deb) $(shell dpkg-buildflags --export=configure)
+	dh_auto_configure -Bbuild-udeb -- $(CONFIGURE_ARGS) $(CONFIGURE_ARGS_udeb) $(shell dpkg-buildflags --export=configure)
 
 override_dh_auto_build:
-	dh_auto_build -Bbuild
-	cd build/doc && make && makeinfo --html --split=chapter ../../doc/hurd.texi
-	$(MAKE) -C libdde-linux26 BUILDDIR=$(CURDIR)/build
+	dh_auto_build -Bbuild-deb
+	dh_auto_build -Bbuild-udeb
+	cd build-deb/doc && make && makeinfo --html --split=chapter ../../doc/hurd.texi
+	$(MAKE) -C libdde-linux26 BUILDDIR=$(CURDIR)/build-deb
 
 override_dh_auto_clean:
-	dh_auto_clean
+	dh_auto_clean -Bbuild-deb
+	dh_auto_clean -Bbuild-udeb
 	$(MAKE) -C libdde-linux26 cleanall
 	rm -f $$(find libdde-linux26 -name \*.d)
 	rm -fr libdde-linux26/build
@@ -49,8 +53,9 @@ override_dh_auto_clean:
 	rm -f $(INSTALL_generated)
 
 override_dh_auto_install:
-	dh_auto_install -Bbuild --destdir= -- prefix=$(DEB_DESTDIR) libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH) 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
+	dh_auto_install -Bbuild-deb --destdir= -- prefix=$(DEB_DESTDIR) libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH) sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb
+	dh_auto_install -Bbuild-udeb --destdir= -- prefix=$(DEB_DESTDIR_UDEB) libdir=$(DEB_DESTDIR_UDEB)/lib sysconfdir=$(DEB_DESTDIR_UDEB)/etc localstatedir=$(DEB_DESTDIR_UDEB)/var XKB_BASE=$(DEB_DESTDIR_UDEB)/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
@@ -63,6 +68,11 @@ override_dh_auto_install:
 	mv debian/tmp/bin/uptime debian/tmp/usr/bin/uptime-hurd
 	mv debian/tmp/bin/vmstat debian/tmp/usr/bin/vmstat-hurd
 	mv debian/tmp/bin/w debian/tmp/usr/bin/w-hurd
+	mkdir -p debian/tmp-udeb/usr/bin
+	mv debian/tmp-udeb/bin/ps debian/tmp-udeb/bin/ps-hurd
+	mv debian/tmp-udeb/bin/uptime debian/tmp-udeb/usr/bin/uptime-hurd
+	mv debian/tmp-udeb/bin/vmstat debian/tmp-udeb/usr/bin/vmstat-hurd
+	mv debian/tmp-udeb/bin/w debian/tmp-udeb/usr/bin/w-hurd
 
 	# move away halt and reboot to not conflict with sysvinit
 	# (they will be handled as alternatives)
@@ -71,9 +81,11 @@ override_dh_auto_install:
 
 	# remove PIC static libraries
 	rm -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*_pic.a
+	rm -f debian/tmp-udeb/lib/*_pic.a
 
 override_dh_install: $(INSTALL_generated)
-	dh_install --list-missing
+	dh_install $(addprefix -p,$(filter %-udeb,$(shell dh_listpackages))) --sourcedir=debian/tmp-udeb
+	dh_install --remaining-packages --list-missing --sourcedir=debian/tmp
 
 override_dh_installinit:
 	dh_installinit -phurd --name=hurd-console
@@ -92,8 +104,11 @@ override_dh_fixperms:
 
 override_dh_makeshlibs:
 	dh_makeshlibs -phurd-libs0.3 --add-udeb=hurd-libs0.3-udeb
-	dh_makeshlibs -phurd --add-udeb=hurd-udeb
-	dh_makeshlibs --remaining-packages
+	dh_makeshlibs --remaining-packages -Xusr/lib/hurd/
+
+override_dh_clean:
+	dh_clean
+	rm -rf debian/tmp-udeb
 
 debian/%.install: debian/%.install.in
 	cat $^ | sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' > $@