debian/changelog

+caja-eiciel (1.20.0-1~bpo9+1) stretch-backports; urgency=medium
+
+  * Rebuild for stretch-backports.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Mon, 27 Aug 2018 15:18:56 +0200
+
+caja-eiciel (1.20.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control:
+    + Bump Standards-Version: to 4.2.0. No changes needed.
+  * debian/copyright:
+    + Update copyright attributions.
+  * debian/patches:
+    + Rebase 1001_cross.patch.
+    + Add 1002_fix-marco-call.patch. Fix callt to AX_CXX_COMPILE_STDCXX_11
+      macro. Latest version does not expect any arguments.
+    + Add 1003_add-keywords-key-to-desktop-file.patch. Rename X-Keyword= key
+      to Keywords= key.
+  * debian/rules:
+    + Drop hack that moved the appdata.xml file to its right location.
+      Fixed upstream.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Tue, 21 Aug 2018 13:50:56 +0200
+
 caja-eiciel (1.18.1-2~bpo9+1) stretch-backports; urgency=medium
 
   * Rebuild for stretch-backports.

debian/control

@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 11~),
                libgtkmm-3.0-dev (>= 3.0.0),
                libtool,
                pkg-config,
-Standards-Version: 4.1.5
+Standards-Version: 4.2.0
 Homepage: https://github.com/darkshram/mate-eiciel
 Vcs-Git: https://salsa.debian.org/debian-mate-team/caja-eiciel.git
 Vcs-Browser: https://salsa.debian.org/debian-mate-team/caja-eiciel

debian/copyright

@@ -158,7 +158,7 @@ Files: install-sh
 Copyright: 1994, X Consortium
 License: MIT~X11
 
-Files: src/mate-eiciel.appdata.xml
+Files: src/org.mate-desktop.mate-eiciel.appdata.xml
 Copyright: 2014, Roger Ferrer <rofirrim@gmail.com>
   2017, Joel Barrios <darkshram@gmail.com>
 License: GPL-2+

debian/patches/1001_cross.patch

 Description: Fix FTCBFS: lintian tag autotools-pkg-config-macro-not-cross-compilation-safe
 Author: Helmut Grohne <helmut@subdivi.de>
 
---- caja-eiciel-1.18.1.orig/configure.ac
-+++ caja-eiciel-1.18.1/configure.ac
-@@ -96,7 +96,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -99,7 +99,7 @@
  ]
  ,
  [dnl Linux distributions

debian/patches/1002_fix-marco-call.patch

+Description: Latest version of AX_CXX_COMPILE_STDCXX_11 does not expect any arguments
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,6 +14,8 @@
+ 
+ AM_SILENT_RULES([yes])
+ 
++ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 
++
+ dnl gettext support
+ GETTEXT_PACKAGE=mate-eiciel
+ AC_SUBST([GETTEXT_PACKAGE])
+@@ -42,7 +44,7 @@
+ dnl Check c++ compiler
+ AC_PROG_CXX
+ 
+-AX_CXX_COMPILE_STDCXX_11([ext],[optional])
++AX_CXX_COMPILE_STDCXX_11
+ 
+ dnl Check libtool
+ LT_INIT

debian/patches/1003_add-keywords-key-to-desktop-file.patch

+Description: Move X-Keyword= values to Keywords= key.
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+--- a/src/org.mate-desktop.mate-eiciel.desktop.in
++++ b/src/org.mate-desktop.mate-eiciel.desktop.in
+@@ -11,4 +11,4 @@
+ Terminal=false
+ Type=Application
+ Categories=GTK;System;FileTools;
+-X-Keyword=access control list;ACL;permissions;editor;
++Keywords=access control list;ACL;permissions;editor;

debian/patches/series

 1001_cross.patch
+1002_fix-marco-call.patch
+1003_add-keywords-key-to-desktop-file.patch

debian/rules

@@ -10,9 +10,6 @@ override_dh_install:
 	dh_install
 	rm -f debian/caja-eiciel/usr/lib/*/caja/extensions-*/*.a
 	rm -f debian/caja-eiciel/usr/lib/*/caja/extensions-*/*.la
-	mkdir -p debian/caja-eiciel/usr/share/metainfo/
-	mv debian/caja-eiciel/usr/share/appdata/mate-eiciel.appdata.xml debian/caja-eiciel/usr/share/metainfo/mate-eiciel.appdata.xml
-	rmdir debian/caja-eiciel/usr/share/appdata/
 
 override_dh_missing:
 	dh_missing --fail-missing