[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#609410: unblock: pyxpcom/1:0.0~hg20100212-5



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package pyxpcom

This release finally fixes all known install/upgrade issues. The changelog
boils down to this:

  * debian/control: Conflicts with xulrunner-1.9.1 <= 1.9.1.11-1.
    Closes: #596459.
  * debian/prerm.in, debian/postinst.in, debian/install.in: Install
    libpyloader.so in /usr/lib/python-xpcom and create a symbolic link
    in xulrunner components directory so that component registration
    (which we need to trigger by hand) always work. Closes: #582071.

This is the -4 changelog, but the -5 release "only" fixes the changes from -4
so its changelog is largely irrelevant.

debdiff attached.

unblock pyxpcom/1:0.0~hg20100212-5

-- System Information:
Debian Release: 6.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u pyxpcom-0.0~hg20100212/debian/install.in pyxpcom-0.0~hg20100212/debian/install.in
--- pyxpcom-0.0~hg20100212/debian/install.in
+++ pyxpcom-0.0~hg20100212/debian/install.in
@@ -1,5 +1,5 @@
 builddir/dist/bin/libpyxpcom.so ##XREDIR##
-builddir/dist/bin/components/libpyloader.so ##XREDIR##/components
+builddir/dist/bin/components/libpyloader.so usr/lib/python-xpcom
 builddir/dist/bin/components/pyabout.py ##XREDIR##/components
 builddir/dist/bin/python/* usr/lib/##PYVER##/site-packages
 builddir/dist/include/PyXPCOM.h ##INCDIR##
diff -u pyxpcom-0.0~hg20100212/debian/changelog pyxpcom-0.0~hg20100212/debian/changelog
--- pyxpcom-0.0~hg20100212/debian/changelog
+++ pyxpcom-0.0~hg20100212/debian/changelog
@@ -1,3 +1,21 @@
+pyxpcom (1:0.0~hg20100212-5) unstable; urgency=low
+
+  * debian/postinst.in: Fix symbolic link destination, and fix the way
+    it is created.
+
+ -- Mike Hommey <glandium@debian.org>  Sat, 08 Jan 2011 11:04:50 +0100
+
+pyxpcom (1:0.0~hg20100212-4) unstable; urgency=low
+
+  * debian/control: Conflicts with xulrunner-1.9.1 <= 1.9.1.11-1.
+    Closes: #596459.
+  * debian/prerm.in, debian/postinst.in, debian/install.in: Install
+    libpyloader.so in /usr/lib/python-xpcom and create a symbolic link
+    in xulrunner components directory so that component registration
+    (which we need to trigger by hand) always work. Closes: #582071.
+
+ -- Mike Hommey <glandium@debian.org>  Fri, 07 Jan 2011 14:40:06 +0100
+
 pyxpcom (1:0.0~hg20100212-3) unstable; urgency=low
 
   * debian/control: Replace Pre-Depends with plain dependency for xulrunner.
reverted:
--- pyxpcom-0.0~hg20100212/debian/postinst
+++ pyxpcom-0.0~hg20100212.orig/debian/postinst
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# xulrunner trigger needs that to happen before running
-if [ "$1" = "configure" ]; then
-	update-python-modules -p
-fi
-
-#DEBHELPER#
diff -u pyxpcom-0.0~hg20100212/debian/control pyxpcom-0.0~hg20100212/debian/control
--- pyxpcom-0.0~hg20100212/debian/control
+++ pyxpcom-0.0~hg20100212/debian/control
@@ -21,6 +21,7 @@
          ${python:Depends},
          ${xulrunner:Depends}
 Breaks: epiphany-gecko (<< 2.28)
+Conflicts: xulrunner-1.9.1 (<= 1.9.1.11-1)
 XB-Python-Version: ${python:Versions}
 Description: XPCOM bindings for Python
  PyXPCOM allows for communication between Python and XPCOM, such that a
diff -u pyxpcom-0.0~hg20100212/debian/prerm.in pyxpcom-0.0~hg20100212/debian/prerm.in
--- pyxpcom-0.0~hg20100212/debian/prerm.in
+++ pyxpcom-0.0~hg20100212/debian/prerm.in
@@ -3,7 +3,8 @@
 set -e
 
 if [ "$1" = "remove" ]; then
-    rm -f ##XREDIR##/components/pyabout.pyo
+    rm -f ##XREDIR##/components/pyabout.pyo \
+          ##XREDIR##/components/libpyloader.so
 fi
 
 #DEBHELPER#
only in patch2:
unchanged:
--- pyxpcom-0.0~hg20100212.orig/debian/postinst.in
+++ pyxpcom-0.0~hg20100212/debian/postinst.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+    ln -snf ../../python-xpcom/libpyloader.so ##XREDIR##/components/libpyloader.so
+    dpkg-trigger ##XREDIR##/components
+fi
+
+#DEBHELPER#

Reply to: