diff options
| -rw-r--r-- | debian/changelog | 30 | ||||
| -rw-r--r-- | debian/control | 13 | ||||
| -rw-r--r-- | debian/hurd-dev.install.in | 22 | ||||
| -rw-r--r-- | debian/hurd-doc.docs | 2 | ||||
| -rw-r--r-- | debian/hurd-libs0.3-udeb.install.in | 2 | ||||
| -rw-r--r-- | debian/hurd-libs0.3.install.in | 2 | ||||
| -rw-r--r-- | debian/hurd-udeb.install.in | 147 | ||||
| -rw-r--r-- | debian/hurd.install.in | 139 | ||||
| -rw-r--r-- | debian/patches/rc.patch | 25 | ||||
| -rw-r--r-- | debian/patches/run.patch | 8 | ||||
| -rwxr-xr-x | debian/rules | 43 |
11 files changed, 237 insertions, 196 deletions
diff --git a/debian/changelog b/debian/changelog index d51cd603..8953d3cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,35 @@ hurd (20130916-2) UNRELEASED; urgency=low - * hurd-udeb.install.in: Add hurd/mtab. * TODO: drop libdaemon dependency for hurd-udeb. - -- Samuel Thibault <sthibault@debian.org> Mon, 16 Sep 2013 15:21:43 +0000 + [ Samuel Thibault ] + * control, hurd.install.in, rules: Remove ufs parts. + * patches/rc.patch: Make sure /proc is mounted at boot. + * hurd-udeb.install.in: Add hurd/mtab. + + [ Justus Winter ] + * Include the nullauth utility in hurd and hurd-udeb. + + [ Pino Toscano ] + * Add missing libpcap0.8-dev build dependency. + * Add ${perl:Depends} in hurd-dev. + * Add ${shlibs:Depends} in hurd-libs0.3-udeb and hurd-udeb. + * Rename the installed libdde-linux26 stuff back to libdde_linux26. + * Exclude shlibs for private modules in /usr/lib/hurd; this allows the drop + of the shlibs for hurd, which has no public libraries anymore after the + hurd-libs0.3 split. + * run.patch: refresh to apply without fuzz. + * Rename the "build" build dir to "build-deb". + * Force the sourcedir for dh_install to debian/tmp, and strip/fix the paths + in *.install.in files according to the new root. + * Do a separate build for the udeb variant, so it can have a different + configuration: + - Use build-udeb as build dir. + - Use debian/tmp-udeb as DESTDIR, and use it as sourcedir for dh_install + of *-udeb binaries. + * Remove duplicated texinfo build dependency. + + -- Samuel Thibault <sthibault@debian.org> Tue, 17 Sep 2013 19:42:22 +0200 hurd (20130916-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 7beea8f9..3c2047b7 100644 --- a/debian/control +++ b/debian/control @@ -4,10 +4,10 @@ Priority: required Maintainer: GNU Hurd Maintainers <debian-hurd@lists.debian.org> Standards-Version: 3.9.4 Build-Depends: mig (>= 1.3-2), gnumach-dev (>= 2:1.3.99.dfsg.cvs20070526), - libc0.3-dev (>= 2.13-38~), texinfo, texinfo, libncursesw5-dev, + libc0.3-dev (>= 2.13-38~), texinfo, libncursesw5-dev, debhelper (>= 7.0.50~), gcc-4.7, dpkg (>= 1.15.4) | install-info, autoconf, dh-autoreconf, libparted-dev, libpciaccess-dev, libx11-dev, x11proto-core-dev, pkg-config, - xkb-data, gawk, flex, bison, autotools-dev, libdaemon-dev + xkb-data, gawk, flex, bison, autotools-dev, libdaemon-dev, libpcap0.8-dev Uploaders: Michael Banck <mbanck@debian.org>, Samuel Thibault <sthibault@debian.org> Homepage: http://www.gnu.org/software/hurd/hurd.html @@ -42,7 +42,8 @@ Package: hurd-dev Priority: standard Section: libdevel Architecture: hurd-any -Depends: ${misc:Depends}, ${shlibs:Depends}, libc0.3-dev (>= 2.13-31~), hurd (= ${binary:Version}) +Depends: ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends}, + libc0.3-dev (>= 2.13-31~), hurd (= ${binary:Version}) Replaces: hurd (<< 20130226-2~) Breaks: hurd (<< 20130226-2~) Description: GNU Hurd (development files) @@ -70,7 +71,7 @@ Section: debian-installer Package-Type: udeb Priority: optional Architecture: hurd-any -Depends: ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: GNU Hurd (libraries) - udeb This package contains the libraries used by GNU Hurd udeb. @@ -79,8 +80,8 @@ Package-Type: udeb Priority: optional Section: debian-installer Architecture: hurd-any -Depends: ${misc:Depends}, hurd-libs0.3-udeb (= ${binary:Version}), xkb-data-udeb -Provides: hurd, ext2-modules, fat-modules, ipv6-modules, isofs-modules, loop-modules, mouse-modules, nfs-modules, socket-modules, ufs-modules +Depends: ${misc:Depends}, ${shlibs:Depends}, hurd-libs0.3-udeb (= ${binary:Version}), xkb-data-udeb +Provides: hurd, ext2-modules, fat-modules, ipv6-modules, isofs-modules, loop-modules, mouse-modules, nfs-modules, socket-modules Description: GNU Hurd - udeb This is the GNU Hurd udeb package. It contains essential system software and libraries. diff --git a/debian/hurd-dev.install.in b/debian/hurd-dev.install.in index f5e222f6..d5514a32 100644 --- a/debian/hurd-dev.install.in +++ b/debian/hurd-dev.install.in @@ -1,11 +1,11 @@ -debian/tmp/bin/timertest -debian/tmp/bin/fstests -debian/tmp/lib/@DEB_HOST_MULTIARCH@/*.a lib/@DEB_HOST_MULTIARCH@ -debian/tmp/include/* usr/include -debian/tmp/lib/@DEB_HOST_MULTIARCH@/*.so lib/@DEB_HOST_MULTIARCH@ -libdde-linux26/lib/src/libdde_*.a usr/lib/@DEB_HOST_MULTIARCH@ -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 +../../libdde-linux26/Makeconf* usr/share/libdde_linux26 +../../libdde-linux26/lib/src/libdde_*.a usr/lib/@DEB_HOST_MULTIARCH@ +../../libdde-linux26/mk usr/share/libdde_linux26 +../local/cdrom.h usr/include/sys +../local/soundcard.h usr/include/sys +bin/fstests +bin/timertest +include/* usr/include +lib/@DEB_HOST_MULTIARCH@/*.a +lib/@DEB_HOST_MULTIARCH@/*.so +usr/share/libdde_linux26/build usr/share/libdde_linux26 diff --git a/debian/hurd-doc.docs b/debian/hurd-doc.docs index beba2b2e..62ea5fe9 100644 --- a/debian/hurd-doc.docs +++ b/debian/hurd-doc.docs @@ -1,2 +1,2 @@ -build/doc/hurd +build-deb/doc/hurd doc/navigating diff --git a/debian/hurd-libs0.3-udeb.install.in b/debian/hurd-libs0.3-udeb.install.in index 8b69f0c1..005ac229 100644 --- a/debian/hurd-libs0.3-udeb.install.in +++ b/debian/hurd-libs0.3-udeb.install.in @@ -1 +1 @@ -debian/tmp/lib/@DEB_HOST_MULTIARCH@/*.so.* lib +lib/*.so.* diff --git a/debian/hurd-libs0.3.install.in b/debian/hurd-libs0.3.install.in index 5c37f7cd..05e58770 100644 --- a/debian/hurd-libs0.3.install.in +++ b/debian/hurd-libs0.3.install.in @@ -1 +1 @@ -debian/tmp/lib/@DEB_HOST_MULTIARCH@/*.so.* +lib/@DEB_HOST_MULTIARCH@/*.so.* diff --git a/debian/hurd-udeb.install.in b/debian/hurd-udeb.install.in index 3262ebb2..25c268c8 100644 --- a/debian/hurd-udeb.install.in +++ b/debian/hurd-udeb.install.in @@ -1,73 +1,74 @@ -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/@DEB_HOST_MULTIARCH@/hurd/console/pc_kbd.so.* usr/lib/hurd/console -debian/tmp/lib/@DEB_HOST_MULTIARCH@/hurd/console/pc_mouse.so.* usr/lib/hurd/console -debian/tmp/lib/@DEB_HOST_MULTIARCH@/hurd/console/vga.so.* usr/lib/hurd/console -debian/tmp/lib/hurd/console-run sbin -debian/tmp/sbin/e2os -debian/tmp/sbin/MAKEDEV -debian/tmp/sbin/losetup -debian/tmp/sbin/swapon -debian/tmp/sbin/swapoff -debian/tmp/bin/boot -debian/tmp/bin/console -debian/tmp/bin/shd -debian/tmp/bin/ps-hurd -debian/tmp/bin/settrans -debian/tmp/bin/showtrans -debian/tmp/bin/syncfs -debian/tmp/bin/fsysopts -debian/tmp/bin/storeinfo -debian/tmp/bin/login -debian/tmp/usr/bin/w-hurd -debian/tmp/usr/bin/uptime-hurd -debian/tmp/bin/ids -debian/tmp/bin/loginpr -debian/tmp/bin/sush -debian/tmp/usr/bin/vmstat-hurd -debian/tmp/bin/portinfo -debian/tmp/bin/devprobe -debian/tmp/bin/vminfo -debian/tmp/bin/addauth -debian/tmp/bin/rmauth -debian/tmp/bin/unsu -debian/tmp/bin/setauth -debian/tmp/bin/storecat -debian/tmp/bin/storeread -debian/tmp/bin/msgport -debian/tmp/bin/mount -debian/tmp/bin/umount -debian/tmp/dev/MAKEDEV -debian/tmp/hurd/auth -debian/tmp/hurd/console -debian/tmp/hurd/devnode -debian/tmp/hurd/exec -debian/tmp/hurd/ext2fs -debian/tmp/hurd/ext2fs.static /boot -debian/tmp/hurd/fatfs -debian/tmp/hurd/fifo -debian/tmp/hurd/firmlink -debian/tmp/hurd/fwd -debian/tmp/hurd/ifsock -debian/tmp/hurd/init -debian/tmp/hurd/iso9660fs -debian/tmp/hurd/mach-defpager -debian/tmp/hurd/magic -debian/tmp/hurd/mtab -debian/tmp/hurd/new-fifo -debian/tmp/hurd/null -debian/tmp/hurd/pfinet -debian/tmp/hurd/pflocal -debian/tmp/hurd/proc -debian/tmp/hurd/procfs -debian/tmp/hurd/proxy-defpager -debian/tmp/hurd/random -debian/tmp/hurd/storeio -debian/tmp/hurd/streamio -debian/tmp/hurd/symlink -debian/tmp/hurd/term -debian/tmp/hurd/tmpfs -debian/tmp/usr/share/X11 +../local/X11/locale usr/share/X11 +../local/finish-install.d usr/lib +../local/partman lib +../local/runsystem etc/hurd +../local/setup-translators usr/lib/hurd +bin/addauth +bin/boot +bin/console +bin/devprobe +bin/fsysopts +bin/ids +bin/login +bin/loginpr +bin/mount +bin/msgport +bin/nullauth +bin/portinfo +bin/ps-hurd +bin/rmauth +bin/setauth +bin/settrans +bin/shd +bin/showtrans +bin/storecat +bin/storeinfo +bin/storeread +bin/sush +bin/syncfs +bin/umount +bin/unsu +bin/vminfo +dev/MAKEDEV +hurd/auth +hurd/console +hurd/devnode +hurd/exec +hurd/ext2fs +hurd/ext2fs.static /boot +hurd/fatfs +hurd/fifo +hurd/firmlink +hurd/fwd +hurd/ifsock +hurd/init +hurd/iso9660fs +hurd/mach-defpager +hurd/magic +hurd/mtab +hurd/new-fifo +hurd/null +hurd/pfinet +hurd/pflocal +hurd/proc +hurd/procfs +hurd/proxy-defpager +hurd/random +hurd/storeio +hurd/streamio +hurd/symlink +hurd/term +hurd/tmpfs +lib/hurd/console/pc_kbd.so.* usr/lib/hurd/console +lib/hurd/console/pc_mouse.so.* usr/lib/hurd/console +lib/hurd/console/vga.so.* usr/lib/hurd/console +lib/hurd/console-run sbin +sbin/MAKEDEV +sbin/e2os +sbin/losetup +sbin/swapoff +sbin/swapon +usr/bin/uptime-hurd +usr/bin/vmstat-hurd +usr/bin/w-hurd +usr/share/X11 diff --git a/debian/hurd.install.in b/debian/hurd.install.in index eb16d79b..11791cb2 100644 --- a/debian/hurd.install.in +++ b/debian/hurd.install.in @@ -1,71 +1,68 @@ -debian/local/setup-translators usr/lib/hurd -debian/local/random-hurd.sh hurd -debian/local/urandom-hurd.sh hurd -debian/local/securetty etc -debian/tmp/lib/@DEB_HOST_MULTIARCH@/hurd/console/*.so.* usr/lib/hurd/console -debian/tmp/hurd/* -debian/tmp/lib/hurd/rc etc/hurd -debian/tmp/lib/hurd/getty sbin -debian/tmp/lib/hurd/console-run sbin -debian/tmp/lib/hurd/runttys sbin -debian/tmp/lib/hurd/runsystem.gnu etc/hurd -debian/tmp/sbin/nfsd -debian/tmp/sbin/e2os -debian/tmp/sbin/MAKEDEV -debian/tmp/sbin/losetup -debian/tmp/sbin/reboot-hurd -debian/tmp/sbin/halt-hurd -debian/tmp/sbin/swapon -debian/tmp/sbin/swapoff -debian/tmp/sbin/fsck.ufs -debian/tmp/sbin/mkfs.ufs -debian/tmp/sbin/clri.ufs -debian/tmp/sbin/stati.ufs -debian/tmp/bin/boot -debian/tmp/bin/console -debian/tmp/bin/shd -debian/tmp/bin/ps-hurd -debian/tmp/bin/settrans -debian/tmp/bin/showtrans -debian/tmp/bin/syncfs -debian/tmp/bin/fsysopts -debian/tmp/bin/storeinfo -debian/tmp/bin/login -debian/tmp/usr/bin/w-hurd -debian/tmp/usr/bin/uptime-hurd -debian/tmp/bin/ids -debian/tmp/bin/loginpr -debian/tmp/bin/sush -debian/tmp/usr/bin/vmstat-hurd -debian/tmp/bin/portinfo -debian/tmp/bin/devprobe -debian/tmp/bin/vminfo -debian/tmp/bin/addauth -debian/tmp/bin/rmauth -debian/tmp/bin/unsu -debian/tmp/bin/setauth -debian/tmp/bin/ftpcp -debian/tmp/bin/ftpdir -debian/tmp/bin/storecat -debian/tmp/bin/storeread -debian/tmp/bin/msgport -debian/tmp/bin/rpctrace -debian/tmp/bin/mount -debian/tmp/bin/umount -debian/tmp/bin/gcore -debian/tmp/bin/fakeauth -debian/tmp/usr/bin/fakeroot-hurd -debian/tmp/bin/forks -debian/tmp/bin/remap -debian/tmp/etc/login -debian/tmp/etc/login/.bash_login -debian/tmp/etc/login/.bashrc -debian/tmp/etc/login/.hushlogin -debian/tmp/etc/login/.profile -debian/tmp/etc/login/README -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 +../../console/motd.UTF8 etc +../../release/servers.boot boot +../local/random-hurd.sh hurd +../local/securetty etc +../local/setup-translators usr/lib/hurd +../local/urandom-hurd.sh hurd +bin/addauth +bin/boot +bin/console +bin/devprobe +bin/fakeauth +bin/forks +bin/fsysopts +bin/ftpcp +bin/ftpdir +bin/gcore +bin/ids +bin/login +bin/loginpr +bin/mount +bin/msgport +bin/nullauth +bin/portinfo +bin/ps-hurd +bin/remap +bin/rmauth +bin/rpctrace +bin/setauth +bin/settrans +bin/shd +bin/showtrans +bin/storecat +bin/storeinfo +bin/storeread +bin/sush +bin/syncfs +bin/umount +bin/unsu +bin/vminfo +dev/MAKEDEV +etc/login +etc/login/.bash_login +etc/login/.bashrc +etc/login/.hushlogin +etc/login/.profile +etc/login/README +etc/ttys +hurd/* +lib/@DEB_HOST_MULTIARCH@/hurd/console/*.so.* usr/lib/hurd/console +lib/hurd/console-run sbin +lib/hurd/getty sbin +lib/hurd/rc etc/hurd +lib/hurd/runsystem.gnu etc/hurd +lib/hurd/runttys sbin +sbin/MAKEDEV +sbin/e2os +sbin/halt-hurd +sbin/losetup +sbin/nfsd +sbin/reboot-hurd +sbin/swapoff +sbin/swapon +share/msgids/*.msgids usr/share/msgids +usr/bin/fakeroot-hurd +usr/bin/uptime-hurd +usr/bin/vmstat-hurd +usr/bin/w-hurd +usr/share/X11/xkb diff --git a/debian/patches/rc.patch b/debian/patches/rc.patch index 3bcff71f..fffbb467 100644 --- a/debian/patches/rc.patch +++ b/debian/patches/rc.patch @@ -3,11 +3,9 @@ More debianish rc scripts daemons/rc.sh | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) -Index: hurd-debian/daemons/rc.sh -=================================================================== ---- hurd-debian.orig/daemons/rc.sh 2013-09-16 07:43:39.000000000 +0000 -+++ hurd-debian/daemons/rc.sh 2013-09-16 07:44:04.000000000 +0000 -@@ -19,14 +19,17 @@ +--- a/daemons/rc.sh ++++ b/daemons/rc.sh +@@ -19,14 +19,17 @@ then echo Automatic boot in progress... date @@ -26,7 +24,7 @@ Index: hurd-debian/daemons/rc.sh ;; # Fsck couldn't fix it. 4 | 8) -@@ -85,12 +88,20 @@ +@@ -85,12 +88,25 @@ if test -d /tmp; then fi if test -d /var/run; then @@ -45,26 +43,31 @@ Index: hurd-debian/daemons/rc.sh -# This file must exist for e2fsck to work. XXX -touch /var/run/mtab ++# See whether procfs is set up ++if ! test -e /proc/cmdline ; then ++ settrans -c /proc /hurd/procfs --compatible ++fi ++ +# This file must exist for e2fsck to work. +ln -s /proc/mounts /var/run/mtab #echo -n restoring pty permissions... #chmod 666 /dev/tty[pqrs]* -@@ -104,15 +115,25 @@ +@@ -104,15 +120,25 @@ touch /var/run/mtab chmod 664 /etc/motd -echo -n starting daemons: -+( -+ trap ":" INT QUIT TSTP - +- -/sbin/syslogd && echo -n ' syslogd' -/sbin/inetd && echo -n ' inetd' - -if test -x /sbin/sendmail -a -r /etc/sendmail.cf; then - /sbin/sendmail -bd -q30m && echo -n ' sendmail' -fi -- ++( ++ trap ":" INT QUIT TSTP + -echo . + if [ -d /etc/rc.boot ] + then diff --git a/debian/patches/run.patch b/debian/patches/run.patch index a4fd4eb6..3588ddb0 100644 --- a/debian/patches/run.patch +++ b/debian/patches/run.patch @@ -1,7 +1,5 @@ -Index: hurd-debian/daemons/rc.sh -=================================================================== ---- hurd-debian.orig/daemons/rc.sh 2013-09-16 10:29:05.000000000 +0000 -+++ hurd-debian/daemons/rc.sh 2013-09-16 10:29:05.000000000 +0000 +--- a/daemons/rc.sh ++++ b/daemons/rc.sh @@ -98,6 +98,13 @@ chgrp utmp utmp fi; }) @@ -15,4 +13,4 @@ Index: hurd-debian/daemons/rc.sh + echo done - # This file must exist for e2fsck to work. + # See whether procfs is set up 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' > $@ |