Mike Gabriel pushed to branch debian/stretch/backports at Debian and Ubuntu MATE Packaging Team / caja-eiciel
Commits:
-
56b83136
by Mike Gabriel at 2018-08-20T11:36:49Z
-
1a80e16f
by Mike Gabriel at 2018-08-21T13:19:19Z
-
38b6aa04
by Mike Gabriel at 2018-08-21T13:19:19Z
-
bbe4378f
by Mike Gabriel at 2018-08-21T13:19:19Z
-
5d1615de
by Mike Gabriel at 2018-08-21T13:19:19Z
-
e3e73992
by Mike Gabriel at 2018-08-21T13:56:03Z
-
a39d3799
by Mike Gabriel at 2018-08-21T13:56:40Z
-
cf67352b
by Mike Gabriel at 2018-08-21T13:57:49Z
-
62e98012
by Mike Gabriel at 2018-08-27T13:18:44Z
-
747b5061
by Mike Gabriel at 2018-08-27T13:19:59Z
8 changed files:
- debian/changelog
- debian/control
- debian/copyright
- debian/patches/1001_cross.patch
- + debian/patches/1002_fix-marco-call.patch
- + debian/patches/1003_add-keywords-key-to-desktop-file.patch
- debian/patches/series
- debian/rules
Changes:
1 |
+caja-eiciel (1.20.0-1~bpo9+1) stretch-backports; urgency=medium
|
|
2 |
+ |
|
3 |
+ * Rebuild for stretch-backports.
|
|
4 |
+ |
|
5 |
+ -- Mike Gabriel <sunweaver@debian.org> Mon, 27 Aug 2018 15:18:56 +0200
|
|
6 |
+ |
|
7 |
+caja-eiciel (1.20.0-1) unstable; urgency=medium
|
|
8 |
+ |
|
9 |
+ * New upstream release.
|
|
10 |
+ * debian/control:
|
|
11 |
+ + Bump Standards-Version: to 4.2.0. No changes needed.
|
|
12 |
+ * debian/copyright:
|
|
13 |
+ + Update copyright attributions.
|
|
14 |
+ * debian/patches:
|
|
15 |
+ + Rebase 1001_cross.patch.
|
|
16 |
+ + Add 1002_fix-marco-call.patch. Fix callt to AX_CXX_COMPILE_STDCXX_11
|
|
17 |
+ macro. Latest version does not expect any arguments.
|
|
18 |
+ + Add 1003_add-keywords-key-to-desktop-file.patch. Rename X-Keyword= key
|
|
19 |
+ to Keywords= key.
|
|
20 |
+ * debian/rules:
|
|
21 |
+ + Drop hack that moved the appdata.xml file to its right location.
|
|
22 |
+ Fixed upstream.
|
|
23 |
+ |
|
24 |
+ -- Mike Gabriel <sunweaver@debian.org> Tue, 21 Aug 2018 13:50:56 +0200
|
|
25 |
+ |
|
1 | 26 |
caja-eiciel (1.18.1-2~bpo9+1) stretch-backports; urgency=medium
|
2 | 27 |
|
3 | 28 |
* Rebuild for stretch-backports.
|
... | ... | @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 11~), |
13 | 13 |
libgtkmm-3.0-dev (>= 3.0.0),
|
14 | 14 |
libtool,
|
15 | 15 |
pkg-config,
|
16 |
-Standards-Version: 4.1.5
|
|
16 |
+Standards-Version: 4.2.0
|
|
17 | 17 |
Homepage: https://github.com/darkshram/mate-eiciel
|
18 | 18 |
Vcs-Git: https://salsa.debian.org/debian-mate-team/caja-eiciel.git
|
19 | 19 |
Vcs-Browser: https://salsa.debian.org/debian-mate-team/caja-eiciel
|
... | ... | @@ -158,7 +158,7 @@ Files: install-sh |
158 | 158 |
Copyright: 1994, X Consortium
|
159 | 159 |
License: MIT~X11
|
160 | 160 |
|
161 |
-Files: src/mate-eiciel.appdata.xml
|
|
161 |
+Files: src/org.mate-desktop.mate-eiciel.appdata.xml
|
|
162 | 162 |
Copyright: 2014, Roger Ferrer <rofirrim@gmail.com>
|
163 | 163 |
2017, Joel Barrios <darkshram@gmail.com>
|
164 | 164 |
License: GPL-2+
|
1 | 1 |
Description: Fix FTCBFS: lintian tag autotools-pkg-config-macro-not-cross-compilation-safe
|
2 | 2 |
Author: Helmut Grohne <helmut@subdivi.de>
|
3 | 3 |
|
4 |
---- caja-eiciel-1.18.1.orig/configure.ac
|
|
5 |
-+++ caja-eiciel-1.18.1/configure.ac
|
|
6 |
-@@ -96,7 +96,7 @@
|
|
4 |
+--- a/configure.ac
|
|
5 |
++++ b/configure.ac
|
|
6 |
+@@ -99,7 +99,7 @@
|
|
7 | 7 |
]
|
8 | 8 |
,
|
9 | 9 |
[dnl Linux distributions
|
1 |
+Description: Latest version of AX_CXX_COMPILE_STDCXX_11 does not expect any arguments
|
|
2 |
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
3 |
+ |
|
4 |
+--- a/configure.ac
|
|
5 |
++++ b/configure.ac
|
|
6 |
+@@ -14,6 +14,8 @@
|
|
7 |
+
|
|
8 |
+ AM_SILENT_RULES([yes])
|
|
9 |
+
|
|
10 |
++ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
|
|
11 |
++
|
|
12 |
+ dnl gettext support
|
|
13 |
+ GETTEXT_PACKAGE=mate-eiciel
|
|
14 |
+ AC_SUBST([GETTEXT_PACKAGE])
|
|
15 |
+@@ -42,7 +44,7 @@
|
|
16 |
+ dnl Check c++ compiler
|
|
17 |
+ AC_PROG_CXX
|
|
18 |
+
|
|
19 |
+-AX_CXX_COMPILE_STDCXX_11([ext],[optional])
|
|
20 |
++AX_CXX_COMPILE_STDCXX_11
|
|
21 |
+
|
|
22 |
+ dnl Check libtool
|
|
23 |
+ LT_INIT
|
1 |
+Description: Move X-Keyword= values to Keywords= key.
|
|
2 |
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
3 |
+ |
|
4 |
+--- a/src/org.mate-desktop.mate-eiciel.desktop.in
|
|
5 |
++++ b/src/org.mate-desktop.mate-eiciel.desktop.in
|
|
6 |
+@@ -11,4 +11,4 @@
|
|
7 |
+ Terminal=false
|
|
8 |
+ Type=Application
|
|
9 |
+ Categories=GTK;System;FileTools;
|
|
10 |
+-X-Keyword=access control list;ACL;permissions;editor;
|
|
11 |
++Keywords=access control list;ACL;permissions;editor;
|
1 | 1 |
1001_cross.patch
|
2 |
+1002_fix-marco-call.patch
|
|
3 |
+1003_add-keywords-key-to-desktop-file.patch
|
... | ... | @@ -10,9 +10,6 @@ override_dh_install: |
10 | 10 |
dh_install
|
11 | 11 |
rm -f debian/caja-eiciel/usr/lib/*/caja/extensions-*/*.a
|
12 | 12 |
rm -f debian/caja-eiciel/usr/lib/*/caja/extensions-*/*.la
|
13 |
- mkdir -p debian/caja-eiciel/usr/share/metainfo/
|
|
14 |
- mv debian/caja-eiciel/usr/share/appdata/mate-eiciel.appdata.xml debian/caja-eiciel/usr/share/metainfo/mate-eiciel.appdata.xml
|
|
15 |
- rmdir debian/caja-eiciel/usr/share/appdata/
|
|
16 | 13 |
|
17 | 14 |
override_dh_missing:
|
18 | 15 |
dh_missing --fail-missing
|