merge patched-debian/experimental into debian/experimental

5 files changed, 4 insertions, 68 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 4a216aa..d9c9374 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,7 +1,7 @@
 # see git-dpm(1) from git-dpm package
-d0af5288def3fad3436c9f3f632ed4161e899b8b
-d0af5288def3fad3436c9f3f632ed4161e899b8b
-7f5731038556e5b03d2a886163ca2c873c77333d
+692e5be6b02f6b252dc0a05c55e2d422391537c4
+692e5be6b02f6b252dc0a05c55e2d422391537c4
+d69d392d8c45cdcc93e58f0e1bdbb2b66d6b9566
 d69d392d8c45cdcc93e58f0e1bdbb2b66d6b9566
 gutenprint_5.2.12~pre3.orig.tar.bz2
 884a95995bcfcd61a54cc9fb614ad05552eac5ad
diff --git a/debian/patches/0001-Don-t-run-the-insanely-long-test-rastertogutenprint.patch b/debian/patches/0001-Don-t-run-the-insanely-long-test-rastertogutenprint.patch
index 7a7ab99..599c317 100644
--- a/debian/patches/0001-Don-t-run-the-insanely-long-test-rastertogutenprint.patch
+++ b/debian/patches/0001-Don-t-run-the-insanely-long-test-rastertogutenprint.patch
@@ -1,4 +1,4 @@
-From c8f5e0cee42c345ab59d33c3df7f3e50ccb8a920 Mon Sep 17 00:00:00 2001
+From 692e5be6b02f6b252dc0a05c55e2d422391537c4 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Sun, 4 May 2014 12:34:59 +0200
 Subject: Don't run the insanely long test-rastertogutenprint
diff --git a/debian/patches/0002-build-Fix-inverted-tests-that-broke-module-loads.patch b/debian/patches/0002-build-Fix-inverted-tests-that-broke-module-loads.patch
deleted file mode 100644
index ba35578..0000000
--- a/debian/patches/0002-build-Fix-inverted-tests-that-broke-module-loads.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 112917b0acf923ffa3632fc19a1fbde71d676baf Mon Sep 17 00:00:00 2001
-From: Solomon Peachy <pizza@shaftnet.org>
-Date: Sun, 25 Sep 2016 15:13:06 -0400
-Subject: build:  Fix inverted tests that broke module loads.
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5919a71..a9e4291 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -878,7 +878,7 @@ fi
- # define what module system is to be used
- AC_MSG_CHECKING([which module system will be used])
- if test x$USE_LTDL = xtrue; then
--  if test -n "$WITH_MODULES" ; then
-+  if test -z "$WITH_MODULES" ; then
-     MODULE="false"
-   else
-     MODULE="true"
-@@ -890,7 +890,7 @@ if test x$USE_LTDL = xtrue; then
-   AC_DEFINE(USE_LTDL, "1", [Use GNU libltdl as module loader])
-   AC_MSG_RESULT([ltdl])
- elif test x$USE_DLOPEN = xtrue; then
--  if test -n "$WITH_MODULES" ; then
-+  if test -z "$WITH_MODULES" ; then
-     MODULE="false"
-   else
-     MODULE="true"
diff --git a/debian/patches/0003-build-We-shouldn-t-enable-modules-when-with-modules-.patch b/debian/patches/0003-build-We-shouldn-t-enable-modules-when-with-modules-.patch
deleted file mode 100644
index 8619beb..0000000
--- a/debian/patches/0003-build-We-shouldn-t-enable-modules-when-with-modules-.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d0af5288def3fad3436c9f3f632ed4161e899b8b Mon Sep 17 00:00:00 2001
-From: Solomon Peachy <pizza@shaftnet.org>
-Date: Mon, 26 Sep 2016 09:02:56 -0400
-Subject: build:  We shouldn't enable modules when --with-modules=no or =static
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a9e4291..e5404fc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -878,7 +878,7 @@ fi
- # define what module system is to be used
- AC_MSG_CHECKING([which module system will be used])
- if test x$USE_LTDL = xtrue; then
--  if test -z "$WITH_MODULES" ; then
-+  if test -z "$WITH_MODULES" -o x$WITH_MODULES = xno -o x$WITH_MODULES = xstatic ; then
-     MODULE="false"
-   else
-     MODULE="true"
-@@ -890,7 +890,7 @@ if test x$USE_LTDL = xtrue; then
-   AC_DEFINE(USE_LTDL, "1", [Use GNU libltdl as module loader])
-   AC_MSG_RESULT([ltdl])
- elif test x$USE_DLOPEN = xtrue; then
--  if test -z "$WITH_MODULES" ; then
-+  if test -z "$WITH_MODULES" -o x$WITH_MODULES = xno -o x$WITH_MODULES = xstatic ; then
-     MODULE="false"
-   else
-     MODULE="true"
diff --git a/debian/patches/series b/debian/patches/series
index 3e4c285..6e37c16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 0001-Don-t-run-the-insanely-long-test-rastertogutenprint.patch
-0002-build-Fix-inverted-tests-that-broke-module-loads.patch
-0003-build-We-shouldn-t-enable-modules-when-with-modules-.patch