From d3befb2c2bba6c6fb19a0c94931be9e625eb05a1 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue, 17 Sep 2013 19:43:18 +0200
Subject: control, hurd.install.in, rules: Remove ufs parts.
---
debian/changelog | 6 ++++++
debian/control | 2 +-
debian/hurd.install.in | 4 ----
debian/rules | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index 30ec41b6..dfa3b2e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hurd (20130727-2) UNRELEASED; urgency=low
+
+ * control, hurd.install.in, rules: Remove ufs parts.
+
+ -- Samuel Thibault <sthibault@debian.org> Tue, 17 Sep 2013 19:42:22 +0200
+
hurd (20130727-1) unstable; urgency=low
[ Samuel Thibault ]
diff --git a/debian/control b/debian/control
index c9bca6c3..ee55f0f3 100644
--- a/debian/control
+++ b/debian/control
@@ -80,7 +80,7 @@ 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
+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.install.in b/debian/hurd.install.in
index eb16d79b..149b569a 100644
--- a/debian/hurd.install.in
+++ b/debian/hurd.install.in
@@ -17,10 +17,6 @@ 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
diff --git a/debian/rules b/debian/rules
index 273e139b..2ae68ce8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@
DEB_DESTDIR = $(CURDIR)/debian/tmp
-CONFIGURE_ARGS = --disable-profile --enable-static-progs='ext2fs,ufs,iso9660fs'
+CONFIGURE_ARGS = --disable-profile --enable-static-progs='ext2fs,iso9660fs'
SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /usr/bin/w-hurd
CC=gcc-4.7
--
cgit v1.2.3
From 440e00bc8ca1b944483aeb12fc1d4a7b556cc905 Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Thu, 19 Sep 2013 10:10:12 +0200
Subject: Include the nullpriv utility in hurd and hurd-udeb
---
debian/changelog | 3 +++
debian/hurd-udeb.install.in | 1 +
debian/hurd.install.in | 1 +
3 files changed, 5 insertions(+)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index 6592c160..a9b7c548 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ hurd (20130916-2) UNRELEASED; urgency=low
* control, hurd.install.in, rules: Remove ufs parts.
+ [ Justus Winter ]
+ * Include the nullpriv utility in hurd and hurd-udeb.
+
-- Samuel Thibault <sthibault@debian.org> Tue, 17 Sep 2013 19:42:22 +0200
hurd (20130916-1) unstable; urgency=low
diff --git a/debian/hurd-udeb.install.in b/debian/hurd-udeb.install.in
index 9b2601e1..225efb83 100644
--- a/debian/hurd-udeb.install.in
+++ b/debian/hurd-udeb.install.in
@@ -40,6 +40,7 @@ debian/tmp/bin/storeread
debian/tmp/bin/msgport
debian/tmp/bin/mount
debian/tmp/bin/umount
+debian/tmp/bin/nullauth
debian/tmp/dev/MAKEDEV
debian/tmp/hurd/auth
debian/tmp/hurd/console
diff --git a/debian/hurd.install.in b/debian/hurd.install.in
index 149b569a..32a5d317 100644
--- a/debian/hurd.install.in
+++ b/debian/hurd.install.in
@@ -40,6 +40,7 @@ debian/tmp/bin/addauth
debian/tmp/bin/rmauth
debian/tmp/bin/unsu
debian/tmp/bin/setauth
+debian/tmp/bin/nullauth
debian/tmp/bin/ftpcp
debian/tmp/bin/ftpdir
debian/tmp/bin/storecat
--
cgit v1.2.3
From 0390dcb69e639efa5d3124e96b3193034cbd7896 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu, 19 Sep 2013 12:43:29 +0200
Subject: fix tool name
---
debian/changelog | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index a9b7c548..eceab592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ hurd (20130916-2) UNRELEASED; urgency=low
* control, hurd.install.in, rules: Remove ufs parts.
[ Justus Winter ]
- * Include the nullpriv utility in hurd and hurd-udeb.
+ * Include the nullauth utility in hurd and hurd-udeb.
-- Samuel Thibault <sthibault@debian.org> Tue, 17 Sep 2013 19:42:22 +0200
--
cgit v1.2.3
From e37f8e96f082bdb5bc3dbdd18d15d3eaba2cef45 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Sat, 21 Sep 2013 09:35:56 +0200
Subject: add missing libpcap0.8-dev B-D
---
debian/changelog | 3 +++
debian/control | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index eceab592..a8322418 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ hurd (20130916-2) UNRELEASED; urgency=low
[ Justus Winter ]
* Include the nullauth utility in hurd and hurd-udeb.
+ [ Pino Toscano ]
+ * Add missing libpcap0.8-dev 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 68c580dd..b7cb8ec1 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: mig (>= 1.3-2), gnumach-dev (>= 2:1.3.99.dfsg.cvs20070526),
libc0.3-dev (>= 2.13-38~), texinfo, 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
--
cgit v1.2.3
From cb58472e4cf65a2c93f77b43a670867999375b32 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Sat, 21 Sep 2013 11:36:30 +0200
Subject: add ${perl:Depends} in hurd-dev
---
debian/changelog | 1 +
debian/control | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index a8322418..0bf11326 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ hurd (20130916-2) UNRELEASED; urgency=low
[ Pino Toscano ]
* Add missing libpcap0.8-dev build dependency.
+ * Add ${perl:Depends} in hurd-dev.
-- Samuel Thibault <sthibault@debian.org> Tue, 17 Sep 2013 19:42:22 +0200
diff --git a/debian/control b/debian/control
index b7cb8ec1..44203141 100644
--- a/debian/control
+++ b/debian/control
@@ -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)
--
cgit v1.2.3
From ddba66f7cbbd9a1381f5edac537ede16e22346c6 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Sat, 21 Sep 2013 11:55:27 +0200
Subject: add ${shlibs:Depends} in hurd-libs0.3-udeb
---
debian/changelog | 1 +
debian/control | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index 0bf11326..4aa3a6b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ hurd (20130916-2) UNRELEASED; urgency=low
[ Pino Toscano ]
* Add missing libpcap0.8-dev build dependency.
* Add ${perl:Depends} in hurd-dev.
+ * Add ${shlibs:Depends} in hurd-libs0.3-udeb.
-- Samuel Thibault <sthibault@debian.org> Tue, 17 Sep 2013 19:42:22 +0200
diff --git a/debian/control b/debian/control
index 44203141..0ff2620c 100644
--- a/debian/control
+++ b/debian/control
@@ -71,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.
--
cgit v1.2.3
From 91c4dad2be18de91acfdfe51321ae25570c6ffb5 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Sat, 21 Sep 2013 14:25:18 +0200
Subject: rename installed libdde-linux26 stuff back to libdde_linux26
---
debian/changelog | 1 +
debian/hurd-dev.install.in | 6 +++---
debian/rules | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index 4aa3a6b8..7e4d0bf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ hurd (20130916-2) UNRELEASED; urgency=low
* Add missing libpcap0.8-dev build dependency.
* Add ${perl:Depends} in hurd-dev.
* Add ${shlibs:Depends} in hurd-libs0.3-udeb.
+ * Rename the installed libdde-linux26 stuff back to libdde_linux26.
-- Samuel Thibault <sthibault@debian.org> Tue, 17 Sep 2013 19:42:22 +0200
diff --git a/debian/hurd-dev.install.in b/debian/hurd-dev.install.in
index f5e222f6..88f4c2b2 100644
--- a/debian/hurd-dev.install.in
+++ b/debian/hurd-dev.install.in
@@ -4,8 +4,8 @@ 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
+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/rules b/debian/rules
index e7cea9b7..666fce9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,7 +50,7 @@ override_dh_auto_clean:
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
+ $(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
--
cgit v1.2.3
From 081c8ca3fb2807f876ff92712c61f39bcc66f30b Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Sat, 21 Sep 2013 14:32:43 +0200
Subject: 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
---
debian/changelog | 3 +++
debian/rules | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index 7e4d0bf7..e2c3c513 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ hurd (20130916-2) UNRELEASED; urgency=low
* Add ${perl:Depends} in hurd-dev.
* Add ${shlibs:Depends} in hurd-libs0.3-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.
-- Samuel Thibault <sthibault@debian.org> Tue, 17 Sep 2013 19:42:22 +0200
diff --git a/debian/rules b/debian/rules
index 666fce9e..7c6d57de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,8 +92,7 @@ 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/
debian/%.install: debian/%.install.in
cat $^ | sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' > $@
--
cgit v1.2.3
From d95879de90e55162d01c0768165d4f321bbe6bd3 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 22 Sep 2013 01:08:57 +0200
Subject: patches/rc.patch: Make sure /proc is mounted at boot.
---
debian/changelog | 2 ++
debian/patches/rc.patch | 25 ++++++++++++++-----------
2 files changed, 16 insertions(+), 11 deletions(-)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index e2c3c513..e90e2db5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
hurd (20130916-2) UNRELEASED; urgency=low
+ [ Samuel Thibault ]
* control, hurd.install.in, rules: Remove ufs parts.
+ * patches/rc.patch: Make sure /proc is mounted at boot.
[ Justus Winter ]
* Include the nullauth utility in hurd and hurd-udeb.
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
--
cgit v1.2.3
From 5e0c0b69de70a1a085b897863d5ec2f88250814b Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Sun, 22 Sep 2013 12:21:24 +0200
Subject: run.patch: refresh to apply without fuzz
---
debian/changelog | 1 +
debian/patches/run.patch | 8 +++-----
2 files changed, 4 insertions(+), 5 deletions(-)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index e90e2db5..5394d32f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ hurd (20130916-2) UNRELEASED; urgency=low
* 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.
-- Samuel Thibault <sthibault@debian.org> Tue, 17 Sep 2013 19:42:22 +0200
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
--
cgit v1.2.3
From d838525318f26b170b53c7994bf8fac7e56541d4 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Sun, 22 Sep 2013 22:25:47 +0200
Subject: rename the "build" build dir to "build-deb"
---
debian/changelog | 1 +
debian/hurd-doc.docs | 2 +-
debian/rules | 12 ++++++------
3 files changed, 8 insertions(+), 7 deletions(-)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index 5394d32f..e93728ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ hurd (20130916-2) UNRELEASED; urgency=low
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".
-- Samuel Thibault <sthibault@debian.org> Tue, 17 Sep 2013 19:42:22 +0200
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/rules b/debian/rules
index 7c6d57de..c01ade83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,15 +30,15 @@ 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) $(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
+ 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
@@ -49,7 +49,7 @@ 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
+ 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
$(MAKE) -C libdde-linux26 INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install
# runsystem is managed by update-alternatives
--
cgit v1.2.3
From c4464b5050d44497dff4a0dc08c07fc4f08dcb8a Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Mon, 23 Sep 2013 11:39:32 +0200
Subject: pass the right builddir to dh_auto_clean
---
debian/rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'debian')
diff --git a/debian/rules b/debian/rules
index c01ade83..f1d094b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,7 @@ override_dh_auto_build:
$(MAKE) -C libdde-linux26 BUILDDIR=$(CURDIR)/build-deb
override_dh_auto_clean:
- dh_auto_clean
+ dh_auto_clean -Bbuild-deb
$(MAKE) -C libdde-linux26 cleanall
rm -f $$(find libdde-linux26 -name \*.d)
rm -fr libdde-linux26/build
--
cgit v1.2.3
From 9e5b6a0ace0f824b7f23720409c9c2442cad90cb Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Mon, 23 Sep 2013 11:46:33 +0200
Subject: dh_install: force debian/tmp as sourcedir
strip/fix the paths in *.install.in files according to the new root
---
debian/changelog | 2 +
debian/hurd-dev.install.in | 22 +++---
debian/hurd-libs0.3-udeb.install.in | 2 +-
debian/hurd-libs0.3.install.in | 2 +-
debian/hurd-udeb.install.in | 146 ++++++++++++++++++------------------
debian/hurd.install.in | 136 ++++++++++++++++-----------------
debian/rules | 2 +-
7 files changed, 157 insertions(+), 155 deletions(-)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index e93728ba..d7f1b816 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ hurd (20130916-2) UNRELEASED; urgency=low
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.
-- Samuel Thibault <sthibault@debian.org> Tue, 17 Sep 2013 19:42:22 +0200
diff --git a/debian/hurd-dev.install.in b/debian/hurd-dev.install.in
index 88f4c2b2..d3a69235 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
+bin/timertest
+bin/fstests
+lib/@DEB_HOST_MULTIARCH@/*.a lib/@DEB_HOST_MULTIARCH@
+include/* usr/include
+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
+usr/share/libdde_linux26/build usr/share/libdde_linux26
+../local/cdrom.h usr/include/sys
+../local/soundcard.h usr/include/sys
diff --git a/debian/hurd-libs0.3-udeb.install.in b/debian/hurd-libs0.3-udeb.install.in
index 8b69f0c1..fcb97710 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/@DEB_HOST_MULTIARCH@/*.so.* lib
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 225efb83..36085a12 100644
--- a/debian/hurd-udeb.install.in
+++ b/debian/hurd-udeb.install.in
@@ -1,73 +1,73 @@
-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/bin/nullauth
-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/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/runsystem etc/hurd
+../local/setup-translators usr/lib/hurd
+../local/partman lib
+../local/finish-install.d usr/lib
+../local/X11/locale usr/share/X11
+lib/@DEB_HOST_MULTIARCH@/hurd/console/pc_kbd.so.* usr/lib/hurd/console
+lib/@DEB_HOST_MULTIARCH@/hurd/console/pc_mouse.so.* usr/lib/hurd/console
+lib/@DEB_HOST_MULTIARCH@/hurd/console/vga.so.* usr/lib/hurd/console
+lib/hurd/console-run sbin
+sbin/e2os
+sbin/MAKEDEV
+sbin/losetup
+sbin/swapon
+sbin/swapoff
+bin/boot
+bin/console
+bin/shd
+bin/ps-hurd
+bin/settrans
+bin/showtrans
+bin/syncfs
+bin/fsysopts
+bin/storeinfo
+bin/login
+usr/bin/w-hurd
+usr/bin/uptime-hurd
+bin/ids
+bin/loginpr
+bin/sush
+usr/bin/vmstat-hurd
+bin/portinfo
+bin/devprobe
+bin/vminfo
+bin/addauth
+bin/rmauth
+bin/unsu
+bin/setauth
+bin/storecat
+bin/storeread
+bin/msgport
+bin/mount
+bin/umount
+bin/nullauth
+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/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
+usr/share/X11
diff --git a/debian/hurd.install.in b/debian/hurd.install.in
index 32a5d317..29ace9fa 100644
--- a/debian/hurd.install.in
+++ b/debian/hurd.install.in
@@ -1,68 +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/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/nullauth
-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
+../local/setup-translators usr/lib/hurd
+../local/random-hurd.sh hurd
+../local/urandom-hurd.sh hurd
+../local/securetty etc
+lib/@DEB_HOST_MULTIARCH@/hurd/console/*.so.* usr/lib/hurd/console
+hurd/*
+lib/hurd/rc etc/hurd
+lib/hurd/getty sbin
+lib/hurd/console-run sbin
+lib/hurd/runttys sbin
+lib/hurd/runsystem.gnu etc/hurd
+sbin/nfsd
+sbin/e2os
+sbin/MAKEDEV
+sbin/losetup
+sbin/reboot-hurd
+sbin/halt-hurd
+sbin/swapon
+sbin/swapoff
+bin/boot
+bin/console
+bin/shd
+bin/ps-hurd
+bin/settrans
+bin/showtrans
+bin/syncfs
+bin/fsysopts
+bin/storeinfo
+bin/login
+usr/bin/w-hurd
+usr/bin/uptime-hurd
+bin/ids
+bin/loginpr
+bin/sush
+usr/bin/vmstat-hurd
+bin/portinfo
+bin/devprobe
+bin/vminfo
+bin/addauth
+bin/rmauth
+bin/unsu
+bin/setauth
+bin/nullauth
+bin/ftpcp
+bin/ftpdir
+bin/storecat
+bin/storeread
+bin/msgport
+bin/rpctrace
+bin/mount
+bin/umount
+bin/gcore
+bin/fakeauth
+usr/bin/fakeroot-hurd
+bin/forks
+bin/remap
+etc/login
+etc/login/.bash_login
+etc/login/.bashrc
+etc/login/.hushlogin
+etc/login/.profile
+etc/login/README
+etc/ttys
+dev/MAKEDEV
+share/msgids/*.msgids usr/share/msgids
+usr/share/X11/xkb
+../../console/motd.UTF8 etc
+../../release/servers.boot boot
diff --git a/debian/rules b/debian/rules
index f1d094b0..415308db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,7 +73,7 @@ override_dh_auto_install:
rm -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*_pic.a
override_dh_install: $(INSTALL_generated)
- dh_install --list-missing
+ dh_install --list-missing --sourcedir=debian/tmp
override_dh_installinit:
dh_installinit -phurd --name=hurd-console
--
cgit v1.2.3
From 0bc8eb2bc2ac33cedef15ab3183e1eb5abd529e1 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Mon, 23 Sep 2013 14:11:14 +0200
Subject: do a separate build for the udeb variant
this way 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
---
debian/changelog | 5 +++++
debian/rules | 16 ++++++++++++++++
2 files changed, 21 insertions(+)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index d7f1b816..9a452790 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,11 @@ hurd (20130916-2) UNRELEASED; urgency=low
* 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.
-- Samuel Thibault <sthibault@debian.org> Tue, 17 Sep 2013 19:42:22 +0200
diff --git a/debian/rules b/debian/rules
index 415308db..7b97c2c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@
# 02111-1307 USA.
DEB_DESTDIR = $(CURDIR)/debian/tmp
+DEB_DESTDIR_UDEB = $(CURDIR)/debian/tmp-udeb
CONFIGURE_ARGS = --disable-profile --enable-static-progs='ext2fs,iso9660fs'
SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /usr/bin/w-hurd
@@ -34,14 +35,17 @@ INSTALL_generated := $(patsubst %.in,%,$(INSTALL_in))
override_dh_auto_configure:
dh_auto_configure -Bbuild-deb -- $(CONFIGURE_ARGS) $(shell dpkg-buildflags --export=configure)
+ dh_auto_configure -Bbuild-udeb -- $(CONFIGURE_ARGS) $(shell dpkg-buildflags --export=configure)
override_dh_auto_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 -Bbuild-deb
+ dh_auto_clean -Bbuild-udeb
$(MAKE) -C libdde-linux26 cleanall
rm -f $$(find libdde-linux26 -name \*.d)
rm -fr libdde-linux26/build
@@ -50,6 +54,7 @@ override_dh_auto_clean:
override_dh_auto_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/$(DEB_HOST_MULTIARCH) 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
@@ -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,8 +81,10 @@ override_dh_auto_install:
# remove PIC static libraries
rm -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*_pic.a
+ rm -f debian/tmp-udeb/lib/$(DEB_HOST_MULTIARCH)/*_pic.a
override_dh_install: $(INSTALL_generated)
+ dh_install $(addprefix -p,$(filter %-udeb,$(shell dh_listpackages))) --sourcedir=debian/tmp-udeb
dh_install --list-missing --sourcedir=debian/tmp
override_dh_installinit:
@@ -94,6 +106,10 @@ override_dh_makeshlibs:
dh_makeshlibs -phurd-libs0.3 --add-udeb=hurd-libs0.3-udeb
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' > $@
--
cgit v1.2.3
From ff4f35e831e5fc60a7e2ff2f2ac476d4222f0641 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Mon, 23 Sep 2013 14:12:43 +0200
Subject: rules: allow to pass own configure args to build flavours
---
debian/rules | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'debian')
diff --git a/debian/rules b/debian/rules
index 7b97c2c2..57d500b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,8 @@ DEB_DESTDIR = $(CURDIR)/debian/tmp
DEB_DESTDIR_UDEB = $(CURDIR)/debian/tmp-udeb
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
@@ -34,8 +36,8 @@ INSTALL_generated := $(patsubst %.in,%,$(INSTALL_in))
dh $@ -Bbuild-deb --with autotools_dev,autoreconf
override_dh_auto_configure:
- dh_auto_configure -Bbuild-deb -- $(CONFIGURE_ARGS) $(shell dpkg-buildflags --export=configure)
- dh_auto_configure -Bbuild-udeb -- $(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-deb
--
cgit v1.2.3
From 4581466f40aa3de3fb258880ed5add35bb11d79c Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Mon, 23 Sep 2013 14:15:42 +0200
Subject: no-op sorting of .install* files
---
debian/hurd-dev.install.in | 14 +++----
debian/hurd-udeb.install.in | 60 ++++++++++++++---------------
debian/hurd.install.in | 92 ++++++++++++++++++++++-----------------------
3 files changed, 83 insertions(+), 83 deletions(-)
(limited to 'debian')
diff --git a/debian/hurd-dev.install.in b/debian/hurd-dev.install.in
index d3a69235..6c995d04 100644
--- a/debian/hurd-dev.install.in
+++ b/debian/hurd-dev.install.in
@@ -1,11 +1,11 @@
-bin/timertest
-bin/fstests
-lib/@DEB_HOST_MULTIARCH@/*.a lib/@DEB_HOST_MULTIARCH@
-include/* usr/include
-lib/@DEB_HOST_MULTIARCH@/*.so lib/@DEB_HOST_MULTIARCH@
+../../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
-../../libdde-linux26/Makeconf* usr/share/libdde_linux26
-usr/share/libdde_linux26/build 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@
+lib/@DEB_HOST_MULTIARCH@/*.so lib/@DEB_HOST_MULTIARCH@
+usr/share/libdde_linux26/build usr/share/libdde_linux26
diff --git a/debian/hurd-udeb.install.in b/debian/hurd-udeb.install.in
index 36085a12..5a3f994e 100644
--- a/debian/hurd-udeb.install.in
+++ b/debian/hurd-udeb.install.in
@@ -1,46 +1,34 @@
+../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
-../local/partman lib
-../local/finish-install.d usr/lib
-../local/X11/locale usr/share/X11
-lib/@DEB_HOST_MULTIARCH@/hurd/console/pc_kbd.so.* usr/lib/hurd/console
-lib/@DEB_HOST_MULTIARCH@/hurd/console/pc_mouse.so.* usr/lib/hurd/console
-lib/@DEB_HOST_MULTIARCH@/hurd/console/vga.so.* usr/lib/hurd/console
-lib/hurd/console-run sbin
-sbin/e2os
-sbin/MAKEDEV
-sbin/losetup
-sbin/swapon
-sbin/swapoff
+bin/addauth
bin/boot
bin/console
-bin/shd
-bin/ps-hurd
-bin/settrans
-bin/showtrans
-bin/syncfs
+bin/devprobe
bin/fsysopts
-bin/storeinfo
-bin/login
-usr/bin/w-hurd
-usr/bin/uptime-hurd
bin/ids
+bin/login
bin/loginpr
-bin/sush
-usr/bin/vmstat-hurd
+bin/mount
+bin/msgport
+bin/nullauth
bin/portinfo
-bin/devprobe
-bin/vminfo
-bin/addauth
+bin/ps-hurd
bin/rmauth
-bin/unsu
bin/setauth
+bin/settrans
+bin/shd
+bin/showtrans
bin/storecat
+bin/storeinfo
bin/storeread
-bin/msgport
-bin/mount
+bin/sush
+bin/syncfs
bin/umount
-bin/nullauth
+bin/unsu
+bin/vminfo
dev/MAKEDEV
hurd/auth
hurd/console
@@ -70,4 +58,16 @@ hurd/streamio
hurd/symlink
hurd/term
hurd/tmpfs
+lib/@DEB_HOST_MULTIARCH@/hurd/console/pc_kbd.so.* usr/lib/hurd/console
+lib/@DEB_HOST_MULTIARCH@/hurd/console/pc_mouse.so.* usr/lib/hurd/console
+lib/@DEB_HOST_MULTIARCH@/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 29ace9fa..11791cb2 100644
--- a/debian/hurd.install.in
+++ b/debian/hurd.install.in
@@ -1,59 +1,43 @@
-../local/setup-translators usr/lib/hurd
+../../console/motd.UTF8 etc
+../../release/servers.boot boot
../local/random-hurd.sh hurd
-../local/urandom-hurd.sh hurd
../local/securetty etc
-lib/@DEB_HOST_MULTIARCH@/hurd/console/*.so.* usr/lib/hurd/console
-hurd/*
-lib/hurd/rc etc/hurd
-lib/hurd/getty sbin
-lib/hurd/console-run sbin
-lib/hurd/runttys sbin
-lib/hurd/runsystem.gnu etc/hurd
-sbin/nfsd
-sbin/e2os
-sbin/MAKEDEV
-sbin/losetup
-sbin/reboot-hurd
-sbin/halt-hurd
-sbin/swapon
-sbin/swapoff
+../local/setup-translators usr/lib/hurd
+../local/urandom-hurd.sh hurd
+bin/addauth
bin/boot
bin/console
-bin/shd
-bin/ps-hurd
-bin/settrans
-bin/showtrans
-bin/syncfs
+bin/devprobe
+bin/fakeauth
+bin/forks
bin/fsysopts
-bin/storeinfo
-bin/login
-usr/bin/w-hurd
-usr/bin/uptime-hurd
+bin/ftpcp
+bin/ftpdir
+bin/gcore
bin/ids
+bin/login
bin/loginpr
-bin/sush
-usr/bin/vmstat-hurd
+bin/mount
+bin/msgport
+bin/nullauth
bin/portinfo
-bin/devprobe
-bin/vminfo
-bin/addauth
+bin/ps-hurd
+bin/remap
bin/rmauth
-bin/unsu
+bin/rpctrace
bin/setauth
-bin/nullauth
-bin/ftpcp
-bin/ftpdir
+bin/settrans
+bin/shd
+bin/showtrans
bin/storecat
+bin/storeinfo
bin/storeread
-bin/msgport
-bin/rpctrace
-bin/mount
+bin/sush
+bin/syncfs
bin/umount
-bin/gcore
-bin/fakeauth
-usr/bin/fakeroot-hurd
-bin/forks
-bin/remap
+bin/unsu
+bin/vminfo
+dev/MAKEDEV
etc/login
etc/login/.bash_login
etc/login/.bashrc
@@ -61,8 +45,24 @@ etc/login/.hushlogin
etc/login/.profile
etc/login/README
etc/ttys
-dev/MAKEDEV
+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
-../../console/motd.UTF8 etc
-../../release/servers.boot boot
--
cgit v1.2.3
From 404f06f33fa51482c5a3e381ec98b8658bcd9848 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Mon, 23 Sep 2013 14:16:34 +0200
Subject: hurd-dev.install.in: remove redundant destination
---
debian/hurd-dev.install.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'debian')
diff --git a/debian/hurd-dev.install.in b/debian/hurd-dev.install.in
index 6c995d04..d5514a32 100644
--- a/debian/hurd-dev.install.in
+++ b/debian/hurd-dev.install.in
@@ -6,6 +6,6 @@
bin/fstests
bin/timertest
include/* usr/include
-lib/@DEB_HOST_MULTIARCH@/*.a lib/@DEB_HOST_MULTIARCH@
-lib/@DEB_HOST_MULTIARCH@/*.so lib/@DEB_HOST_MULTIARCH@
+lib/@DEB_HOST_MULTIARCH@/*.a
+lib/@DEB_HOST_MULTIARCH@/*.so
usr/share/libdde_linux26/build usr/share/libdde_linux26
--
cgit v1.2.3
From 22519b2e328df91a60fce2ee197637d4efcb6af7 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Mon, 23 Sep 2013 16:18:14 +0200
Subject: dh_install: use --remaining-packages to not process udebs twice
---
debian/rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'debian')
diff --git a/debian/rules b/debian/rules
index 57d500b8..25e9a698 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,7 +87,7 @@ override_dh_auto_install:
override_dh_install: $(INSTALL_generated)
dh_install $(addprefix -p,$(filter %-udeb,$(shell dh_listpackages))) --sourcedir=debian/tmp-udeb
- dh_install --list-missing --sourcedir=debian/tmp
+ dh_install --remaining-packages --list-missing --sourcedir=debian/tmp
override_dh_installinit:
dh_installinit -phurd --name=hurd-console
--
cgit v1.2.3
From 6ade69c00ef15e4fdebc8bd23bb73bdd66e4d78c Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Mon, 23 Sep 2013 16:21:06 +0200
Subject: no multiarch when install for udeb
multiarch is not used in udebs, so there is no need to do the udeb
installation using a multiarch library directory to move them back
later
---
debian/hurd-libs0.3-udeb.install.in | 2 +-
debian/hurd-udeb.install.in | 6 +++---
debian/rules | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'debian')
diff --git a/debian/hurd-libs0.3-udeb.install.in b/debian/hurd-libs0.3-udeb.install.in
index fcb97710..005ac229 100644
--- a/debian/hurd-libs0.3-udeb.install.in
+++ b/debian/hurd-libs0.3-udeb.install.in
@@ -1 +1 @@
-lib/@DEB_HOST_MULTIARCH@/*.so.* lib
+lib/*.so.*
diff --git a/debian/hurd-udeb.install.in b/debian/hurd-udeb.install.in
index 5a3f994e..5e0feeb5 100644
--- a/debian/hurd-udeb.install.in
+++ b/debian/hurd-udeb.install.in
@@ -58,9 +58,9 @@ hurd/streamio
hurd/symlink
hurd/term
hurd/tmpfs
-lib/@DEB_HOST_MULTIARCH@/hurd/console/pc_kbd.so.* usr/lib/hurd/console
-lib/@DEB_HOST_MULTIARCH@/hurd/console/pc_mouse.so.* usr/lib/hurd/console
-lib/@DEB_HOST_MULTIARCH@/hurd/console/vga.so.* usr/lib/hurd/console
+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
diff --git a/debian/rules b/debian/rules
index 25e9a698..c3c57a75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ override_dh_auto_clean:
override_dh_auto_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/$(DEB_HOST_MULTIARCH) sysconfdir=$(DEB_DESTDIR_UDEB)/etc localstatedir=$(DEB_DESTDIR_UDEB)/var XKB_BASE=$(DEB_DESTDIR_UDEB)/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
@@ -83,7 +83,7 @@ override_dh_auto_install:
# remove PIC static libraries
rm -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*_pic.a
- rm -f debian/tmp-udeb/lib/$(DEB_HOST_MULTIARCH)/*_pic.a
+ rm -f debian/tmp-udeb/lib/*_pic.a
override_dh_install: $(INSTALL_generated)
dh_install $(addprefix -p,$(filter %-udeb,$(shell dh_listpackages))) --sourcedir=debian/tmp-udeb
--
cgit v1.2.3
From 9ade304ea5d253810490a220cacfa165384c5d73 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Mon, 23 Sep 2013 16:52:32 +0200
Subject: add ${shlibs:Depends} in hurd-udeb
---
debian/changelog | 2 +-
debian/control | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index 9a452790..eb2b1a1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ hurd (20130916-2) UNRELEASED; urgency=low
[ Pino Toscano ]
* Add missing libpcap0.8-dev build dependency.
* Add ${perl:Depends} in hurd-dev.
- * Add ${shlibs:Depends} in hurd-libs0.3-udeb.
+ * 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
diff --git a/debian/control b/debian/control
index 0ff2620c..fbc32004 100644
--- a/debian/control
+++ b/debian/control
@@ -80,7 +80,7 @@ Package-Type: udeb
Priority: optional
Section: debian-installer
Architecture: hurd-any
-Depends: ${misc:Depends}, hurd-libs0.3-udeb (= ${binary:Version}), xkb-data-udeb
+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
--
cgit v1.2.3
From 9d14d3b46ab269e9052544cc0b0414cc0e9c5cdc Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Mon, 23 Sep 2013 19:13:12 +0200
Subject: remove duplicated texinfo B-D
---
debian/changelog | 1 +
debian/control | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index eb2b1a1d..c765ae3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ hurd (20130916-2) UNRELEASED; urgency=low
- 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
diff --git a/debian/control b/debian/control
index fbc32004..3c2047b7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ 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, libpcap0.8-dev
--
cgit v1.2.3
From 5820da14e8e2a048ec48d9bdbe6cb9650ba91834 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue, 24 Sep 2013 00:23:43 +0200
Subject: Drop CC definition, it is not actually exported
---
debian/rules | 2 --
1 file changed, 2 deletions(-)
(limited to 'debian')
diff --git a/debian/rules b/debian/rules
index c3c57a75..99fafdea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,8 +25,6 @@ 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)
--
cgit v1.2.3