Merge lp:~mterry/launchpad-integration/ftbfs-and-override into lp:launchpad-integration

[Michael Terry]

Fix FTBFS on non-i386 and merge Philip Peitsch's branch to allow overriding the status file location (something that quickly wants).

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-15 17:24:29 +0000
+++ debian/changelog	2010-11-16 19:43:31 +0000
@@ -1,3 +1,17 @@
+launchpad-integration (0.1.43) natty; urgency=low
+
+  [ Michael Terry ]
+  * debian/rules:
+    - Fix FTBFS by installing the gtk3 library even on non-i386 builds
+
+  [ Philip Peitsch ]
+  * launchpadintegration/packageinfo.py:
+    - Allow overriding STATUSFILE by specifying LPI_PACKAGE_FILE env var
+  * launchpad-integration.in:
+    - Allow overriding PYTHONPATH for easier testing
+
+ -- Michael Terry <[e-mail]>  Tue, 16 Nov 2010 11:15:33 -0500
+
 launchpad-integration (0.1.42) natty; urgency=low
 
   * debian/liblaunchpad-integration-dev.install: use the correct vapi directory

=== modified file 'debian/rules'
--- debian/rules	2010-11-09 22:59:13 +0000
+++ debian/rules	2010-11-16 19:43:31 +0000
@@ -75,14 +75,13 @@
 	touch stamp-build-pyversions
 stamp-build-gtk3: stamp-configure-gtk3
 	: # build for GTK+ 3.0
-	set -e; \
-	$(MAKE) -C build-gtk3;
+	$(MAKE) -C build-gtk3
 	touch stamp-build-gtk3
 
 binary-predeb/gir%::
 	dh_girepository -p$(cdbs_curpkg)
 
-binary-install/launchpad-integration:: stamp-build-pyversions stamp-build-gtk3
+binary-install/launchpad-integration:: stamp-build-pyversions
 ifneq (,$(strip $(OTHER_VERS)))
 	: # install for other python versions
 	set -e; \
@@ -102,15 +101,12 @@
 	  mv $$i $$(dirname $$i)/$${b}_d.so; \
 	done
 
+	dh_pycentral -plaunchpad-integration
+
+common-install-prehook-arch:: stamp-build-gtk3
 	: # install for GTK+ 3.0
-	set -e; \
 	$(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install
 
-	dh_pycentral -plaunchpad-integration
-
-binary-install/liblaunchpad-integration-3.0-1:: binary-install/launchpad-integration
-binary-install/liblaunchpad-integration-3.0-dev:: binary-install/launchpad-integration
-
 binary-install/python-launchpad-integration:: binary-install/launchpad-integration
 	DH_PYCENTRAL=nomove dh_pycentral -ppython-launchpad-integration
 

=== modified file 'launchpad-integration.in'
--- launchpad-integration.in	2005-07-12 11:07:26 +0000
+++ launchpad-integration.in	2010-11-16 19:43:31 +0000
@@ -6,7 +6,7 @@
 
 exec @PYTHON@ -c "
 import sys
-sys.path.insert(0, '${pkgdatadir}')
+sys.path.append('${pkgdatadir}')
 from launchpadintegration.main import main
 sys.exit(main())
 " ${1+"$@"}

=== modified file 'launchpadintegration/packageinfo.py'
--- launchpadintegration/packageinfo.py	2006-10-26 13:47:28 +0000
+++ launchpadintegration/packageinfo.py	2010-11-16 19:43:31 +0000
@@ -14,7 +14,10 @@
 
 DPKGDIR = '/var/lib/dpkg'
 INFODIR = os.path.join(DPKGDIR, 'info')
-STATUSFILE = os.path.join(DPKGDIR, 'status')
+STATUSFILE = os.environ.get('LPI_PACKAGE_FILE', os.path.join(DPKGDIR, 'status'))
+
+if os.environ.has_key('LPI_PACKAGE_FILE'):
+    print "Using STATUSFILE: %s"%STATUSFILE
 
 class PackageNotFoundError(Exception):
     pass