diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-17 19:45:51 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-17 19:45:51 +0200 |
| commit | fa00e45d586b096f485c06a83f968d2d3c6dc7e7 (patch) | |
| tree | d50f7bfab3ce3b9fa9b34cd6a268710bbe1f7a38 /debian/patches/proxy-defpager.diff | |
| parent | d3befb2c2bba6c6fb19a0c94931be9e625eb05a1 (diff) | |
| parent | dc017ca300b2271706c0b167ac5f678b069e5003 (diff) | |
Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd
Conflicts:
debian/changelog
Diffstat (limited to 'debian/patches/proxy-defpager.diff')
| -rw-r--r-- | debian/patches/proxy-defpager.diff | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/proxy-defpager.diff b/debian/patches/proxy-defpager.diff index db9604ad..a83939c6 100644 --- a/debian/patches/proxy-defpager.diff +++ b/debian/patches/proxy-defpager.diff @@ -16,12 +16,12 @@ Index: hurd-debian/trans/Makefile --- hurd-debian.orig/trans/Makefile 2012-11-26 00:23:22.000000000 +0000 +++ hurd-debian/trans/Makefile 2012-11-26 00:25:32.000000000 +0000 @@ -26,7 +26,7 @@ - fakeroot.c proxy-defpager.c remap.c + fakeroot.c proxy-defpager.c remap.c mtab.c OBJS = $(SRCS:.c=.o) fsysServer.o ifsockServer.o passwordServer.o \ crashServer.o crash_replyUser.o msgServer.o \ - default_pagerServer.o default_pagerUser.o \ + ourdefault_pagerServer.o ourdefault_pagerUser.o \ - device_replyServer.o elfcore.o + device_replyServer.o elfcore.o fsysUser.o HURDLIBS = ports netfs trivfs iohelp fshelp pipe ihash shouldbeinlibc LDLIBS += -lpthread @@ -34,6 +34,9 @@ |