Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / engrampa
Commits:
-
e509edd4
by Mike Gabriel at 2023-12-29T07:24:14+01:00
-
45ad2d38
by Mike Gabriel at 2023-12-29T07:24:40+01:00
-
1c1b6dd9
by Mike Gabriel at 2023-12-29T07:26:07+01:00
-
59242c32
by Mike Gabriel at 2023-12-29T07:33:04+01:00
-
f7c21632
by Mike Gabriel at 2023-12-29T07:43:42+01:00
-
f73ad7be
by Mike Gabriel at 2023-12-29T07:44:10+01:00
-
8104ad08
by Mike Gabriel at 2023-12-29T07:55:38+01:00
-
b4b7c5d5
by Mike Gabriel at 2023-12-29T08:01:04+01:00
8 changed files:
- debian/changelog
- debian/control
- debian/copyright
- debian/engrampa.install
- + debian/patches/1001_add-shebang-to-isoinfo-script.patch
- + debian/patches/2001_fix-FTCBFS.patch
- + debian/patches/series
- debian/rules
Changes:
| 1 | +engrampa (1.26.1-1) unstable; urgency=medium
|
|
| 2 | + |
|
| 3 | + * New upstream release.
|
|
| 4 | + - Fix archive 'save as' function. (Closes: #913075).
|
|
| 5 | + * debian/control:
|
|
| 6 | + + Bump Standards-Version: to 4.6.2. No changes needed.
|
|
| 7 | + * debian/copyright:
|
|
| 8 | + + Update copyright attribution for debian/.
|
|
| 9 | + * debian/patches:
|
|
| 10 | + + Add 2001_fix-FTCBFS.patch. Fix FTCBFS in AC_RUN_IFELSE. (Closes:
|
|
| 11 | + #971810).
|
|
| 12 | + + Add 1001_add-shebang-to-isoinfo-script.patch. Add missing shebang.
|
|
| 13 | + Thanks, lintian.
|
|
| 14 | + * debian/rules:
|
|
| 15 | + + Install executables to /usr/libexec directory.
|
|
| 16 | + * debian/engrampa.install:
|
|
| 17 | + + Adjust to libexecdir installation path change.
|
|
| 18 | + |
|
| 19 | + -- Mike Gabriel <sunweaver@debian.org> Fri, 29 Dec 2023 07:24:57 +0100
|
|
| 20 | + |
|
| 1 | 21 | engrampa (1.26.0-1) unstable; urgency=medium
|
| 2 | 22 | |
| 3 | 23 | [ Martin Wimpress ]
|
| ... | ... | @@ -18,7 +18,7 @@ Build-Depends: debhelper-compat (= 13), |
| 18 | 18 | mate-common (>= 1.24.0-1~),
|
| 19 | 19 | mate-submodules-source (>= 0.0~git20210623.f3091f9),
|
| 20 | 20 | yelp-tools,
|
| 21 | -Standards-Version: 4.6.0
|
|
| 21 | +Standards-Version: 4.6.2
|
|
| 22 | 22 | Rules-Requires-Root: no
|
| 23 | 23 | Homepage: http://www.mate-desktop.org/
|
| 24 | 24 | Vcs-Browser: https://salsa.debian.org/debian-mate-team/engrampa
|
| ... | ... | @@ -278,7 +278,7 @@ License: public-domain |
| 278 | 278 | |
| 279 | 279 | Files: debian/*
|
| 280 | 280 | Copyright: 2011-2014, Stefano Karapetsas <stefano@karapetsas.com>
|
| 281 | - 2014-2021, Mike Gabriel <sunweaver@debian.org>
|
|
| 281 | + 2014-2023, Mike Gabriel <sunweaver@debian.org>
|
|
| 282 | 282 | License: GPL-2+ or LGPL-2+
|
| 283 | 283 | |
| 284 | 284 | License: GPL-2+
|
| 1 | 1 | usr/bin/
|
| 2 | 2 | usr/lib/
|
| 3 | +usr/libexec/
|
|
| 3 | 4 | usr/share/applications/ |
| 1 | +Description: Add shebang to isoinfo.sh script.
|
|
| 2 | +Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
| 3 | + |
|
| 4 | +--- a/src/sh/isoinfo.sh
|
|
| 5 | ++++ b/src/sh/isoinfo.sh
|
|
| 6 | +@@ -1,3 +1,5 @@
|
|
| 7 | ++#!/bin/bash
|
|
| 8 | ++
|
|
| 9 | + filename=$2
|
|
| 10 | +
|
|
| 11 | + JOLIET=true |
| 1 | +Description: engrampa FTCBFS: AC_RUN_IFELSE
|
|
| 2 | +Author: Helmut Grohne <helmut@subdivi.de>
|
|
| 3 | +Abstract:
|
|
| 4 | + engrampa fails to cross build from source, because it uses a run check
|
|
| 5 | + to discover the behaviour of file wrt zstd. This has two problems:
|
|
| 6 | + A) It uses AC_RUN_IFELSE, which breaks cross compilation.
|
|
| 7 | + B) It checks the version of file used during build. Not the one it is
|
|
| 8 | + working with.
|
|
| 9 | + .
|
|
| 10 | + I'm attaching a patch that makes it simply assume a recent file during
|
|
| 11 | + cross compilation and we can be done with that. My solution leaves
|
|
| 12 | + aspect B) unaddressed. Please close this bug even if not solving B).
|
|
| 13 | + .
|
|
| 14 | + For solving B), there are a number of options. A simple one is issuing a
|
|
| 15 | + runtime dependency on libmagic1 (>= 1:5.38). Then you always have the
|
|
| 16 | + fixed libmagic and nothing to worry about.
|
|
| 17 | + .
|
|
| 18 | + This doesn't work upstream however. For upstream there also is a better
|
|
| 19 | + solution. Instead of checking the behaviour of file at build time, you
|
|
| 20 | + can check the version of file at runtime. You can simply call
|
|
| 21 | + magic_version() in the application.
|
|
| 22 | + |
|
| 23 | + Quoted from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=971810
|
|
| 24 | + |
|
| 25 | +--- a/configure.ac
|
|
| 26 | ++++ b/configure.ac
|
|
| 27 | +@@ -197,9 +197,15 @@
|
|
| 28 | + }
|
|
| 29 | + return status;]])],
|
|
| 30 | + [zstd_mime_type="application/x-zstd"],
|
|
| 31 | +- [zstd_mime_type="application/zstd"]
|
|
| 32 | ++ [zstd_mime_type="application/zstd"],
|
|
| 33 | ++ [zstd_mime_type="cross"]
|
|
| 34 | + )
|
|
| 35 | +- AC_MSG_RESULT($zstd_mime_type)
|
|
| 36 | ++ AS_IF([test "$zstd_mime_type" = "cross"],[
|
|
| 37 | ++ zstd_mime_type="application/x-zstd"
|
|
| 38 | ++ AC_MSG_RESULT(cross, guessing $zstd_mime_type)
|
|
| 39 | ++ ],[
|
|
| 40 | ++ AC_MSG_RESULT($zstd_mime_type)
|
|
| 41 | ++ ])
|
|
| 42 | + dnl *******************************************
|
|
| 43 | +
|
|
| 44 | + LIBS="$save_LIBS" |
| 1 | +2001_fix-FTCBFS.patch
|
|
| 2 | +1001_add-shebang-to-isoinfo-script.patch |
| ... | ... | @@ -28,7 +28,7 @@ override_dh_auto_configure: |
| 28 | 28 | --disable-silent-rules \
|
| 29 | 29 | --disable-packagekit \
|
| 30 | 30 | --enable-magic \
|
| 31 | - --libexecdir=/usr/lib/engrampa
|
|
| 31 | + --libexecdir=/usr/libexec
|
|
| 32 | 32 | |
| 33 | 33 | get-orig-source:
|
| 34 | 34 | uscan --noconf --force-download --rename --download-current-version --destdir=.. |