Package: libc6 Version: 2.11.2-11 Severity: normal Tags: patch Hi,
while discussing Debian BR #619963 with Edwin Török I tried to apply two glibc/upstream patches he proposed. By unpacking the eglibc source, I fell over: ... Applying patches... Applying patch locale/check-unknown-symbols.diff patch: unrecognized option '--unified-reject-files' patch: Try `patch --help' for more information. Patch locale/check-unknown-symbols.diff does not apply (enforce with -f) make: *** [/home/sd/src/eglibc/eglibc-2.11.2/stamp-dir/patch] Error 1 dpkg-buildpackage: error: debian/rules build gave error exit status 2 debuild: fatal error at line 1329: dpkg-buildpackage -rfakeroot -d -us -uc failed What's the help of patch saying? $ patch --help | grep reject-format --reject-format=FORMAT Create 'context' or 'unified' rejects. BTW, patch has (2.6.1-1) version here. So, I started my investigations and checked debian/quiltrc and changed: -QUILT_PATCH_OPTS="--unified-reject-files" +QUILT_PATCH_OPTS="--reject-format=unified" This lets debuild apply patches again. Regards, - Sedat - P.S.: Patch quiltrc.diff attached -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (200, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.6.39-rc2-next20110408.4-686-small (SMP w/1 CPU core) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages libc6 depends on: ii libc-bin 2.11.2-11 Embedded GNU C Library: Binaries ii libgcc1 1:4.6.0-2 GCC support library Versions of packages libc6 recommends: ii libc6-i686 2.11.2-11 Embedded GNU C Library: Shared lib Versions of packages libc6 suggests: ii debconf [debconf-2.0] 1.5.38 Debian configuration management sy pn glibc-doc <none> (no description available) ii locales 2.11.2-11 Embedded GNU C Library: National L -- debconf information: * glibc/upgrade: true glibc/disable-screensaver: glibc/restart-failed: * glibc/restart-services: cups cron
--- debian/quiltrc.orig 2011-04-10 11:48:36.000000000 +0200 +++ debian/quiltrc 2011-04-10 12:08:43.696587720 +0200 @@ -1,4 +1,4 @@ QUILT_PATCHES="debian/patches" -QUILT_PATCH_OPTS="--unified-reject-files" +QUILT_PATCH_OPTS="--reject-format=unified" QUILT_DIFF_ARGS="--no-timestamps --no-index" QUILT_REFRESH_ARGS="-pab --no-timestamps --no-index --diffstat"
