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

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

    Date: Monday, December 16, 2013 @ 12:12:01
  Author: fladi-guest
Revision: 26768

Minor cleanups to packaging:

 * Update years in d/copyright.
 * Change MIT to Expat license.
 * Drop temporary fix for PKG-INFO.
 * Cleanup trailing whitespace in python-django-countries.postinst.

Modified:
  packages/django-countries/trunk/debian/changelog
  packages/django-countries/trunk/debian/copyright
  packages/django-countries/trunk/debian/python-django-countries.postinst
  packages/django-countries/trunk/debian/rules

Modified: packages/django-countries/trunk/debian/changelog
===================================================================
--- packages/django-countries/trunk/debian/changelog	2013-12-15 17:24:18 UTC (rev 26767)
+++ packages/django-countries/trunk/debian/changelog	2013-12-16 12:12:01 UTC (rev 26768)
@@ -9,8 +9,11 @@
   * 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>  Tue, 26 Nov 2013 20:55:02 +0100
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Mon, 16 Dec 2013 13:10:35 +0100
 
 django-countries (1.2-1) unstable; urgency=low
 

Modified: packages/django-countries/trunk/debian/copyright
===================================================================
--- packages/django-countries/trunk/debian/copyright	2013-12-15 17:24:18 UTC (rev 26767)
+++ packages/django-countries/trunk/debian/copyright	2013-12-16 12:12:01 UTC (rev 26768)
@@ -4,18 +4,18 @@
 Source: http://pypi.python.org/pypi/django-countries/
 
 Files: *
-Copyright: 2010-2012, Chris Beaven
-License: MIT
+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-2012, Michael Fladischer <FladischerMichael at fladi.at>
-License: MIT
+Copyright: 2011-2013, Michael Fladischer <FladischerMichael at fladi.at>
+License: Expat
 
-License: MIT
+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

Modified: packages/django-countries/trunk/debian/python-django-countries.postinst
===================================================================
--- packages/django-countries/trunk/debian/python-django-countries.postinst	2013-12-15 17:24:18 UTC (rev 26767)
+++ packages/django-countries/trunk/debian/python-django-countries.postinst	2013-12-16 12:12:01 UTC (rev 26768)
@@ -2,7 +2,7 @@
 
 set -eu
 
-build_locale_symlinks () 
+build_locale_symlinks ()
 {
     local path dest file
     # Remove existing symlink farm. We will recreate it immediately.

Modified: packages/django-countries/trunk/debian/rules
===================================================================
--- packages/django-countries/trunk/debian/rules	2013-12-15 17:24:18 UTC (rev 26767)
+++ packages/django-countries/trunk/debian/rules	2013-12-16 12:12:01 UTC (rev 26768)
@@ -32,8 +32,3 @@
 	  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