[libkate] 02/02: Divide squashed patch into separate patches, tag them properly and convert them to gbp-pq format.

[Martin Steghöfer]

This is an automated email from the git hooks/post-receive script.

martin.steghoefer-guest pushed a commit to branch master
in repository libkate.

commit 5aa4e1113b323bdc24fd5f1565ffd26966fc7969
Author: Martin Steghöfer <martin at steghoefer.eu>
Date:   Tue Oct 21 22:17:36 2014 +0200

    Divide squashed patch into separate patches, tag them properly and convert them to gbp-pq format.
---
 .../0001-Fix-tests-check_sizes.c-on-x32.patch      | 25 +++++++++++++
 ...ror-for-automake-to-fix-FTBFS-while-autor.patch | 22 ++++++++++++
 debian/patches/series                              |  3 +-
 debian/patches/version-0.4.1-1.1.patch             | 41 ----------------------
 4 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/debian/patches/0001-Fix-tests-check_sizes.c-on-x32.patch b/debian/patches/0001-Fix-tests-check_sizes.c-on-x32.patch
new file mode 100644
index 0000000..327de27
--- /dev/null
+++ b/debian/patches/0001-Fix-tests-check_sizes.c-on-x32.patch
@@ -0,0 +1,25 @@
+From: Daniel Schepler <schepler at debian.org>
+Date: Sat, 9 Mar 2013 16:33:14 -0800
+Subject: Fix tests/check_sizes.c on x32
+
+Bug-Debian: https://bugs.debian.org/702681
+---
+ tests/check_sizes.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tests/check_sizes.c b/tests/check_sizes.c
+index 0b9809f..8aa36e5 100644
+--- a/tests/check_sizes.c
++++ b/tests/check_sizes.c
+@@ -30,7 +30,11 @@ static void ksz_print(const char *type,size_t sz)
+   } while(0)
+ 
+ #ifdef __x86_64__
++#ifdef __ILP32__
++#define KSZ(type,sz32,sz64) KSZA(type,sz32)
++#else
+ #define KSZ(type,sz32,sz64) KSZA(type,sz64)
++#endif
+ #elif defined __i386__
+ #define KSZ(type,sz32,sz64) KSZA(type,sz32)
+ #else
diff --git a/debian/patches/0002-Disable-Werror-for-automake-to-fix-FTBFS-while-autor.patch b/debian/patches/0002-Disable-Werror-for-automake-to-fix-FTBFS-while-autor.patch
new file mode 100644
index 0000000..ac3605f
--- /dev/null
+++ b/debian/patches/0002-Disable-Werror-for-automake-to-fix-FTBFS-while-autor.patch
@@ -0,0 +1,22 @@
+From: Logan Rosen <logan at ubuntu.com>
+Date: Tue, 31 Dec 2013 23:35:00 -0500
+Subject: Disable -Werror for automake to fix FTBFS while autoreconfing
+
+Bug-Debian: https://bugs.debian.org/733834
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 58ff478..2bbf6dd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,7 +7,7 @@ AC_PREREQ(2.53)
+ 
+ AC_CANONICAL_TARGET
+ 
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
+ AC_CONFIG_HEADERS([include/config.h])
+ 
+ ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
diff --git a/debian/patches/series b/debian/patches/series
index 48b43e4..2a885b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-version-0.4.1-1.1.patch
+0001-Fix-tests-check_sizes.c-on-x32.patch
+0002-Disable-Werror-for-automake-to-fix-FTBFS-while-autor.patch
diff --git a/debian/patches/version-0.4.1-1.1.patch b/debian/patches/version-0.4.1-1.1.patch
deleted file mode 100644
index d790711..0000000
--- a/debian/patches/version-0.4.1-1.1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Patches applied to version 0.4.1-1.1
-Author: ?
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- libkate-0.4.1.orig/configure.ac
-+++ libkate-0.4.1/configure.ac
-@@ -7,7 +7,7 @@ AC_PREREQ(2.53)
- 
- AC_CANONICAL_TARGET
- 
--AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
-+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
- AC_CONFIG_HEADERS([include/config.h])
- 
- ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
---- libkate-0.4.1.orig/tests/check_sizes.c
-+++ libkate-0.4.1/tests/check_sizes.c
-@@ -30,7 +30,11 @@ static void ksz_print(const char *type,s
-   } while(0)
- 
- #ifdef __x86_64__
-+#ifdef __ILP32__
-+#define KSZ(type,sz32,sz64) KSZA(type,sz32)
-+#else
- #define KSZ(type,sz32,sz64) KSZA(type,sz64)
-+#endif
- #elif defined __i386__
- #define KSZ(type,sz32,sz64) KSZA(type,sz32)
- #else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xiph/libkate.git