From: Jon Dowland Date: Wed, 16 May 2012 13:46:20 +0000 (+0100) Subject: Move away from split patches in debian/patches/* X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=082f5a7fe9da321ab3d515ce177702843c0f750d;p=packages%2Fb%2Fbup.git Move away from split patches in debian/patches/* 3.0 (quilt) and using a git repo for the package source is a royal PITA. Let's let the good tool do the job (git) and the (legacy) source package have a single, flattened patch. • add a .gitignore for .pc and debian/patches • delete debian/patches/* (all applied in separate commits) • debian/patches/series: not in use --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8c1ae56 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/.pc +/debian/patches diff --git a/debian/patches/0001-drop-the-from-the-OSNAME.patch b/debian/patches/0001-drop-the-from-the-OSNAME.patch deleted file mode 100644 index dcbfee7..0000000 --- a/debian/patches/0001-drop-the-from-the-OSNAME.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 36ffb8b9d426f68267e9f1fabe41f3bd8d5dcb46 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= -Date: Sat, 31 Dec 2011 15:33:42 +0100 -Subject: [PATCH] drop the / from the OSNAME -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -on GNU kFreeBSD, uname -s returns "GNU/kFreeBSD", the / is not -accepted a macro and the build fails with -Werror - -../../config/config.h:9:15: error: missing whitespace after the macro name [-Werror] - -Signed-off-by: Gonéri Le Bouder ---- - config/configure.inc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/config/configure.inc b/config/configure.inc -index 2bafea0..0a1b4c0 100644 ---- a/config/configure.inc -+++ b/config/configure.inc -@@ -653,7 +653,7 @@ EOF - AC_PROG_CPP - AC_PROG_INSTALL - -- ac_os=`uname -s | sed 's/[-_].*//'` -+ ac_os=`uname -s | sed 's/[-_].*//' | sed 's,/,,'` - _os=`echo $ac_os | tr '[a-z]' '[A-Z]'` - AC_DEFINE OS_$_os 1 - eval OS_${_os}=1 --- -1.7.7.3 - diff --git a/debian/patches/0001-ignore-utimensat-on-GNU-kFreeBSD.patch b/debian/patches/0001-ignore-utimensat-on-GNU-kFreeBSD.patch deleted file mode 100644 index ebb1005..0000000 --- a/debian/patches/0001-ignore-utimensat-on-GNU-kFreeBSD.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 28098606f545c3904afdc6ef2c0994199de7dca7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= -Date: Sat, 31 Dec 2011 16:14:27 +0100 -Subject: [PATCH] ignore utimensat on GNU/kFreeBSD -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -See: http://bugs.debian.org/651104 -See: http://lists.debian.org/debian-bsd/2011/03/msg00063.html - -Signed-off-by: Gonéri Le Bouder ---- - config/configure | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/config/configure b/config/configure -index 8841fff..a1272c3 100755 ---- a/config/configure -+++ b/config/configure -@@ -59,7 +59,11 @@ AC_CHECK_HEADERS unistd.h - AC_CHECK_HEADERS linux/fs.h - AC_CHECK_HEADERS sys/ioctl.h - --AC_CHECK_FUNCS utimensat -+# on GNU/kFreeBSD utimensat is defined in the GNU libc -+# but won't work -+if [ -z "$OS_GNUKFREEBSD" ]; then -+ AC_CHECK_FUNCS utimensat -+fi - AC_CHECK_FUNCS utimes - AC_CHECK_FUNCS lutimes - --- -1.7.7.3 - diff --git a/debian/patches/bloom-unaligned-bufs b/debian/patches/bloom-unaligned-bufs deleted file mode 100644 index db0fe4d..0000000 --- a/debian/patches/bloom-unaligned-bufs +++ /dev/null @@ -1,88 +0,0 @@ -Date: Wed, 14 Sep 2011 21:10:53 +0200 -From: Julien Cristau -Subject: Re: Bug#641488: bup: FTBFS on sparc (bus error in bloom test) - -With the following patch, the package builds fine on smetana. This -avoids 4-byte accesses to unaligned buffers: - ---- bup-0.24b.orig/lib/bup/_helpers.c -+++ bup-0.24b/lib/bup/_helpers.c -@@ -137,59 +137,58 @@ static PyObject *firstword(PyObject *sel - - #define BLOOM2_HEADERLEN 16 - --typedef struct { -- uint32_t high; -- unsigned char low; --} bits40_t; -- --static void to_bloom_address_bitmask4(const bits40_t *buf, -+static void to_bloom_address_bitmask4(const unsigned char *buf, - const int nbits, uint64_t *v, unsigned char *bitmask) - { - int bit; -+ uint32_t high; - uint64_t raw, mask; - -+ memcpy(&high, buf, 4); - mask = (1<high)) << 8) | buf->low; -+ raw = (((uint64_t)ntohl(high) << 8) | buf[4]); - bit = (raw >> (37-nbits)) & 0x7; - *v = (raw >> (40-nbits)) & mask; - *bitmask = 1 << bit; - } - --static void to_bloom_address_bitmask5(const uint32_t *buf, -+static void to_bloom_address_bitmask5(const unsigned char *buf, - const int nbits, uint32_t *v, unsigned char *bitmask) - { - int bit; -+ uint32_t high; - uint32_t raw, mask; - -+ memcpy(&high, buf, 4); - mask = (1<> (29-nbits)) & 0x7; - *v = (raw >> (32-nbits)) & mask; - *bitmask = 1 << bit; - } - --#define BLOOM_SET_BIT(name, address, itype, otype) \ --static void name(unsigned char *bloom, const void *buf, const int nbits)\ -+#define BLOOM_SET_BIT(name, address, otype) \ -+static void name(unsigned char *bloom, const unsigned char *buf, const int nbits)\ - {\ - unsigned char bitmask;\ - otype v;\ -- address((itype *)buf, nbits, &v, &bitmask);\ -+ address(buf, nbits, &v, &bitmask);\ - bloom[BLOOM2_HEADERLEN+v] |= bitmask;\ - } --BLOOM_SET_BIT(bloom_set_bit4, to_bloom_address_bitmask4, bits40_t, uint64_t) --BLOOM_SET_BIT(bloom_set_bit5, to_bloom_address_bitmask5, uint32_t, uint32_t) -+BLOOM_SET_BIT(bloom_set_bit4, to_bloom_address_bitmask4, uint64_t) -+BLOOM_SET_BIT(bloom_set_bit5, to_bloom_address_bitmask5, uint32_t) - - --#define BLOOM_GET_BIT(name, address, itype, otype) \ --static int name(const unsigned char *bloom, const void *buf, const int nbits)\ -+#define BLOOM_GET_BIT(name, address, otype) \ -+static int name(const unsigned char *bloom, const unsigned char *buf, const int nbits)\ - {\ - unsigned char bitmask;\ - otype v;\ -- address((itype *)buf, nbits, &v, &bitmask);\ -+ address(buf, nbits, &v, &bitmask);\ - return bloom[BLOOM2_HEADERLEN+v] & bitmask;\ - } --BLOOM_GET_BIT(bloom_get_bit4, to_bloom_address_bitmask4, bits40_t, uint64_t) --BLOOM_GET_BIT(bloom_get_bit5, to_bloom_address_bitmask5, uint32_t, uint32_t) -+BLOOM_GET_BIT(bloom_get_bit4, to_bloom_address_bitmask4, uint64_t) -+BLOOM_GET_BIT(bloom_get_bit5, to_bloom_address_bitmask5, uint32_t) - - - static PyObject *bloom_add(PyObject *self, PyObject *args) - diff --git a/debian/patches/excise-tornado b/debian/patches/excise-tornado deleted file mode 100644 index 0a189a2..0000000 --- a/debian/patches/excise-tornado +++ /dev/null @@ -1,25 +0,0 @@ -Description: remove makefile bits partaining to embedded tornado -Author: Jon Dowland -Last-Update: 2011-11-19 - ---- bup-0.24b.orig/Makefile -+++ bup-0.24b/Makefile -@@ -23,7 +23,7 @@ BINDIR=$(DESTDIR)$(PREFIX)/bin - LIBDIR=$(DESTDIR)$(PREFIX)/lib/bup - install: all - $(INSTALL) -d $(MANDIR)/man1 $(DOCDIR) $(BINDIR) \ -- $(LIBDIR)/bup $(LIBDIR)/cmd $(LIBDIR)/tornado \ -+ $(LIBDIR)/bup $(LIBDIR)/cmd \ - $(LIBDIR)/web $(LIBDIR)/web/static - [ ! -e Documentation/.docs-available ] || \ - $(INSTALL) -m 0644 \ -@@ -44,9 +44,6 @@ install: all - lib/bup/*$(SOEXT) \ - $(LIBDIR)/bup - $(INSTALL) -m 0644 \ -- lib/tornado/*.py \ -- $(LIBDIR)/tornado -- $(INSTALL) -m 0644 \ - lib/web/static/* \ - $(LIBDIR)/web/static/ - $(INSTALL) -m 0644 \ diff --git a/debian/patches/no-werror b/debian/patches/no-werror deleted file mode 100644 index 809f32d..0000000 --- a/debian/patches/no-werror +++ /dev/null @@ -1,20 +0,0 @@ -From 7e7f319c5ee66cef5030ec85c39baca7793ddcef Mon Sep 17 00:00:00 2001 -From: Julien Cristau -Date: Sat, 20 Aug 2011 19:32:25 +0200 -Subject: [PATCH] Drop -Werror from CFLAGS - ---- -diff --git a/Makefile b/Makefile -index d137436..1160d91 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,5 @@ - OS:=$(shell uname | sed 's/[-_].*//') --CFLAGS:=-Wall -O2 -Werror $(PYINCLUDE) -+CFLAGS:=-Wall -O2 $(PYINCLUDE) - SOEXT:=.so - - ifeq ($(OS),CYGWIN) --- -1.7.7.1 - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 49e8cf3..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,5 +0,0 @@ -0001-drop-the-from-the-OSNAME.patch -0001-ignore-utimensat-on-GNU-kFreeBSD.patch -bloom-unaligned-bufs -excise-tornado -no-werror diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..7423a2d --- /dev/null +++ b/debian/source/options @@ -0,0 +1 @@ +single-debian-patch