diff -Nru python-caja-1.8.0/configure.ac python-caja-1.8.1/configure.ac --- python-caja-1.8.0/configure.ac 2014-03-01 14:35:24.000000000 +0000 +++ python-caja-1.8.1/configure.ac 2014-09-28 20:04:27.000000000 +0000 @@ -1,4 +1,4 @@ -AC_INIT([python-caja], [1.8.0], +AC_INIT([python-caja], [1.8.1], [https://github.com/mate-desktop/python-caja/issues], [python-caja], [http://mate-desktop.org]) @@ -30,8 +30,12 @@ dnl ************************************************** dnl * Check for Python dnl ************************************************** -AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR([could not find Python headers])]) -AM_CHECK_PYTHON_LIBS(,[AC_MSG_ERROR([could not find Python lib])]) +AM_PATH_PYTHON([2.7]) +PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}]) +PYTHON_LIB_LOC="`pkg-config python-${PYTHON_VERSION} --variable=libdir`" +AC_SUBST(PYTHON_LIBS) +AC_SUBST(PYTHON_CFLAGS) +AC_SUBST(PYTHON_LIB_LOC) if test "`pkg-config --variable=datadir pygobject-3.0`" != "" ; then PYGOBJECT_VERSION=pygobject-3.0 diff -Nru python-caja-1.8.0/debian/changelog python-caja-1.8.1/debian/changelog --- python-caja-1.8.0/debian/changelog 2014-08-22 11:20:10.000000000 +0000 +++ python-caja-1.8.1/debian/changelog 2014-11-25 22:17:41.000000000 +0000 @@ -1,9 +1,36 @@ -python-caja (1.8.0-1~ppa1~precise1) precise; urgency=low +python-caja (1.8.1-2~precise3) precise; urgency=medium - * Back ported from http://ftp.de.debian.org/debian/pool/main/p/python- - caja/python-caja_1.8.0-1.dsc + [ Vangelis Mouhtsis ] + * debian/control: + + Fix typo in python-caja-dbg LONG_DESCRIPTION. (Closes: #768819, #768820). - -- Martin Wimpress Fri, 22 Aug 2014 12:20:10 +0100 + [ Mike Gabriel ] + * debian/patches: + + Add 1002_dont-install-xsl-files.patch. Stop attempting to install XSL + docbook source files into bin:package. (Closes: #770927). + + Add 2001_debian-python-multiarch.patch. Enforce usage of multiarch path + for PY_LIB_LOC. (Closes: 766879, LP: #1170017). + + -- Vangelis Mouhtsis Tue, 25 Nov 2014 09:42:56 +0100 + +python-caja (1.8.1-1) unstable; urgency=medium + + [ Vangelis Mouhtsis ] + * debian/rules: + + Replace on dh_install --list-missing -> --fail-missing + * debian/control: + + Bump Standards: to 3.9.6. No changes needed. + + [ Mike Gabriel ] + * New upstream release. + - Detect Python variables via pkg-config. (LP: #1170017). + * debian/patches: + + Add 1001_multi-arch-libdir-in-pkgconfig.patch. Put multi-arch linker + path in caja-python.pc. + * debian/rules: + + Provide an empty caja-python/extensions folder (with .placeholder file). + + -- Mike Gabriel Fri, 24 Oct 2014 22:30:57 +0200 python-caja (1.8.0-1) unstable; urgency=low diff -Nru python-caja-1.8.0/debian/control python-caja-1.8.1/debian/control --- python-caja-1.8.0/debian/control 2014-04-25 07:58:07.000000000 +0000 +++ python-caja-1.8.1/debian/control 2014-11-25 11:37:27.000000000 +0000 @@ -13,7 +13,7 @@ python-dev, python-gobject-dev, quilt, -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: http://www.mate-desktop.org/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-mate/python-caja.git;a=summary Vcs-Git: git://anonscm.debian.org/pkg-mate/python-caja.git @@ -47,7 +47,7 @@ . The Python binding for Caja allows one to write Caja property page and menu item extensions in Python. - , + . This package contains debugging symbols for python-caja. . The debugging symbols are installed in /usr/lib/debug and will diff -Nru python-caja-1.8.0/debian/copyright python-caja-1.8.1/debian/copyright --- python-caja-1.8.0/debian/copyright 2014-04-25 07:45:19.000000000 +0000 +++ python-caja-1.8.1/debian/copyright 2014-11-25 11:37:27.000000000 +0000 @@ -26,6 +26,51 @@ Copyright: 2003-2004, Novell, Inc. License: GPL-2+ +Files: AUTHORS + COPYING + ChangeLog + Makefile.am + NEWS + NEWS.GNOME + README + caja-python.pc.in + configure.ac + docs/Makefile.am + docs/reference/caja-python-class-reference.xml + docs/reference/caja-python-column-provider.xml + docs/reference/caja-python-column.xml + docs/reference/caja-python-enum-reference.xml + docs/reference/caja-python-file-info.xml + docs/reference/caja-python-info-provider.xml + docs/reference/caja-python-location-widget-provider.xml + docs/reference/caja-python-menu-item.xml + docs/reference/caja-python-menu-provider.xml + docs/reference/caja-python-menu.xml + docs/reference/caja-python-operation-result.xml + docs/reference/caja-python-overview-example.xml + docs/reference/caja-python-overview-methods.xml + docs/reference/caja-python-overview.xml + docs/reference/caja-python-property-page-provider.xml + docs/reference/caja-python-property-page.xml + docs/reference/caja-python-provider-reference.xml + docs/reference/caja-python-ref.xml + docs/reference/entities.docbook.in + docs/xsl/common.xsl + docs/xsl/devhelp.xsl + docs/xsl/fixxref.py + docs/xsl/html.xsl + docs/xsl/pdf-style.xsl + docs/xsl/pdf.xsl + docs/xsl/ref-html-style.xsl + docs/xsl/style.css + examples/Makefile.am + examples/README + src/Makefile.am +Copyright: *No copyright* +License: GPL-2+ +Comment: + Using license from COPYING file. + Files: debian/* Copyright: 2011-2014, Stefano Karapetsas 2014, Mike Gabriel diff -Nru python-caja-1.8.0/debian/patches/1001_multi-arch-libdir-in-pkgconfig.patch python-caja-1.8.1/debian/patches/1001_multi-arch-libdir-in-pkgconfig.patch --- python-caja-1.8.0/debian/patches/1001_multi-arch-libdir-in-pkgconfig.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-caja-1.8.1/debian/patches/1001_multi-arch-libdir-in-pkgconfig.patch 2014-11-25 11:37:27.000000000 +0000 @@ -0,0 +1,14 @@ +Description: Set multi-arch library path in ${libdir} +Author: Mike Gabriel + +--- a/caja-python.pc.in ++++ b/caja-python.pc.in +@@ -3,6 +3,6 @@ + Version: @VERSION@ + + prefix=@prefix@ +-datarootdir = @datarootdir@ +-libdir=${prefix}/lib ++datarootdir=@datarootdir@ ++libdir=@libdir@ + pythondir=@datadir@/caja-python/extensions diff -Nru python-caja-1.8.0/debian/patches/1002_dont-install-xsl-files.patch python-caja-1.8.1/debian/patches/1002_dont-install-xsl-files.patch --- python-caja-1.8.0/debian/patches/1002_dont-install-xsl-files.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-caja-1.8.1/debian/patches/1002_dont-install-xsl-files.patch 2014-11-25 11:37:27.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Don't try installing docbook source files into GTK documentation +Author: Mike Gabriel +Forwarded: https://github.com/mate-desktop/python-caja/issues/18 + +--- a/docs/Makefile.am ++++ b/docs/Makefile.am +@@ -57,8 +57,6 @@ + xsl/pdf-style.xsl \ + xsl/pdf.xsl \ + xsl/style.css +-XSL_DATA = $(XSL_FILES) $(FIXXREF) +-XSLdir = $(BUILDDIR)/xsl + + CSS_FILES = xsl/style.css + CSSdir = $(HTMLdir) diff -Nru python-caja-1.8.0/debian/patches/2001_debian-python-multiarch.patch python-caja-1.8.1/debian/patches/2001_debian-python-multiarch.patch --- python-caja-1.8.0/debian/patches/2001_debian-python-multiarch.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-caja-1.8.1/debian/patches/2001_debian-python-multiarch.patch 2014-11-25 11:37:27.000000000 +0000 @@ -0,0 +1,20 @@ +Description: python2.pc in Debian jessie does not provide the correct (multi-arch) libdir path +Author: Mike Gabriel +Abstract: + This works around Debian bug #770935. This package should stay intact + once that bug gets fixed. However, once that bug is fixed, this patch + should be dropped. + +--- a/configure.ac ++++ b/configure.ac +@@ -33,6 +33,10 @@ + AM_PATH_PYTHON([2.7]) + PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}]) + PYTHON_LIB_LOC="`pkg-config python-${PYTHON_VERSION} --variable=libdir`" ++# nasty workaround Debian bug #770935!!! ++if ! test -r "${PYTHON_LIB_LOC}/libpython${PYTHON_VERSION}.so"; then ++ PYTHON_LIB_LOC="`pkg-config python-${PYTHON_VERSION} --variable=libdir`/`dpkg-architecture -qDEB_BUILD_MULTIARCH`" ++fi + AC_SUBST(PYTHON_LIBS) + AC_SUBST(PYTHON_CFLAGS) + AC_SUBST(PYTHON_LIB_LOC) diff -Nru python-caja-1.8.0/debian/patches/series python-caja-1.8.1/debian/patches/series --- python-caja-1.8.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ python-caja-1.8.1/debian/patches/series 2014-11-25 11:37:27.000000000 +0000 @@ -0,0 +1,3 @@ +1001_multi-arch-libdir-in-pkgconfig.patch +1002_dont-install-xsl-files.patch +2001_debian-python-multiarch.patch diff -Nru python-caja-1.8.0/debian/python-caja.install python-caja-1.8.1/debian/python-caja.install --- python-caja-1.8.0/debian/python-caja.install 2014-04-25 07:08:20.000000000 +0000 +++ python-caja-1.8.1/debian/python-caja.install 2014-11-25 11:37:27.000000000 +0000 @@ -1,4 +1,5 @@ usr/share/doc/ +usr/share/caja-python/ usr/share/gtk-doc/html/ usr/lib/*/caja/extensions-2.0/libcaja-python.so usr/lib/*/pkgconfig/caja-python.pc diff -Nru python-caja-1.8.0/debian/python-caja.lintian-overrides python-caja-1.8.1/debian/python-caja.lintian-overrides --- python-caja-1.8.0/debian/python-caja.lintian-overrides 2014-04-25 07:49:33.000000000 +0000 +++ python-caja-1.8.1/debian/python-caja.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -# caja extension in /usr/lib/*/caja/extensions-2.0/ erroneously trigger -# debhelper's makeshlibs script -python-caja: pkg-has-shlibs-control-file-but-no-actual-shared-libs -python-caja: postinst-has-useless-call-to-ldconfig -python-caja: postrm-has-useless-call-to-ldconfig diff -Nru python-caja-1.8.0/debian/rules python-caja-1.8.1/debian/rules --- python-caja-1.8.0/debian/rules 2014-04-25 07:57:50.000000000 +0000 +++ python-caja-1.8.1/debian/rules 2014-11-25 11:37:27.000000000 +0000 @@ -8,7 +8,12 @@ override_dh_install: rm -rfv debian/tmp/usr/lib/*/caja-python/caja.la rm -rfv debian/tmp/usr/lib/*/caja/extensions-2.0/libcaja-python.la - dh_install --list-missing + mkdir -p debian/tmp/usr/share/caja-python/extensions + touch debian/tmp/usr/share/caja-python/extensions/.placeholder + dh_install --fail-missing + +override_dh_installchangelogs: + dh_installchangelogs NEWS override_dh_auto_configure: # upstream tarball is without configure. autogen.sh will create it diff -Nru python-caja-1.8.0/m4/python.m4 python-caja-1.8.1/m4/python.m4 --- python-caja-1.8.0/m4/python.m4 2014-03-01 14:35:24.000000000 +0000 +++ python-caja-1.8.1/m4/python.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ -## this one is commonly used with AM_PATH_PYTHONDIR ... -dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) -dnl Check if a module containing a given symbol is visible to python. -AC_DEFUN([AM_CHECK_PYMOD], -[AC_REQUIRE([AM_PATH_PYTHON]) -py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` -AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) -AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ -ifelse([$2],[], [prog=" -import sys -try: - import $1 -except ImportError: - sys.exit(1) -except: - sys.exit(0) -sys.exit(0)"], [prog=" -import $1 -$1.$2"]) -if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC - then - eval "py_cv_mod_$py_mod_var=yes" - else - eval "py_cv_mod_$py_mod_var=no" - fi -]) -py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` -if test "x$py_val" != xno; then - AC_MSG_RESULT(yes) - ifelse([$3], [],, [$3 -])dnl -else - AC_MSG_RESULT(no) - ifelse([$4], [],, [$4 -])dnl -fi -]) - -dnl a macro to check for ability to create python extensions -dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) -dnl function also defines PYTHON_INCLUDES -AC_DEFUN([AM_CHECK_PYTHON_HEADERS], -[AC_REQUIRE([AM_PATH_PYTHON]) -AC_MSG_CHECKING(for headers required to compile python extensions) -dnl deduce PYTHON_INCLUDES -py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"` -py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"` -PYTHON_INCLUDES=`python-config --includes` -if test "$py_prefix" != "$py_exec_prefix"; then - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" -fi -AC_SUBST(PYTHON_INCLUDES) -dnl check if the headers exist: -save_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" -AC_TRY_CPP([#include ],dnl -[AC_MSG_RESULT(found) -$1],dnl -[AC_MSG_RESULT(not found) -$2]) -CPPFLAGS="$save_CPPFLAGS" -]) - -# The AC_MULTILIB macro was extracted and modified from -# gettext-0.15's AC_LIB_PREPARE_MULTILIB macro in the lib-prefix.m4 file -# so that the correct paths can be used for 64-bit libraries. -# -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl From Bruno Haible. - -dnl AC_MULTILIB creates a variable libdirsuffix, containing -dnl the suffix of the libdir, either "" or "64". -dnl Only do this if the given enable parameter is "yes". -AC_DEFUN([AC_MULTILIB], -[ - dnl There is no formal standard regarding lib and lib64. The current - dnl practice is that on a system supporting 32-bit and 64-bit instruction - dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit - dnl libraries go under $prefix/lib. We determine the compiler's default - dnl mode by looking at the compiler's library search path. If at least - dnl of its elements ends in /lib64 or points to a directory whose absolute - dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the - dnl default, namely "lib". - enable_lib64="$1" - libdirsuffix="/i386-linux-gnu/" - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test "$enable_lib64" = "yes" -a -n "$searchpath"; then - save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) libdirsuffix=64 ;; - /lib/x86_64-linux-gnu/ | /lib/x86_64-linux-gnu ) libdirsuffix=/x86_64-linux-gnu ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) libdirsuffix=64 ;; - /lib/x86_64-linux-gnu ) libdirsuffix=/x86_64-linux-gnu ;; - esac ;; - esac - fi - done - IFS="$save_IFS" - fi - AC_SUBST(libdirsuffix) -]) - -dnl a macro to check for ability to embed python -dnl AM_CHECK_PYTHON_LIBS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) -dnl function also defines PYTHON_LIBS -AC_DEFUN([AM_CHECK_PYTHON_LIBS], -[AC_REQUIRE([AM_CHECK_PYTHON_HEADERS]) -AC_MSG_CHECKING(for libraries required to embed python) -dnl deduce PYTHON_LIBS -py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"` -AC_MULTILIB(yes) - -if test "x$PYTHON_LIBS" = x; then - PYTHON_LIBS="-L${py_prefix}/lib${libdirsuffix} -lpython${PYTHON_VERSION}" -fi - -if test "x$PYTHON_LIB_LOC" = x; then - PYTHON_LIB_LOC="${py_prefix}/lib${libdirsuffix}" -fi -AC_SUBST(PYTHON_LIBS) -AC_SUBST(PYTHON_LIB_LOC) -dnl check if the headers exist: -save_LIBS="$LIBS" -LIBS="$LIBS $PYTHON_LIBS" -AC_TRY_LINK_FUNC(Py_Initialize, dnl - [LIBS="$save_LIBS"; AC_MSG_RESULT(yes); $1], dnl - [LIBS="$save_LIBS"; AC_MSG_RESULT(no); $2]) - -]) diff -Nru python-caja-1.8.0/NEWS python-caja-1.8.1/NEWS --- python-caja-1.8.0/NEWS 2014-03-01 14:35:24.000000000 +0000 +++ python-caja-1.8.1/NEWS 2014-09-28 20:04:27.000000000 +0000 @@ -1,3 +1,7 @@ +1.8.1 Bugfix release + + * Use pkg-config for python detection and variables + 1.8.0 * Bugfixes diff -Nru python-caja-1.8.0/src/Makefile.am python-caja-1.8.1/src/Makefile.am --- python-caja-1.8.0/src/Makefile.am 2014-03-01 14:35:24.000000000 +0000 +++ python-caja-1.8.1/src/Makefile.am 2014-09-28 20:04:27.000000000 +0000 @@ -16,12 +16,13 @@ -DLIBDIR=\"$(libdir)\" \ -DPYTHON_VERSION=\"$(PYTHON_VERSION)\" \ -DPY_LIB_LOC="\"$(PYTHON_LIB_LOC)\"" \ - $(PYTHON_INCLUDES) \ + $(CAJA_PYTHON_CFLAGS) \ $(AM_CPPFLAGS) libcaja_python_la_CFLAGS = \ + $(PYTHON_CFLAGS) $(CAJA_PYTHON_CFLAGS) \ $(AM_CFLAGS) libcaja_python_la_LDFLAGS = -module -avoid-version -libcaja_python_la_LIBADD = $(CAJA_PYTHON_LIBS) $(PYTHON_LIBS) +libcaja_python_la_LIBADD = $(PYTHON_LIBS) $(CAJA_PYTHON_LIBS)