Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / python-caja
Commits:
-
4b14301c
by Mike Gabriel at 2019-07-29T13:46:57Z
-
e2b9e9f9
by Mike Gabriel at 2019-07-29T13:47:16Z
-
498c8e5f
by Mike Gabriel at 2019-07-29T14:00:11Z
-
4b0d9a42
by Mike Gabriel at 2019-07-29T14:06:45Z
-
0aa8f2dd
by Mike Gabriel at 2019-07-29T14:07:03Z
5 changed files:
- debian/changelog
- debian/copyright
- + debian/patches/1001_pkg-config-macro-not-cross-compilation-safe.patch
- debian/patches/series
- debian/rules
Changes:
| 1 |
-python-caja (1.22.0-1) UNRELEASED; urgency=medium
|
|
| 1 |
+python-caja (1.22.0-1) unstable; urgency=medium
|
|
| 2 | 2 |
|
| 3 |
+ [ Martin Wimpress ]
|
|
| 3 | 4 |
* New upstream release.
|
| 5 |
+ * debian/patches:
|
|
| 6 |
+ + Rebase 0001, 2001.
|
|
| 7 |
+ * debian/control:
|
|
| 8 |
+ + Updated for MATE Desktop 1.22
|
|
| 9 |
+ * debian/copyright:
|
|
| 10 |
+ + Update copyright attributions.
|
|
| 11 |
+ |
|
| 12 |
+ [ Mike Gabriel ]
|
|
| 13 |
+ * debian/{compat,control}:
|
|
| 14 |
+ + Use debhelper-compat notation. Bump to DH compat level version 12.
|
|
| 15 |
+ * debian/control:
|
|
| 16 |
+ + Bump Standards-Version: to 4.4.0. No changes needed.
|
|
| 17 |
+ * debian/patches:
|
|
| 18 |
+ + Rebase 1001.
|
|
| 19 |
+ * debian/rules:
|
|
| 20 |
+ + Drop dbgsym-migration dh_strip override.
|
|
| 4 | 21 |
|
| 5 |
- -- Martin Wimpress <martin.wimpress@ubuntu.com> Mon, 18 Mar 2019 20:30:23 +0000
|
|
| 22 |
+ -- Mike Gabriel <sunweaver@debian.org> Mon, 29 Jul 2019 15:47:26 +0200
|
|
| 6 | 23 |
|
| 7 | 24 |
python-caja (1.20.2-1) unstable; urgency=medium
|
| 8 | 25 |
|
| ... | ... | @@ -27,7 +27,8 @@ Files: src/caja-python-object.c |
| 27 | 27 |
Copyright: 2003-2004, Novell, Inc.
|
| 28 | 28 |
License: GPL-2+
|
| 29 | 29 |
|
| 30 |
-Files: .tx/config
|
|
| 30 |
+Files: .travis.yml
|
|
| 31 |
+ .tx/config
|
|
| 31 | 32 |
.github/issue_template.md
|
| 32 | 33 |
AUTHORS
|
| 33 | 34 |
COPYING
|
| 1 |
+Description: Make configure.ac cross compile safe
|
|
| 2 |
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
|
| 3 |
+ |
|
| 4 |
+--- a/configure.ac
|
|
| 5 |
++++ b/configure.ac
|
|
| 6 |
+@@ -15,14 +15,11 @@
|
|
| 7 |
+ AC_DISABLE_STATIC
|
|
| 8 |
+ AC_PROG_LIBTOOL
|
|
| 9 |
+
|
|
| 10 |
+-dnl Check for pkgconfig first
|
|
| 11 |
+-AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
|
|
| 12 |
+-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
|
| 13 |
+-
|
|
| 14 |
++PKG_PROG_PKG_CONFIG
|
|
| 15 |
+ dnl Give error and exit if we dont have pkgconfig
|
|
| 16 |
+-if test "x$HAVE_PKGCONFIG" = "xno"; then
|
|
| 17 |
++AS_IF([test "x$PKG_CONFIG" = "x"],[
|
|
| 18 |
+ AC_MSG_ERROR([you need to have pkgconfig installed !])
|
|
| 19 |
+-fi
|
|
| 20 |
++])
|
|
| 21 |
+
|
|
| 22 |
+ dnl i18n
|
|
| 23 |
+ GETTEXT_PACKAGE=python-caja
|
|
| 24 |
+@@ -40,7 +37,7 @@
|
|
| 25 |
+ dnl **************************************************
|
|
| 26 |
+ AM_PATH_PYTHON([2.7])
|
|
| 27 |
+ PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}])
|
|
| 28 |
+-PYTHON_LIB_LOC="`pkg-config gobject-introspection-1.0 --variable=libdir`"
|
|
| 29 |
++PYTHON_LIB_LOC="`$PKG_CONFIG gobject-introspection-1.0 --variable=libdir`"
|
|
| 30 |
+ PYTHON_ABIFLAGS=`$PYTHON -c 'import sys; exec("try: print (sys.abiflags)\nexcept: pass")'`
|
|
| 31 |
+ AC_SUBST(PYTHON_LIBS)
|
|
| 32 |
+ AC_SUBST(PYTHON_CFLAGS)
|
|
| 33 |
+@@ -80,9 +77,9 @@
|
|
| 34 |
+ AS_HELP_STRING([--with-cajadir=DIR],[Installation path for Caja extension @<:@auto@:>@]),
|
|
| 35 |
+ [ac_with_cajadir=$withval],
|
|
| 36 |
+ [ac_with_cajadir=""])
|
|
| 37 |
+-if test "${ac_with_cajadir}" = ""; then
|
|
| 38 |
++AS_IF([test "${ac_with_cajadir}" = ""],[
|
|
| 39 |
+ ac_with_cajadir=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
|
|
| 40 |
+-fi
|
|
| 41 |
++])
|
|
| 42 |
+
|
|
| 43 |
+ AC_MSG_NOTICE([installing caja plugin in ${ac_with_cajadir}])
|
|
| 44 |
+ AC_SUBST([CAJA_EXTENSION_DIR], [${ac_with_cajadir}])
|
|
| 45 |
+@@ -90,14 +87,14 @@
|
|
| 46 |
+ dnl ---------------------------------
|
|
| 47 |
+ dnl Check for gtk-doc dependencies
|
|
| 48 |
+ dnl ---------------------------------
|
|
| 49 |
+-if test "${enable_gtk_doc}" != no; then
|
|
| 50 |
++AS_IF([test "${enable_gtk_doc}" != no],[
|
|
| 51 |
+ dnl Check for xsltproc
|
|
| 52 |
+ AC_PATH_PROG([XSLTPROC], [xsltproc])
|
|
| 53 |
+- if test -z "$XSLTPROC"; then
|
|
| 54 |
++ AS_IF([test -z "$XSLTPROC"],[
|
|
| 55 |
+ echo " disabling generation of docs"
|
|
| 56 |
+ enable_gtk_doc=no
|
|
| 57 |
+- fi
|
|
| 58 |
+-fi
|
|
| 59 |
++ ])
|
|
| 60 |
++])
|
|
| 61 |
+
|
|
| 62 |
+ AC_OUTPUT([
|
|
| 63 |
+ Makefile
|
| 1 | 1 |
2001_fix-python-libdir-not-found.patch
|
| 2 | 2 |
0001_reproducible-build.patch
|
| 3 |
+1001_pkg-config-macro-not-cross-compilation-safe.patch
|
| ... | ... | @@ -30,8 +30,5 @@ override_dh_auto_configure: |
| 30 | 30 |
--disable-static \
|
| 31 | 31 |
--enable-gtk-doc
|
| 32 | 32 |
|
| 33 |
-override_dh_strip:
|
|
| 34 |
- dh_strip --dbgsym-migration='python-caja-dbg (<< 1.14.0-2~)'
|
|
| 35 |
- |
|
| 36 | 33 |
get-orig-source:
|
| 37 | 34 |
uscan --noconf --force-download --rename --download-current-version --destdir=..
|