diff options
| author | Didier Raboud <odyx@debian.org> | 2018-09-30 17:23:09 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2018-09-30 17:23:09 +0200 |
| commit | dadd8c66fa514a58b341931d2107c65b4d40adc1 (patch) | |
| tree | 32f89586ed3285d4c3a8988b38a742be57a48a90 | |
| parent | 003fff4668f6e81a8caf5bfa5ad1f6aab82e278a (diff) | |
| parent | 8ba952c0a61c0b8505cc135873edbdccfbab9a62 (diff) | |
merge patched-debian/experimental into debian/experimental
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/patches/0005-libgutenprintui-Need-to-increment-current_interface.patch (renamed from debian/patches/0005-libgutenprintui-Need-to-reset-binary_age.patch) | 16 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 4c98c4c..c61f06e 100644 --- a/configure.ac +++ b/configure.ac @@ -79,8 +79,8 @@ pushdef([GUTENPRINT_MICRO_VERSION], [1]) pushdef([GUTENPRINT_EXTRA_VERSION], []) pushdef([GUTENPRINT_CURRENT_INTERFACE], [10]) pushdef([GUTENPRINT_BINARY_AGE], [1]) -pushdef([GUTENPRINTUI2_CURRENT_INTERFACE], [2]) -pushdef([GUTENPRINTUI2_BINARY_AGE], [0]) +pushdef([GUTENPRINTUI2_CURRENT_INTERFACE], [3]) +pushdef([GUTENPRINTUI2_BINARY_AGE], [1]) pushdef([GUTENPRINT_VERSION], GUTENPRINT_MAJOR_VERSION.GUTENPRINT_MINOR_VERSION.GUTENPRINT_MICRO_VERSION[]GUTENPRINT_EXTRA_VERSION) AC_INIT([GUTENPRINT_NAME], diff --git a/debian/.git-dpm b/debian/.git-dpm index 11fd5f7..a090ee1 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -a6cd01b86f4560ceb5190ff02cd416a2df49404d -a6cd01b86f4560ceb5190ff02cd416a2df49404d +8ba952c0a61c0b8505cc135873edbdccfbab9a62 +8ba952c0a61c0b8505cc135873edbdccfbab9a62 e50542121e724e851fc5d6c68bb773f80c0bc12c e50542121e724e851fc5d6c68bb773f80c0bc12c gutenprint_5.3.1.orig.tar.xz diff --git a/debian/patches/0005-libgutenprintui-Need-to-reset-binary_age.patch b/debian/patches/0005-libgutenprintui-Need-to-increment-current_interface.patch index bee6288..581921e 100644 --- a/debian/patches/0005-libgutenprintui-Need-to-reset-binary_age.patch +++ b/debian/patches/0005-libgutenprintui-Need-to-increment-current_interface.patch @@ -1,22 +1,22 @@ -From a6cd01b86f4560ceb5190ff02cd416a2df49404d Mon Sep 17 00:00:00 2001 +From 8ba952c0a61c0b8505cc135873edbdccfbab9a62 Mon Sep 17 00:00:00 2001 From: Didier Raboud <odyx@debian.org> Date: Sun, 30 Sep 2018 11:13:58 +0200 -Subject: libgutenprintui: Need to reset binary_age +Subject: libgutenprintui: Need to increment current_interface --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index be142e93..4c98c4ca 100644 +index be142e93..c61f06e8 100644 --- a/configure.ac +++ b/configure.ac -@@ -80,7 +80,7 @@ pushdef([GUTENPRINT_EXTRA_VERSION], []) +@@ -79,7 +79,7 @@ pushdef([GUTENPRINT_MICRO_VERSION], [1]) + pushdef([GUTENPRINT_EXTRA_VERSION], []) pushdef([GUTENPRINT_CURRENT_INTERFACE], [10]) pushdef([GUTENPRINT_BINARY_AGE], [1]) - pushdef([GUTENPRINTUI2_CURRENT_INTERFACE], [2]) --pushdef([GUTENPRINTUI2_BINARY_AGE], [1]) -+pushdef([GUTENPRINTUI2_BINARY_AGE], [0]) +-pushdef([GUTENPRINTUI2_CURRENT_INTERFACE], [2]) ++pushdef([GUTENPRINTUI2_CURRENT_INTERFACE], [3]) + pushdef([GUTENPRINTUI2_BINARY_AGE], [1]) pushdef([GUTENPRINT_VERSION], GUTENPRINT_MAJOR_VERSION.GUTENPRINT_MINOR_VERSION.GUTENPRINT_MICRO_VERSION[]GUTENPRINT_EXTRA_VERSION) - AC_INIT([GUTENPRINT_NAME], diff --git a/debian/patches/series b/debian/patches/series index 3cafe41..9bbf6a4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,4 @@ 0002-Fix-format-warning.patch 0003-backend-Fix-a-compile-warning-that-popped-up-on-Debi.patch 0004-Need-to-increment-current_interface-as-well-as-binar.patch -0005-libgutenprintui-Need-to-reset-binary_age.patch +0005-libgutenprintui-Need-to-increment-current_interface.patch |