[Python-modules-commits] r9213 - in packages/inotifyx/trunk/debian (changelog control rules)

[rrs-guest at users.alioth.debian.org]

    Date: Thursday, July 30, 2009 @ 08:56:45
  Author: rrs-guest
Revision: 9213

Merge branch 'master' into local-svn/trunk

Conflicts:
	debian/changelog
	debian/control
	debian/rules

Modified:
  packages/inotifyx/trunk/debian/changelog
  packages/inotifyx/trunk/debian/control
  packages/inotifyx/trunk/debian/rules

Modified: packages/inotifyx/trunk/debian/changelog
===================================================================
--- packages/inotifyx/trunk/debian/changelog	2009-07-29 19:41:15 UTC (rev 9212)
+++ packages/inotifyx/trunk/debian/changelog	2009-07-30 08:56:45 UTC (rev 9213)
@@ -1,3 +1,17 @@
+inotifyx (0.1.0-2) unstable; urgency=low
+
+  * debian/rules
+    - Separate the build and install target. Earlier we were directly
+    building and installing in the install target which led to build
+    failure on the s390 arch which called the build target.
+    (Closes: #539151)
+  * debian/control
+    - Switch Version Control from git to subversion to better align with
+    the Python packaging team
+  * Update Standards-Version to 3.8.2 (No changes required)
+
+ -- Ritesh Raj Sarraf <rrs at researchut.com>  Thu, 30 Jul 2009 14:08:02 +0530
+
 inotifyx (0.1.0-1) unstable; urgency=low
 
   * Initial release (Closes: #527205)

Modified: packages/inotifyx/trunk/debian/control
===================================================================
--- packages/inotifyx/trunk/debian/control	2009-07-29 19:41:15 UTC (rev 9212)
+++ packages/inotifyx/trunk/debian/control	2009-07-30 08:56:45 UTC (rev 9213)
@@ -5,9 +5,9 @@
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7), python-dev, python-epydoc, python-support
 XS-Python-Version: all
-Standards-Version: 3.8.1
-Vcs-Git: git://git.debian.org/collab-maint/inotifyx.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/inotifyx.git
+Standards-Version: 3.8.2
+Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/inotifyx/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/inotifyx/trunk/?op=log
 Homepage: http://www.alittletooquiet.net/software/inotifyx/
 
 Package: python-inotifyx

Modified: packages/inotifyx/trunk/debian/rules
===================================================================
--- packages/inotifyx/trunk/debian/rules	2009-07-29 19:41:15 UTC (rev 9212)
+++ packages/inotifyx/trunk/debian/rules	2009-07-30 08:56:45 UTC (rev 9213)
@@ -11,6 +11,9 @@
 	@ls -l $(UPSTR_FILE)
 
 build:
+	dh_testdir
+	python setup.py build
+	touch $@
 
 clean: 
 	dh_testdir
@@ -23,6 +26,7 @@
 install: build
 	dh_testdir
 	dh_testroot
+	dh_clean -k
 	dh_prep  
 	dh_installdirs
 
@@ -46,7 +50,7 @@
 		dh_md5sums
 		dh_builddeb
 
-binary-arch:
+binary-arch: build install
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install get-orig-source