[Python-modules-commits] r26769 - in packages/django-countries/tags (13 files)

fladi-guest at users.alioth.debian.org fladi-guest at users.alioth.debian.org
Mon Dec 16 12:16:47 UTC 2013


    Date: Monday, December 16, 2013 @ 12:16:46
  Author: fladi-guest
Revision: 26769

[svn-buildpackage] Tagging django-countries 1.5-1

Added:
  packages/django-countries/tags/1.5-1/
  packages/django-countries/tags/1.5-1/debian/changelog
    (from rev 26768, packages/django-countries/trunk/debian/changelog)
  packages/django-countries/tags/1.5-1/debian/control
    (from rev 26574, packages/django-countries/trunk/debian/control)
  packages/django-countries/tags/1.5-1/debian/copyright
    (from rev 26768, packages/django-countries/trunk/debian/copyright)
  packages/django-countries/tags/1.5-1/debian/docs
    (from rev 26572, packages/django-countries/trunk/debian/docs)
  packages/django-countries/tags/1.5-1/debian/python-django-countries.postinst
    (from rev 26768, packages/django-countries/trunk/debian/python-django-countries.postinst)
  packages/django-countries/tags/1.5-1/debian/rules
    (from rev 26768, packages/django-countries/trunk/debian/rules)
Deleted:
  packages/django-countries/tags/1.5-1/debian/changelog
  packages/django-countries/tags/1.5-1/debian/control
  packages/django-countries/tags/1.5-1/debian/copyright
  packages/django-countries/tags/1.5-1/debian/docs
  packages/django-countries/tags/1.5-1/debian/python-django-countries.postinst
  packages/django-countries/tags/1.5-1/debian/rules

