Merge lp:~logan/ubuntu/raring/python-adodb/debian-merge into lp:ubuntu/raring/python-adodb

[Logan Rosen]

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-14 13:43:59 +0000
+++ debian/changelog	2012-11-17 22:33:20 +0000
@@ -1,3 +1,21 @@
+python-adodb (2.10-1.1ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/control: also conflict/replace python2.4-adodb
+
+ -- Logan Rosen <[e-mail]>  Sat, 17 Nov 2012 17:26:59 -0500
+
+python-adodb (2.10-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "broken binary-indep target": fix binary-arch / binary-indep targets
+    in debian/rules; patch from Evgeni Golov, thanks. (Closes: #684024)
+  * Fix python-support handling in debian/rules in order not to install
+    python-bytecode (ftp-master auto-reject reason); patch from Jakub Wilk,
+    thanks.
+
+ -- gregor herrmann <[e-mail]>  Wed, 22 Aug 2012 18:03:56 +0200
+
 python-adodb (2.10-1ubuntu2) precise; urgency=low
 
   * Rebuild to drop python2.6 dependencies and provides.

=== modified file 'debian/rules'
--- debian/rules	2008-07-30 16:06:16 +0000
+++ debian/rules	2012-11-17 22:33:20 +0000
@@ -9,8 +9,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PY_SUPPORT_DIR=$(CURDIR)/debian/python-adodb/usr/share/python-support/
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -39,18 +37,15 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/python-adodb.
-	install -d $(PY_SUPPORT_DIR)/python-adodb
 	python setup.py install \
-		--prefix=$(CURDIR)/debian/python-adodb/usr/ \
-		--install-lib=$(PY_SUPPORT_DIR)/python-adodb
+		--root=$(CURDIR)/debian/python-adodb/
 
+# Build architecture-dependent files here.
+binary-arch: build install
+# We have nothing to do.
 
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs