[Python-apps-commits] r2455 - in packages/mercurial (6 files)

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

    Date: Saturday, February 21, 2009 @ 09:47:27
  Author: vt-guest
Revision: 2455

Fix mercurial FTBFS with python-support 0.90 properly (closes: #516269)

Modified:
  packages/mercurial/branches/lenny/debian/changelog
  packages/mercurial/branches/lenny/debian/control
  packages/mercurial/branches/lenny/debian/rules
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/control
  packages/mercurial/trunk/debian/rules

Modified: packages/mercurial/branches/lenny/debian/changelog
===================================================================
--- packages/mercurial/branches/lenny/debian/changelog	2009-02-21 08:37:59 UTC (rev 2454)
+++ packages/mercurial/branches/lenny/debian/changelog	2009-02-21 09:47:27 UTC (rev 2455)
@@ -1,3 +1,10 @@
+mercurial (1.0.1-6) UNRELEASED; urgency=low
+
+  * Fix FTBFS with python-support 0.90 by removing dependence on
+    python-support internals. (closes: #516269)
+
+ -- Vernon Tang <vt at foilhead.net>  Sat, 21 Feb 2009 17:22:07 +0800
+
 mercurial (1.0.1-5.1) unstable; urgency=high
 
   * Non-maintainer upload by the Security Team.

Modified: packages/mercurial/branches/lenny/debian/control
===================================================================
--- packages/mercurial/branches/lenny/debian/control	2009-02-21 08:37:59 UTC (rev 2454)
+++ packages/mercurial/branches/lenny/debian/control	2009-02-21 09:47:27 UTC (rev 2455)
@@ -4,7 +4,8 @@
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Vincent Danjean <vdanjean at debian.org>, Gerardo Curiel <gcuriel at debian.org.ve>
 Build-Depends: debhelper (>= 5.0.37.2), quilt, patchutils (>= 0.2.25), 
- cdbs (>= 0.4.27), python-support (>= 0.5.3), python-all-dev, xmlto, asciidoc
+ cdbs (>= 0.4.27), python-support (>= 0.5.3), python-all-dev, xmlto, asciidoc,
+ findutils
 Standards-Version: 3.8.0
 Homepage: http://www.selenic.com/mercurial/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/mercurial/trunk

Modified: packages/mercurial/branches/lenny/debian/rules
===================================================================
--- packages/mercurial/branches/lenny/debian/rules	2009-02-21 08:37:59 UTC (rev 2454)
+++ packages/mercurial/branches/lenny/debian/rules	2009-02-21 09:47:27 UTC (rev 2455)
@@ -8,15 +8,16 @@
 # These part must be run between dh_install and dh_pysupport
 # So, they must be defined BEFORE including python-distutils.mk
 binary-install/mercurial::
-	pysupport-movemodules debian/mercurial
 	# remove arch-independent python stuff
-	rm -rf $(CURDIR)/debian/mercurial/usr/share/python-support
+	find debian/mercurial/usr/lib \
+		! -name '*.so' ! -type d -delete , \
+		-type d -empty -delete
 
 binary-install/mercurial-common::
-	pysupport-movemodules debian/mercurial-common
 	# remove arch-dependent python stuff
-	rm -rf $(CURDIR)/debian/mercurial-common/usr/lib/python-support
-	rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/mercurial-common/usr/lib
+	find debian/mercurial-common/usr/lib \
+		-name '*.so' ! -type d -delete , \
+		-type d -empty -delete
 
 include /usr/share/cdbs/1/class/python-distutils.mk
 

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2009-02-21 08:37:59 UTC (rev 2454)
+++ packages/mercurial/trunk/debian/changelog	2009-02-21 09:47:27 UTC (rev 2455)
@@ -1,8 +1,9 @@
 mercurial (1.1.2+hg20090217-7787-b8d750daadde-2) UNRELEASED; urgency=low
 
-  * Fix building with with python-support 0.90
+  * Fix FTBFS with python-support 0.90 by removing dependence on
+    python-support internals. (closes: #516269)
 
- -- Vernon Tang <vt at foilhead.net>  Fri, 20 Feb 2009 15:56:28 +0800
+ -- Vernon Tang <vt at foilhead.net>  Sat, 21 Feb 2009 17:22:07 +0800
 
 mercurial (1.1.2+hg20090217-7787-b8d750daadde-1) experimental; urgency=low
 

Modified: packages/mercurial/trunk/debian/control
===================================================================
--- packages/mercurial/trunk/debian/control	2009-02-21 08:37:59 UTC (rev 2454)
+++ packages/mercurial/trunk/debian/control	2009-02-21 09:47:27 UTC (rev 2455)
@@ -5,7 +5,8 @@
 Uploaders: Vincent Danjean <vdanjean at debian.org>, Gerardo Curiel <gcuriel at debian.org.ve>,
  Vernon Tang <vt at foilhead.net>
 Build-Depends: debhelper (>= 7), quilt, patchutils (>= 0.2.25), gettext,
- cdbs (>= 0.4.27), python-support (>= 0.5.3), python-all-dev, xmlto, asciidoc
+ cdbs (>= 0.4.27), python-support (>= 0.5.3), python-all-dev, xmlto, asciidoc,
+ findutils
 Standards-Version: 3.8.0
 Homepage: http://www.selenic.com/mercurial/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/mercurial/trunk

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2009-02-21 08:37:59 UTC (rev 2454)
+++ packages/mercurial/trunk/debian/rules	2009-02-21 09:47:27 UTC (rev 2455)
@@ -14,17 +14,16 @@
 # These part must be run between dh_install and dh_pysupport
 # So, they must be defined BEFORE including python-distutils.mk
 binary-install/mercurial::
-	pysupport-movemodules debian/mercurial
 	# remove arch-independent python stuff
-	rm -rf $(CURDIR)/debian/mercurial/usr/share/python-support \
-		$(CURDIR)/debian/mercurial/usr/share/pyshared
+	find debian/mercurial/usr/lib \
+		! -name '*.so' ! -type d -delete , \
+		-type d -empty -delete
 
 binary-install/mercurial-common::
-	pysupport-movemodules debian/mercurial-common
 	# remove arch-dependent python stuff
-	rm -rf $(CURDIR)/debian/mercurial-common/usr/lib/python-support \
-		$(CURDIR)/debian/mercurial-common/usr/lib/pyshared
-	rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/mercurial-common/usr/lib
+	find debian/mercurial-common/usr/lib \
+		-name '*.so' ! -type d -delete , \
+		-type d -empty -delete
 
 include /usr/share/cdbs/1/class/python-distutils.mk