[Python-modules-commits] r13927 - in packages/pyclamd/trunk/debian (changelog copyright rules)

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

    Date: Monday, July 12, 2010 @ 22:02:20
  Author: rainct-guest
Revision: 13927

* New upstream release:
   - Replaced deprecated string exceptions with classes.
   - Added a timeout option to socket operations to avoid blocking.
   - Code improvements (PEP-8 compliance, new private helper functions).
* debian/rules:
   - Updated get-orig-source (don't take the changelog since it's outdated,
     and replace GPL2 with LGPL3).
* debian/copyright:
   - Update copyright years and change license from GPL2+ to LGPL3+.

Modified:
  packages/pyclamd/trunk/debian/changelog
  packages/pyclamd/trunk/debian/copyright
  packages/pyclamd/trunk/debian/rules

Modified: packages/pyclamd/trunk/debian/changelog
===================================================================
--- packages/pyclamd/trunk/debian/changelog	2010-07-12 21:49:55 UTC (rev 13926)
+++ packages/pyclamd/trunk/debian/changelog	2010-07-12 22:02:20 UTC (rev 13927)
@@ -1,3 +1,17 @@
+pyclamd (0.2.2-1) unstable; urgency=low
+
+  * New upstream release:
+     - Replaced deprecated string exceptions with classes.
+     - Added a timeout option to socket operations to avoid blocking.
+     - Code improvements (PEP-8 compliance, new private helper functions).
+  * debian/rules:
+     - Updated get-orig-source (don't take the changelog since it's outdated,
+       and replace GPL2 with LGPL3).
+  * debian/copyright:
+     - Update copyright years and change license from GPL2+ to LGPL3+.
+
+ -- Siegfried-Angel Gevatter Pujals <rainct at ubuntu.com>  Mon, 12 Jul 2010 23:57:50 +0200
+
 pyclamd (0.1.1-2) unstable; urgency=low
 
   [ Siegfried-Angel Gevatter Pujals ]

Modified: packages/pyclamd/trunk/debian/copyright
===================================================================
--- packages/pyclamd/trunk/debian/copyright	2010-07-12 21:49:55 UTC (rev 13926)
+++ packages/pyclamd/trunk/debian/copyright	2010-07-12 22:02:20 UTC (rev 13927)
@@ -10,22 +10,22 @@
 
 Copyright:
 
-    Copyright © 2006 Alexandre Norman <norman at xael.org>
+    Copyright © 2006-2010 Alexandre Norman <norman at xael.org>
 
 License:
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+    This program is free software; you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License as published by the Free 
+    Software  Foundation; either version 3 of the License, or (at your option) any
+    later version. See http://www.gnu.org/licenses/lgpl-3.0.txt.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+    This program is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more 
+    details.
 
-    On Debian systems, the complete text of the GNU General Public
-    License can be found in /usr/share/common-licenses/GPL-2.
+    On Debian systems, the complete text of the GNU Lesser General Public
+    License can be found in /usr/share/common-licenses/.
 
-The Debian packaging is © 2008, Siegfried-A. Gevatter Pujals <rainct at ubuntu.com>
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
+The Debian packaging is © 2008-2010, Siegfried-A. Gevatter Pujals
+<rainct at ubuntu.com> and is provided under the same license as the pyclamd.

Modified: packages/pyclamd/trunk/debian/rules
===================================================================
--- packages/pyclamd/trunk/debian/rules	2010-07-12 21:49:55 UTC (rev 13926)
+++ packages/pyclamd/trunk/debian/rules	2010-07-12 22:02:20 UTC (rev 13927)
@@ -25,16 +25,17 @@
 	wget --quiet -O $(STMPDIR)/pyclamd.py http://xael.org/norman/python/pyclamd/pyclamd.py
 	sed -i "s/#!\/usr\/bin\/env python//g" $(STMPDIR)/pyclamd.py
 	sed -i "s/\/var\/run\/clamd/\/var\/run\/clamav\/clamd.ctl/g" $(STMPDIR)/pyclamd.py
-	wget --quiet -O $(STMPDIR)/TMPCHANGELOG http://xael.org/norman/python/pyclamd/CHANGELOG
-	grep -A99999 "CHANGELOG" $(STMPDIR)/TMPCHANGELOG > $(STMPDIR)/CHANGELOG
-	if grep -qs 'GNU General Public License' $(STMPDIR)/TMPCHANGELOG; then \
-		cp /usr/share/common-licenses/GPL-2 $(STMPDIR)/COPYING; \
+	#wget --quiet -O $(STMPDIR)/TMPCHANGELOG http://xael.org/norman/python/pyclamd/CHANGELOG
+	#grep -A99999 "CHANGELOG" $(STMPDIR)/TMPCHANGELOG > $(STMPDIR)/CHANGELOG
+	if grep -qs 'GNU Lesser General Public License' $(STMPDIR)/pyclamd.py; then \
+		cp /usr/share/common-licenses/LGPL-3 $(STMPDIR)/COPYING.LGPL; \
+		cp /usr/share/common-licenses/GPL-3 $(STMPDIR)/COPYING; \
 	else \
 		echo "Possible licence change detected, aborting...";\
 		rm -rf $(BTMPDIR);\
 		exit 1;\
 	fi
-	rm $(STMPDIR)/TMPCHANGELOG
+	#rm $(STMPDIR)/TMPCHANGELOG
 	cd $(BTMPDIR); tar -czvf $(CURDIR)/../pyclamd_$(VERSION).orig.tar.gz pyclamd-$(VERSION)
 	rm -r $(BTMPDIR)
 	# Tarball generated successfully.