diff options
author | Didier Raboud <odyx@debian.org> | 2018-09-30 11:14:36 +0200 |
---|---|---|
committer | Didier Raboud <odyx@debian.org> | 2018-09-30 11:21:17 +0200 |
commit | f91bb38109b02fb94387f9ddf86d7f698528bbab (patch) | |
tree | 43016bae4ebe588e6320617284d85538ce13c977 | |
parent | 996fe9fc178d5d1a1f1321a61610241d49947f27 (diff) | |
parent | a6cd01b86f4560ceb5190ff02cd416a2df49404d (diff) |
merge patched-debian/experimental into debian/experimental
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | debian/.git-dpm | 4 | ||||
-rw-r--r-- | debian/patches/0005-libgutenprintui-Need-to-reset-binary_age.patch | 22 | ||||
-rw-r--r-- | debian/patches/series | 1 |
4 files changed, 26 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index be142e9..4c98c4c 100644 --- a/configure.ac +++ b/configure.ac @@ -80,7 +80,7 @@ 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([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 742add8..11fd5f7 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -73427b40bcf3e1e8d87d911b22b4ccb6db23791b -73427b40bcf3e1e8d87d911b22b4ccb6db23791b +a6cd01b86f4560ceb5190ff02cd416a2df49404d +a6cd01b86f4560ceb5190ff02cd416a2df49404d 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-reset-binary_age.patch new file mode 100644 index 0000000..bee6288 --- /dev/null +++ b/debian/patches/0005-libgutenprintui-Need-to-reset-binary_age.patch @@ -0,0 +1,22 @@ +From a6cd01b86f4560ceb5190ff02cd416a2df49404d 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 + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index be142e93..4c98c4ca 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -80,7 +80,7 @@ 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([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 e8dea6f..3cafe41 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +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 |