[Python-modules-commits] r12712 - in packages/django-countries/trunk/debian (copyright rules)

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

    Date: Friday, April 23, 2010 @ 08:30:53
  Author: fladi-guest
Revision: 12712

Remove override for auto_build target as flag icons are no longer included in this package.
Copy text from license file to debian/copyright.

Modified:
  packages/django-countries/trunk/debian/copyright
  packages/django-countries/trunk/debian/rules

Modified: packages/django-countries/trunk/debian/copyright
===================================================================
--- packages/django-countries/trunk/debian/copyright	2010-04-23 07:40:24 UTC (rev 12711)
+++ packages/django-countries/trunk/debian/copyright	2010-04-23 08:30:53 UTC (rev 12712)
@@ -12,38 +12,33 @@
 
 Copyright:
 
-    Copyright (C) 2009, Chris Beaven
+    Copyright (C) 2010, Chris Beaven
 
 License:
 
-    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:
+    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 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.
+    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.
 
-Flag icon license:
-    
-    The icons are public domain, and as such are free for any use 
-    (attribution appreciated but not required).
-
-    http://www.famfamfam.com/lab/icons/flags/
-
 The Debian packaging is:
 
     Copyright (C) 2010 Fladischer Michael <FladischerMichael at fladi.at>
 
-and is licensed under the GPL version 3,
-see "/usr/share/common-licenses/GPL-3".
+and is licensed under the same terms.

Modified: packages/django-countries/trunk/debian/rules
===================================================================
--- packages/django-countries/trunk/debian/rules	2010-04-23 07:40:24 UTC (rev 12711)
+++ packages/django-countries/trunk/debian/rules	2010-04-23 08:30:53 UTC (rev 12712)
@@ -7,11 +7,6 @@
 %:
 	dh  $@
 
-.PHONY: override_dh_auto_build
-override_dh_auto_build:
-	chmod 644 django_countries/media/flags/*
-	dh_auto_build
-
 .PHONY: override_dh_auto_test
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))