Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package python-caja This upload fixes an RC bug (#766879). The previously uploaded version broke external caja extensions written in Python completely. This is actually (IMHO) related to a broken python2.pc file in libpython2.7-dev (filed as #770935) which this upload works around for now. We also fixed a package build issue for the GTK documentation of this package (#770927). The provided patch has also been upstreamed by now. Futhermore, this upload fixes a typo in python-caja-dbg's LONG_DESCRIPTION (wrong paragraph separator, #768819, #768820). One changelog item states that three lintian overrides got added, but obviously, the last upload already had that python-caja.overrides file, but it did not end up in the packaging Git. I apologize for that extra/unnecessary noise in debian/changelog. unblock python-caja/1.8.1-2 -- System Information: Debian Release: jessie/sid APT prefers stable APT policy: (990, 'stable'), (500, 'testing-updates'), (500, 'testing-proposed-updates'), (500, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru python-caja-1.8.1/debian/changelog python-caja-1.8.1/debian/changelog --- python-caja-1.8.1/debian/changelog 2014-10-24 22:59:22.000000000 +0200 +++ python-caja-1.8.1/debian/changelog 2014-11-25 14:59:43.000000000 +0100 @@ -1,3 +1,20 @@ +python-caja (1.8.1-2) unstable; urgency=medium + + [ Vangelis Mouhtsis ] + * debian/control: + + Fix typo in python-caja-dbg LONG_DESCRIPTION. (Closes: #768819, #768820). + + [ 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). + * lintian: + + Add overrides for debhelper's erroneously triggered makeshlibs script. + + -- Mike Gabriel <sunwea...@debian.org> Tue, 25 Nov 2014 14:51:43 +0100 + python-caja (1.8.1-1) unstable; urgency=medium [ Vangelis Mouhtsis ] diff -Nru python-caja-1.8.1/debian/control python-caja-1.8.1/debian/control --- python-caja-1.8.1/debian/control 2014-10-24 21:31:03.000000000 +0200 +++ python-caja-1.8.1/debian/control 2014-11-25 09:42:31.000000000 +0100 @@ -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.1/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.1/debian/patches/1002_dont-install-xsl-files.patch 1970-01-01 01:00:00.000000000 +0100 +++ python-caja-1.8.1/debian/patches/1002_dont-install-xsl-files.patch 2014-11-25 11:27:24.000000000 +0100 @@ -0,0 +1,15 @@ +Description: Don't try installing docbook source files into GTK documentation +Author: Mike Gabriel <mike.gabr...@das-netzwerkteam.de> +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.1/debian/patches/2001_debian-python-multiarch.patch python-caja-1.8.1/debian/patches/2001_debian-python-multiarch.patch --- python-caja-1.8.1/debian/patches/2001_debian-python-multiarch.patch 1970-01-01 01:00:00.000000000 +0100 +++ python-caja-1.8.1/debian/patches/2001_debian-python-multiarch.patch 2014-11-25 11:57:09.000000000 +0100 @@ -0,0 +1,20 @@ +Description: python2.pc in Debian jessie does not provide the correct (multi-arch) libdir path +Author: Mike Gabriel <mike.gabr...@das-netzwerkteam.de> +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.1/debian/patches/series python-caja-1.8.1/debian/patches/series --- python-caja-1.8.1/debian/patches/series 2014-10-24 22:50:22.000000000 +0200 +++ python-caja-1.8.1/debian/patches/series 2014-11-25 11:26:48.000000000 +0100 @@ -1 +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.1/debian/python-caja.lintian-overrides python-caja-1.8.1/debian/python-caja.lintian-overrides --- python-caja-1.8.1/debian/python-caja.lintian-overrides 2014-04-25 09:49:33.000000000 +0200 +++ python-caja-1.8.1/debian/python-caja.lintian-overrides 2014-11-25 14:57:24.000000000 +0100 @@ -1,4 +1,4 @@ -# caja extension in /usr/lib/*/caja/extensions-2.0/ erroneously trigger +# caja extensions 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
