[hurd] 02/13: Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository hurd.

commit 243d4bcf7f0b3986ea0011ef1b27726123590dcd
Merge: cd971db 40db6cf
Author: Samuel Thibault <address@hidden>
Date:   Mon Sep 23 22:26:23 2013 +0000

    Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd
    
    Conflicts:
        debian/changelog
        debian/hurd-udeb.install.in

 debian/changelog                    |   30 ++++++-
 debian/control                      |   13 ++--
 debian/hurd-dev.install.in          |   22 +++---
 debian/hurd-doc.docs                |    2 +-
 debian/hurd-libs0.3-udeb.install.in |    2 +-
 debian/hurd-libs0.3.install.in      |    2 +-
 debian/hurd-udeb.install.in         |  147 ++++++++++++++++++-----------------
 debian/hurd.install.in              |  139 ++++++++++++++++-----------------
 debian/patches/rc.patch             |   25 +++---
 debian/patches/run.patch            |    8 +-
 debian/rules                        |   43 ++++++----
 11 files changed, 237 insertions(+), 196 deletions(-)

diff --cc debian/changelog
index d51cd60,c765ae3..8953d3c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,32 +1,35 @@@
  hurd (20130916-2) UNRELEASED; urgency=low
  
-   * hurd-udeb.install.in: Add hurd/mtab.
 +  * TODO: drop libdaemon dependency for hurd-udeb.
 +
-  -- Samuel Thibault <address@hidden>  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 <address@hidden>  Tue, 17 Sep 2013 19:42:22 +0200
  
  hurd (20130916-1) unstable; urgency=low
  
diff --cc debian/hurd-udeb.install.in
index 3262ebb,5e0feeb..25c268c
--- a/debian/hurd-udeb.install.in
+++ b/debian/hurd-udeb.install.in
@@@ -1,73 -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

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git