Deleted: packages/django-countries/tags/1.5-1/debian/changelog
===================================================================
--- packages/django-countries/trunk/debian/changelog	2013-11-26 19:31:41 UTC (rev 26571)
+++ packages/django-countries/tags/1.5-1/debian/changelog	2013-12-16 12:16:46 UTC (rev 26769)
@@ -1,75 +0,0 @@
-django-countries (1.2-2) UNRELEASED; urgency=low
-
-  * Use canonical URIs for Vcs-* fields.
-
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:00:42 +0200
-
-django-countries (1.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * Fix tests for django (>= 1.4) FTBFS (Closes: #669492).
-
- -- Michael Fladischer <FladischerMichael at fladi.at>  Sat, 21 Apr 2012 22:59:31 +0200
-
-django-countries (1.1.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * Make Metadata-Version fix more generic.
-  * Bump Standards-Version to 3.9.3.
-  * Change order of my name.
-  * Update DEP-5 URL to 1.0.
-  * Update years in d/copyright.
-
- -- Michael Fladischer <FladischerMichael at fladi.at>  Fri, 16 Mar 2012 19:17:19 +0100
-
-django-countries (1.1.1-1) unstable; urgency=low
-
-  * New upstream release.
-  * Prefer PNG icons.
-  * Streamline packaging code with wrap-and-sort.
-  * Update d/copyright.
-  * Bump standards version to 3.9.2.
-  * Update dont_include_flag_icons patch.
-  * Fix patch descriptions to match DEP3.
-  * 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 (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.
-  * Generate COUNTRIES_PLUS by duplicating countries with a comma in
-    their name. The part after the comma is moved to the beginning of the
-    string and the comma is removed.
-  * Sort countries by name using unicodedata.normalize in NFD mode.
-  * Update settings.py to use new DATABASE settings format.
-  * Bump build dependency for python-django to >= 1.2.
-  * Update flag icons path in d/copyright.
-
- -- Fladischer Michael <FladischerMichael at fladi.at>  Sat, 19 Nov 2011 18:14:25 +0100
-
-django-countries (1.0.5-1) unstable; urgency=low
-
-  * New upstream release.
-  * Bump to standards-version 3.9.1.
-  * Update DEP5 format.
-  * Drop debian/pyversions in favour of XS-Python-Version.
-  * Simplify debian/rules by using a predefined settings.py.
-  * Set PMPT as maintainer and myself as uploader.
-
- -- Fladischer Michael <FladischerMichael at fladi.at>  Mon, 07 Feb 2011 13:24:36 +0100
-
-django-countries (1.0.4-1) unstable; urgency=low
-
-  * New upstream release.
-  * Use DEP5 for copyright file.
-  * Update to Debian policy 3.9.0.
-
- -- Fladischer Michael <FladischerMichael at fladi.at>  Wed, 07 Jul 2010 12:38:20 +0200
-
-django-countries (1.0.3-1) unstable; urgency=low
-
-  * Initial release (Closes: #576262)
-
- -- Fladischer Michael <FladischerMichael at fladi.at>  Fri, 23 Apr 2010 14:45:20 +0200

Copied: packages/django-countries/tags/1.5-1/debian/changelog (from rev 26768, packages/django-countries/trunk/debian/changelog)
===================================================================
--- packages/django-countries/tags/1.5-1/debian/changelog	                        (rev 0)
+++ packages/django-countries/tags/1.5-1/debian/changelog	2013-12-16 12:16:46 UTC (rev 26769)
@@ -0,0 +1,86 @@
+django-countries (1.5-1) unstable; urgency=low
+
+  [ Jakub Wilk ]
+  * Use canonical URIs for Vcs-* fields.
+
+  [ Michael Fladischer ]
+  * New upstream release.
+  * Bump Standards version to 3.9.5.
+  * README now installs as README.rst.
+  * Make Build-Depends on python-all and python-django unversioned as no
+    prior versions are available in Wheezy.
+  * Drop temporary fix for Metadata-Version in PKG-INFO.
+  * Rename MIT license to Expat.
+  * Update years in d/copyright.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Mon, 16 Dec 2013 13:10:35 +0100
+
+django-countries (1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fix tests for django (>= 1.4) FTBFS (Closes: #669492).
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Sat, 21 Apr 2012 22:59:31 +0200
+
+django-countries (1.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Make Metadata-Version fix more generic.
+  * Bump Standards-Version to 3.9.3.
+  * Change order of my name.
+  * Update DEP-5 URL to 1.0.
+  * Update years in d/copyright.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Fri, 16 Mar 2012 19:17:19 +0100
+
+django-countries (1.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Prefer PNG icons.
+  * Streamline packaging code with wrap-and-sort.
+  * Update d/copyright.
+  * Bump standards version to 3.9.2.
+  * Update dont_include_flag_icons patch.
+  * Fix patch descriptions to match DEP3.
+  * 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 (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.
+  * Generate COUNTRIES_PLUS by duplicating countries with a comma in
+    their name. The part after the comma is moved to the beginning of the
+    string and the comma is removed.
+  * Sort countries by name using unicodedata.normalize in NFD mode.
+  * Update settings.py to use new DATABASE settings format.
+  * Bump build dependency for python-django to >= 1.2.
+  * Update flag icons path in d/copyright.
+
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Sat, 19 Nov 2011 18:14:25 +0100
+
+django-countries (1.0.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump to standards-version 3.9.1.
+  * Update DEP5 format.
+  * Drop debian/pyversions in favour of XS-Python-Version.
+  * Simplify debian/rules by using a predefined settings.py.
+  * Set PMPT as maintainer and myself as uploader.
+
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Mon, 07 Feb 2011 13:24:36 +0100
+
+django-countries (1.0.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Use DEP5 for copyright file.
+  * Update to Debian policy 3.9.0.
+
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Wed, 07 Jul 2010 12:38:20 +0200
+
+django-countries (1.0.3-1) unstable; urgency=low
+
+  * Initial release (Closes: #576262)
+
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Fri, 23 Apr 2010 14:45:20 +0200

Deleted: packages/django-countries/tags/1.5-1/debian/control
===================================================================
--- packages/django-countries/trunk/debian/control	2013-11-26 19:31:41 UTC (rev 26571)
+++ packages/django-countries/tags/1.5-1/debian/control	2013-12-16 12:16:46 UTC (rev 26769)
@@ -1,28 +0,0 @@
-Source: django-countries
-Section: python
-Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
-Build-Depends: debhelper (>= 7.0.50~),
-               iso-codes,
-               python-all (>= 2.6.6-3~),
-               python-django (>= 1.2),
-               python-setuptools
-Standards-Version: 3.9.3
-X-Python-Version: >= 2.5
-Homepage: http://bitbucket.org/smileychris/django-countries/
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/django-countries/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/django-countries/trunk/
-
-Package: python-django-countries
-Architecture: all
-Depends: famfamfam-flag-png | famfamfam-flag-gif,
-         iso-codes,
-         python-django,
-         ${misc:Depends},
-         ${python:Depends}
-Description: provides a country field for Django models
- A Django application which provides all ISO 3166-1 countries as choices for
- use with forms, and a country field for models.
- It also includes a small template filter for getting country flags by
- ISO 3166-1 alpha-2 country code.

Copied: packages/django-countries/tags/1.5-1/debian/control (from rev 26574, packages/django-countries/trunk/debian/control)
===================================================================
--- packages/django-countries/tags/1.5-1/debian/control	                        (rev 0)
+++ packages/django-countries/tags/1.5-1/debian/control	2013-12-16 12:16:46 UTC (rev 26769)
@@ -0,0 +1,28 @@
+Source: django-countries
+Section: python
+Priority: optional
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
+Build-Depends: debhelper (>= 7.0.50~),
+               iso-codes,
+               python-all,
+               python-django,
+               python-setuptools
+Standards-Version: 3.9.5
+X-Python-Version: >= 2.5
+Homepage: http://bitbucket.org/smileychris/django-countries/
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/django-countries/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/django-countries/trunk/
+
+Package: python-django-countries
+Architecture: all
+Depends: famfamfam-flag-png | famfamfam-flag-gif,
+         iso-codes,
+         python-django,
+         ${misc:Depends},
+         ${python:Depends}
+Description: provides a country field for Django models
+ A Django application which provides all ISO 3166-1 countries as choices for
+ use with forms, and a country field for models.
+ It also includes a small template filter for getting country flags by
+ ISO 3166-1 alpha-2 country code.

Deleted: packages/django-countries/tags/1.5-1/debian/copyright
===================================================================
--- packages/django-countries/trunk/debian/copyright	2013-11-26 19:31:41 UTC (rev 26571)
+++ packages/django-countries/tags/1.5-1/debian/copyright	2013-12-16 12:16:46 UTC (rev 26769)
@@ -1,42 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: django-countries
-Upstream-Contact: Chris Beaven <smileychris at gmail.com>
-Source: http://pypi.python.org/pypi/django-countries/
-
-Files: *
-Copyright: 2010-2012, Chris Beaven
-License: MIT
-
-Files: django_countries/static/flags/*
-Copyright: Mark James <mjames at gmail.com>
-License: Flag-Icon-License
-
-Files: debian/*
-Copyright: 2011-2012, Michael Fladischer <FladischerMichael at fladi.at>
-License: MIT
-
-License: MIT
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
-  Software is furnished to do so, subject to the following
- conditions:
- .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
-License: Flag-Icon-License
- The flag icons are available for free use for any purpose with
- no requirement for attribution.

Copied: packages/django-countries/tags/1.5-1/debian/copyright (from rev 26768, packages/django-countries/trunk/debian/copyright)
===================================================================
--- packages/django-countries/tags/1.5-1/debian/copyright	                        (rev 0)
+++ packages/django-countries/tags/1.5-1/debian/copyright	2013-12-16 12:16:46 UTC (rev 26769)
@@ -0,0 +1,42 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: django-countries
+Upstream-Contact: Chris Beaven <smileychris at gmail.com>
+Source: http://pypi.python.org/pypi/django-countries/
+
+Files: *
+Copyright: 2010-2013, Chris Beaven
+License: Expat
+
+Files: django_countries/static/flags/*
+Copyright: Mark James <mjames at gmail.com>
+License: Flag-Icon-License
+
+Files: debian/*
+Copyright: 2011-2013, Michael Fladischer <FladischerMichael at fladi.at>
+License: Expat
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following
+ conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+License: Flag-Icon-License
+ The flag icons are available for free use for any purpose with
+ no requirement for attribution.

Deleted: packages/django-countries/tags/1.5-1/debian/docs
===================================================================
--- packages/django-countries/trunk/debian/docs	2013-11-26 19:31:41 UTC (rev 26571)
+++ packages/django-countries/tags/1.5-1/debian/docs	2013-12-16 12:16:46 UTC (rev 26769)
@@ -1 +0,0 @@
-README

Copied: packages/django-countries/tags/1.5-1/debian/docs (from rev 26572, packages/django-countries/trunk/debian/docs)
===================================================================
--- packages/django-countries/tags/1.5-1/debian/docs	                        (rev 0)
+++ packages/django-countries/tags/1.5-1/debian/docs	2013-12-16 12:16:46 UTC (rev 26769)
@@ -0,0 +1 @@
+README.rst

Deleted: packages/django-countries/tags/1.5-1/debian/python-django-countries.postinst
===================================================================
--- packages/django-countries/trunk/debian/python-django-countries.postinst	2013-11-26 19:31:41 UTC (rev 26571)
+++ packages/django-countries/tags/1.5-1/debian/python-django-countries.postinst	2013-12-16 12:16:46 UTC (rev 26769)
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-build_locale_symlinks () 
-{
-    local path dest file
-    # Remove existing symlink farm. We will recreate it immediately.
-    rm -rf /usr/share/python-django-countries/locale/*
-    for file in /usr/share/locale/*/LC_MESSAGES/iso_3166.mo; do
-        # Create the necessary directory structure for each language.
-        path=$(dirname /usr/share/python-django-countries/locale/${file#/usr/share/locale/})
-        mkdir -p ${path}
-        # Create the symlink with an absolute target path (iso_3166.mo -> django.mo).
-        dest=${path}/django.mo
-        ln -s ../../../../${file#/usr/share/} ${dest}
-    done
-}
-
-if [ "$1" = "configure" ]; then
-    build_locale_symlinks
-elif [ "$1" = "triggered" ]; then
-    # iso-codes has been updated
-    build_locale_symlinks
-    exit 0
-fi
-
-#DEBHELPER#

Copied: packages/django-countries/tags/1.5-1/debian/python-django-countries.postinst (from rev 26768, packages/django-countries/trunk/debian/python-django-countries.postinst)
===================================================================
--- packages/django-countries/tags/1.5-1/debian/python-django-countries.postinst	                        (rev 0)
+++ packages/django-countries/tags/1.5-1/debian/python-django-countries.postinst	2013-12-16 12:16:46 UTC (rev 26769)
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -eu
+
+build_locale_symlinks ()
+{
+    local path dest file
+    # Remove existing symlink farm. We will recreate it immediately.
+    rm -rf /usr/share/python-django-countries/locale/*
+    for file in /usr/share/locale/*/LC_MESSAGES/iso_3166.mo; do
+        # Create the necessary directory structure for each language.
+        path=$(dirname /usr/share/python-django-countries/locale/${file#/usr/share/locale/})
+        mkdir -p ${path}
+        # Create the symlink with an absolute target path (iso_3166.mo -> django.mo).
+        dest=${path}/django.mo
+        ln -s ../../../../${file#/usr/share/} ${dest}
+    done
+}
+
+if [ "$1" = "configure" ]; then
+    build_locale_symlinks
+elif [ "$1" = "triggered" ]; then
+    # iso-codes has been updated
+    build_locale_symlinks
+    exit 0
+fi
+
+#DEBHELPER#

Deleted: packages/django-countries/tags/1.5-1/debian/rules
===================================================================
--- packages/django-countries/trunk/debian/rules	2013-11-26 19:31:41 UTC (rev 26571)
+++ packages/django-countries/tags/1.5-1/debian/rules	2013-12-16 12:16:46 UTC (rev 26769)
@@ -1,39 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-%:
-	dh --with python2 $@
-
-.PHONY: override_dh_auto_test
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	django-admin startproject testproject
-	if [ -d testproject/testproject ]; then \
-		cp debian/settings.py testproject/testproject ; \
-	else \
-		cp debian/settings.py testproject ; \
-	fi
-	set -e; \
-	for python in $(shell pyversions -r); do \
-	  rm -f testproject/test.db3 ; \
-	  PYTHONPATH=".:testproject" $$python testproject/manage.py syncdb --settings=testproject.settings --noinput ;\
-	  PYTHONPATH=".:testproject" $$python testproject/manage.py test --settings=testproject.settings django_countries ;\
-	done
-	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
-	sed -i 's/Metadata-Version: 1\.0/Metadata-Version: 1\.1/' debian/python-django-countries/usr/lib/python2.*/*-packages/django_countries-*.egg-info/PKG-INFO

Copied: packages/django-countries/tags/1.5-1/debian/rules (from rev 26768, packages/django-countries/trunk/debian/rules)
===================================================================
--- packages/django-countries/tags/1.5-1/debian/rules	                        (rev 0)
+++ packages/django-countries/tags/1.5-1/debian/rules	2013-12-16 12:16:46 UTC (rev 26769)
@@ -0,0 +1,34 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh --with python2 $@
+
+.PHONY: override_dh_auto_test
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	django-admin startproject testproject
+	if [ -d testproject/testproject ]; then \
+		cp debian/settings.py testproject/testproject ; \
+	else \
+		cp debian/settings.py testproject ; \
+	fi
+	set -e; \
+	for python in $(shell pyversions -r); do \
+	  rm -f testproject/test.db3 ; \
+	  PYTHONPATH=".:testproject" $$python testproject/manage.py syncdb --settings=testproject.settings --noinput ;\
+	  PYTHONPATH=".:testproject" $$python testproject/manage.py test --settings=testproject.settings django_countries ;\
+	done
+	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




More information about the Python-modules-commits mailing list