debian/changelog | 6 ++- debian/patches/autogen.sh-install | 22 +++++++++++++ debian/patches/bytes_overflow_64bit_upstream_0f5cfdc3136dd | 13 ++----- debian/patches/series | 1 debian/rules | 3 + 5 files changed, 34 insertions(+), 11 deletions(-)
New commits: commit 4e3f982bb8a3ef4505788d7b40146c65f1887136 Author: Drew Parsons <dpars...@debian.org> Date: Sun Aug 20 14:24:28 2017 +0800 upload 2:1.0.7-3 to unstable diff --git a/debian/changelog b/debian/changelog index 1de182d..27361ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libxres (2:1.0.7-3) UNRELEASED; urgency=medium +libxres (2:1.0.7-3) unstable; urgency=medium * Team upload. * Clean file cruft alongside dh_clean, not dh_autoclean * Use debian patch to install autogen.sh (taken from upstream git repo) * Use dh_missing --fail-missing to catch uninstalled files. - -- Drew Parsons <dpars...@debian.org> Sun, 20 Aug 2017 13:03:01 +0800 + -- Drew Parsons <dpars...@debian.org> Sun, 20 Aug 2017 14:23:53 +0800 libxres (2:1.0.7-2) unstable; urgency=low commit cdbd66251dcbff0fffee66295bd2715742a69369 Author: Drew Parsons <dpars...@debian.org> Date: Sun Aug 20 14:08:59 2017 +0800 Use dh_missing --fail-missing to catch uninstalled files dh_install --fail-missing is deprecated diff --git a/debian/changelog b/debian/changelog index 6b3cc6d..1de182d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,8 @@ libxres (2:1.0.7-3) UNRELEASED; urgency=medium * Team upload. * Clean file cruft alongside dh_clean, not dh_autoclean - * use debian patch to install autogen.sh (taken from upstream git repo) + * Use debian patch to install autogen.sh (taken from upstream git repo) + * Use dh_missing --fail-missing to catch uninstalled files. -- Drew Parsons <dpars...@debian.org> Sun, 20 Aug 2017 13:03:01 +0800 diff --git a/debian/rules b/debian/rules index 5722357..5c8b448 100755 --- a/debian/rules +++ b/debian/rules @@ -24,4 +24,5 @@ override_dh_clean: dh_clean override_dh_install: - dh_install --fail-missing --exclude=libXRes.la + dh_install --exclude=libXRes.la + dh_missing --fail-missing -XlibXRes.la commit e92564376c4ec42c1b283af5cb9e9b89ae9e8521 Author: Drew Parsons <dpars...@debian.org> Date: Sun Aug 20 14:00:52 2017 +0800 use debian patch to install autogen.sh taken from upstream git repo https://cgit.freedesktop.org/xorg/lib/libXRes/plain/autogen.sh Also, refresh bytes-overflow patch (refresh line numbers) diff --git a/debian/changelog b/debian/changelog index 1ea4983..6b3cc6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libxres (2:1.0.7-3) UNRELEASED; urgency=medium * Team upload. * Clean file cruft alongside dh_clean, not dh_autoclean + * use debian patch to install autogen.sh (taken from upstream git repo) -- Drew Parsons <dpars...@debian.org> Sun, 20 Aug 2017 13:03:01 +0800 diff --git a/debian/patches/autogen.sh-install b/debian/patches/autogen.sh-install new file mode 100644 index 0000000..9636330 --- /dev/null +++ b/debian/patches/autogen.sh-install @@ -0,0 +1,22 @@ +Index: libxres/autogen.sh +=================================================================== +--- /dev/null ++++ libxres/autogen.sh +@@ -0,0 +1,17 @@ ++#! /bin/sh ++ ++srcdir=`dirname "$0"` ++test -z "$srcdir" && srcdir=. ++ ++ORIGDIR=`pwd` ++cd "$srcdir" ++ ++autoreconf -v --install || exit 1 ++cd "$ORIGDIR" || exit $? ++ ++git config --local --get format.subjectPrefix >/dev/null 2>&1 || ++ git config --local format.subjectPrefix "PATCH libXRes" ++ ++if test -z "$NOCONFIGURE"; then ++ exec "$srcdir"/configure "$@" ++fi diff --git a/debian/patches/bytes_overflow_64bit_upstream_0f5cfdc3136dd b/debian/patches/bytes_overflow_64bit_upstream_0f5cfdc3136dd index ee7b061..5e66dda 100644 --- a/debian/patches/bytes_overflow_64bit_upstream_0f5cfdc3136dd +++ b/debian/patches/bytes_overflow_64bit_upstream_0f5cfdc3136dd @@ -13,11 +13,11 @@ Reported-by: Kevin Ryde <use...@zip.com.au> Signed-off-by: Julien Cristau <jcris...@debian.org> Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> -diff --git a/src/XRes.c b/src/XRes.c -index 51e905f..89fab82 100644 ---- a/src/XRes.c -+++ b/src/XRes.c -@@ -240,7 +240,7 @@ Status XResQueryClientPixmapBytes ( +Index: libxres/src/XRes.c +=================================================================== +--- libxres.orig/src/XRes.c ++++ libxres/src/XRes.c +@@ -239,7 +239,7 @@ Status XResQueryClientPixmapBytes ( } #ifdef LONG64 @@ -26,6 +26,3 @@ index 51e905f..89fab82 100644 #else *bytes = rep.bytes_overflow ? 0xffffffff : rep.bytes; #endif --- -cgit v0.10.2 - diff --git a/debian/patches/series b/debian/patches/series index 2a68bbe..3c9a1a7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +autogen.sh-install bytes_overflow_64bit_upstream_0f5cfdc3136dd