debian/changelog

-python-caja (1.22.0-1) UNRELEASED; urgency=medium
+python-caja (1.22.0-1) unstable; urgency=medium
 
+  [ Martin Wimpress ]
   * New upstream release.
+  * debian/patches:
+    + Rebase 0001, 2001.
+  * debian/control:
+    + Updated for MATE Desktop 1.22
+  * debian/copyright:
+    + Update copyright attributions.
+
+  [ Mike Gabriel ]
+  * debian/{compat,control}:
+    + Use debhelper-compat notation. Bump to DH compat level version 12.
+  * debian/control:
+    + Bump Standards-Version: to 4.4.0. No changes needed.
+  * debian/patches:
+    + Rebase 1001.
+  * debian/rules:
+    + Drop dbgsym-migration dh_strip override.
 
- -- Martin Wimpress <martin.wimpress@ubuntu.com>  Mon, 18 Mar 2019 20:30:23 +0000
+ -- Mike Gabriel <sunweaver@debian.org>  Mon, 29 Jul 2019 15:47:26 +0200
 
 python-caja (1.20.2-1) unstable; urgency=medium
 

debian/copyright

@@ -27,7 +27,8 @@ Files: src/caja-python-object.c
 Copyright: 2003-2004, Novell, Inc.
 License: GPL-2+
 
-Files: .tx/config
+Files: .travis.yml
+       .tx/config
        .github/issue_template.md
        AUTHORS
        COPYING

debian/patches/1001_pkg-config-macro-not-cross-compilation-safe.patch

+Description: Make configure.ac cross compile safe
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,14 +15,11 @@
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+ 
+-dnl Check for pkgconfig first
+-AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
+-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+-
++PKG_PROG_PKG_CONFIG
+ dnl Give error and exit if we dont have pkgconfig
+-if test "x$HAVE_PKGCONFIG" = "xno"; then
++AS_IF([test "x$PKG_CONFIG" = "x"],[
+   AC_MSG_ERROR([you need to have pkgconfig installed !])
+-fi
++])
+ 
+ dnl i18n
+ GETTEXT_PACKAGE=python-caja
+@@ -40,7 +37,7 @@
+ dnl **************************************************
+ AM_PATH_PYTHON([2.7])
+ PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}])
+-PYTHON_LIB_LOC="`pkg-config gobject-introspection-1.0 --variable=libdir`"
++PYTHON_LIB_LOC="`$PKG_CONFIG gobject-introspection-1.0 --variable=libdir`"
+ PYTHON_ABIFLAGS=`$PYTHON -c 'import sys; exec("try: print (sys.abiflags)\nexcept: pass")'`
+ AC_SUBST(PYTHON_LIBS)
+ AC_SUBST(PYTHON_CFLAGS)
+@@ -80,9 +77,9 @@
+ 	AS_HELP_STRING([--with-cajadir=DIR],[Installation path for Caja extension @<:@auto@:>@]),
+ 	[ac_with_cajadir=$withval],
+ 	[ac_with_cajadir=""])
+-if test "${ac_with_cajadir}" = ""; then
++AS_IF([test "${ac_with_cajadir}" = ""],[
+ 	ac_with_cajadir=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
+-fi
++])
+ 
+ AC_MSG_NOTICE([installing caja plugin in ${ac_with_cajadir}])
+ AC_SUBST([CAJA_EXTENSION_DIR], [${ac_with_cajadir}])
+@@ -90,14 +87,14 @@
+ dnl ---------------------------------
+ dnl Check for gtk-doc dependencies
+ dnl ---------------------------------
+-if test "${enable_gtk_doc}" != no; then
++AS_IF([test "${enable_gtk_doc}" != no],[
+     dnl Check for xsltproc
+     AC_PATH_PROG([XSLTPROC], [xsltproc])
+-    if test -z "$XSLTPROC"; then
++    AS_IF([test -z "$XSLTPROC"],[
+         echo " disabling generation of docs"
+         enable_gtk_doc=no
+-    fi
+-fi
++    ])
++])
+ 
+ AC_OUTPUT([
+   Makefile

debian/patches/series

 2001_fix-python-libdir-not-found.patch
 0001_reproducible-build.patch
+1001_pkg-config-macro-not-cross-compilation-safe.patch

debian/rules

@@ -30,8 +30,5 @@ override_dh_auto_configure:
 		--disable-static \
 		--enable-gtk-doc
 
-override_dh_strip:
-	dh_strip --dbgsym-migration='python-caja-dbg (<< 1.14.0-2~)'
-
 get-orig-source:
 	uscan --noconf --force-download --rename --download-current-version --destdir=..