[Python-modules-commits] r19105 - in packages/django-countries/trunk/debian (5 files)

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

    Date: Sunday, October 30, 2011 @ 15:52:46
  Author: fladi-guest
Revision: 19105

Create symlinks in override_dh_python2.

Modified:
  packages/django-countries/trunk/debian/changelog
  packages/django-countries/trunk/debian/control
  packages/django-countries/trunk/debian/python-django-countries.postinst
  packages/django-countries/trunk/debian/rules
Deleted:
  packages/django-countries/trunk/debian/python-django-countries.links

Modified: packages/django-countries/trunk/debian/changelog
===================================================================
--- packages/django-countries/trunk/debian/changelog	2011-10-30 15:30:55 UTC (rev 19104)
+++ packages/django-countries/trunk/debian/changelog	2011-10-30 15:52:46 UTC (rev 19105)
@@ -10,12 +10,13 @@
   * Add suffix .patch to all patches.
   * Use Django's lazy translation on country names and symlink iso-
     codes translations to django.mo files in our own directory
-    structure.
+    structure (Thanks to Jakub Wilk for his help!).
   * Add lintian override as the locale directory is initially empty and
     populated by postinst.
   * Temporary fix for Metadata-Version in PKG-INFO.
+  * Switch to dh_python2.
 
- -- Fladischer Michael <FladischerMichael at fladi.at>  Sat, 29 Oct 2011 16:21:20 +0200
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Sun, 30 Oct 2011 16:26:23 +0100
 
 django-countries (1.0.5-1) unstable; urgency=low
 

Modified: packages/django-countries/trunk/debian/control
===================================================================
--- packages/django-countries/trunk/debian/control	2011-10-30 15:30:55 UTC (rev 19104)
+++ packages/django-countries/trunk/debian/control	2011-10-30 15:52:46 UTC (rev 19105)
@@ -7,8 +7,7 @@
                iso-codes,
                python-all (>= 2.5),
                python-django,
-               python-setuptools,
-               python-support
+               python-setuptools
 Standards-Version: 3.9.2
 XS-Python-Version: >= 2.5
 Homepage: http://bitbucket.org/smileychris/django-countries/

Deleted: packages/django-countries/trunk/debian/python-django-countries.links
===================================================================
--- packages/django-countries/trunk/debian/python-django-countries.links	2011-10-30 15:30:55 UTC (rev 19104)
+++ packages/django-countries/trunk/debian/python-django-countries.links	2011-10-30 15:52:46 UTC (rev 19105)
@@ -1 +0,0 @@
-/usr/share/python-django-countries/locale /usr/share/pyshared/django_countries/locale

Modified: packages/django-countries/trunk/debian/python-django-countries.postinst
===================================================================
--- packages/django-countries/trunk/debian/python-django-countries.postinst	2011-10-30 15:30:55 UTC (rev 19104)
+++ packages/django-countries/trunk/debian/python-django-countries.postinst	2011-10-30 15:52:46 UTC (rev 19105)
@@ -13,7 +13,7 @@
         mkdir -p ${path}
         # Create the symlink with an absolute target path (iso_3166.mo -> django.mo).
         dest=${path}/django.mo
-        ln -s ${file} ${dest}
+        ln -s ../../../../${file#/usr/share/} ${dest}
     done
 }
 

Modified: packages/django-countries/trunk/debian/rules
===================================================================
--- packages/django-countries/trunk/debian/rules	2011-10-30 15:30:55 UTC (rev 19104)
+++ packages/django-countries/trunk/debian/rules	2011-10-30 15:52:46 UTC (rev 19105)
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh  $@
+	dh --with python2 $@
 
 .PHONY: override_dh_auto_test
 override_dh_auto_test:
@@ -21,6 +21,14 @@
 	rm -rf testproject
 endif
 
+.PHONY: override_dh_python2
+override_dh_python2:
+	set -e; \
+	for python in $(shell pyversions -r); do \
+	  ln -s /usr/share/python-django-countries/locale debian/python-django-countries/usr/lib/$$python/*-packages/django_countries/; \
+	done
+	dh_python2
+
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
 	dh_auto_install