diff options
| author | Didier Raboud <odyx@debian.org> | 2017-07-17 21:50:34 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2017-07-17 21:53:48 +0200 |
| commit | d5ab8d8e92af67bf134e3a4e254a72c46376743d (patch) | |
| tree | 00ab892c0f7ea44dbd46f5085f928f4a722915d6 | |
| parent | 6f17b4bff4ad77b24f75f0afbe2ea37ec624ae70 (diff) | |
| parent | 4addaa1fea6e183355d2e37ed62c833c9f361602 (diff) | |
Git-Dpm: record new upstream branch & rebase patches
| -rw-r--r-- | debian/.git-dpm | 14 | ||||
| -rw-r--r-- | debian/gbp.conf | 2 | ||||
| -rw-r--r-- | debian/patches/0001-Don-t-run-the-insanely-long-test-rastertogutenprint.patch | 2 | ||||
| -rw-r--r-- | src/cups/Makefile.am | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index 079d243..f635f87 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,8 +1,8 @@ # see git-dpm(1) from git-dpm package -1bb5769301431226c837766358b26f17e7d8c378 -1bb5769301431226c837766358b26f17e7d8c378 -aedf3e93e811c6c9d504274172861d266e1c5c97 -aedf3e93e811c6c9d504274172861d266e1c5c97 -gutenprint_5.2.13~pre1.orig.tar.bz2 -7c7ba7e4686e198a8a0818d01ae43480d512b7ae -6971542 +4addaa1fea6e183355d2e37ed62c833c9f361602 +4addaa1fea6e183355d2e37ed62c833c9f361602 +337ffefc0bdf252749c81ebb9255556d54c3e632 +337ffefc0bdf252749c81ebb9255556d54c3e632 +gutenprint_5.2.13.orig.tar.bz2 +b277ae58af0de0f0e9e1884d5dde8f1673528c4f +6995005 diff --git a/debian/gbp.conf b/debian/gbp.conf index b7a5f8f..47e7402 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,4 +1,4 @@ [DEFAULT] -debian-branch = debian/experimental +debian-branch = debian/master upstream-branch = upstream/latest pristine-tar = True 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 94afd58..b69e46f 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 1bb5769301431226c837766358b26f17e7d8c378 Mon Sep 17 00:00:00 2001 +From 4addaa1fea6e183355d2e37ed62c833c9f361602 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/src/cups/Makefile.am b/src/cups/Makefile.am index 62ce028..a0077ad 100644 --- a/src/cups/Makefile.am +++ b/src/cups/Makefile.am @@ -96,7 +96,7 @@ install-exec-hook: mv $(DESTDIR)$(pkglibdir)/backend/backend_gutenprint "$(DESTDIR)$(pkglibdir)/backend/gutenprint$(GUTENPRINT_MAJOR_VERSION)$(GUTENPRINT_MINOR_VERSION)+usb" endif -TESTS= test-ppds test-rastertogutenprint +TESTS= test-ppds noinst_SCRIPTS=test-rastertogutenprint endif |