summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2017-06-19 08:48:01 +0200
committerDidier Raboud <odyx@debian.org>2017-06-19 08:48:01 +0200
commit11bb636ad8f148e326831096ccc36937858287cd (patch)
treefbea732a65225f54ce0ff698272d536a09924d21
parent14c689832386afef5943cab62e8dc43793bc533c (diff)
parent1bb5769301431226c837766358b26f17e7d8c378 (diff)
merge patched-debian/experimental into debian/experimental
-rw-r--r--debian/.git-dpm6
-rw-r--r--debian/patches/0001-Don-t-run-the-insanely-long-test-rastertogutenprint.patch2
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
index f3db996..079d243 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,7 +1,7 @@
# see git-dpm(1) from git-dpm package
-aa6f41059ff2c7f1087368c621eb61771df5cccc
-aa6f41059ff2c7f1087368c621eb61771df5cccc
-7bd83d89975d166521a0b326b64b4cad80117750
+1bb5769301431226c837766358b26f17e7d8c378
+1bb5769301431226c837766358b26f17e7d8c378
+aedf3e93e811c6c9d504274172861d266e1c5c97
aedf3e93e811c6c9d504274172861d266e1c5c97
gutenprint_5.2.13~pre1.orig.tar.bz2
7c7ba7e4686e198a8a0818d01ae43480d512b7ae
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 c53d09d..94afd58 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 aa6f41059ff2c7f1087368c621eb61771df5cccc Mon Sep 17 00:00:00 2001
+From 1bb5769301431226c837766358b26f17e7d8c378 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