Refresh patches

5 files changed, 3 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index 6c94b124..7dbbf9ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ hurd (20130924-1) UNRELEASED; urgency=low
 
   [ Samuel Thibault ]
   * New upstream snapshot
+    - patches/mount-test-opts.patch: Drop, merged upstream
   * 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.
diff --git a/debian/patches/external.patch b/debian/patches/external.patch
index 952c1b34..a594eb4e 100644
--- a/debian/patches/external.patch
+++ b/debian/patches/external.patch
@@ -17,7 +17,7 @@ Index: hurd-debian/Makefile
 @@ -40,7 +41,7 @@
  	       login daemons boot console \
  	       hostmux usermux ftpfs trans \
- 	       console-client utils sutils ufs-fsck ufs-utils \
+ 	       console-client utils sutils \
 -	       benchmarks fstests
 +	       benchmarks fstests procfs random devnode
  
diff --git a/debian/patches/mount-test-opts.patch b/debian/patches/mount-test-opts.patch
deleted file mode 100644
index d2e0f0e1..00000000
--- a/debian/patches/mount-test-opts.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/utils/Makefile b/utils/Makefile
-index e3bed0b..6975fb5 100644
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -28,7 +28,7 @@ SRCS = shd.c ps.c settrans.c syncfs.c showtrans.c addauth.c rmauth.c \
- 	parse.c frobauth.c frobauth-mod.c setauth.c pids.c nonsugid.c \
- 	unsu.c ftpcp.c ftpdir.c storeread.c storecat.c msgport.c \
- 	rpctrace.c mount.c gcore.c fakeauth.c fakeroot.sh remap.sh \
--	nullauth.c
-+	nullauth.c match-options.c
- 
- OBJS = $(filter-out %.sh,$(SRCS:.c=.o))
- HURDLIBS = ps ihash store fshelp ports ftpconn shouldbeinlibc
diff --git a/debian/patches/proxy-defpager.diff b/debian/patches/proxy-defpager.diff
index a83939c6..782a0161 100644
--- a/debian/patches/proxy-defpager.diff
+++ b/debian/patches/proxy-defpager.diff
@@ -21,7 +21,7 @@ Index: hurd-debian/trans/Makefile
  	crashServer.o crash_replyUser.o msgServer.o \
 -	default_pagerServer.o default_pagerUser.o \
 +	ourdefault_pagerServer.o ourdefault_pagerUser.o \
- 	device_replyServer.o elfcore.o fsysUser.o
+ 	device_replyServer.o elfcore.o
  HURDLIBS = ports netfs trivfs iohelp fshelp pipe ihash shouldbeinlibc
  LDLIBS += -lpthread
 @@ -34,6 +34,9 @@
diff --git a/debian/patches/series b/debian/patches/series
index f86b2a38..40f6642a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,4 +39,3 @@ exec_filename_exec.patch
 exec_filename_fs.patch
 exec_filename_use.patch
 mount-loop.patch
-mount-test-opts.patch