[Python-apps-commits] r2172 - in packages/entertainer/trunk/debian (3 files)

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

    Date: Wednesday, January 7, 2009 @ 20:40:07
  Author: gothicx-guest
Revision: 2172

Update patch; Remove EXIF license notice from copyright; Better watch file, for only stable releases

Modified:
  packages/entertainer/trunk/debian/copyright
  packages/entertainer/trunk/debian/patches/remove_extra_license.dpatch
  packages/entertainer/trunk/debian/watch

Modified: packages/entertainer/trunk/debian/copyright
===================================================================
--- packages/entertainer/trunk/debian/copyright	2009-01-06 20:49:02 UTC (rev 2171)
+++ packages/entertainer/trunk/debian/copyright	2009-01-07 20:40:07 UTC (rev 2172)
@@ -36,35 +36,6 @@
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-* entertainerlib/utils/EXIF.py:
-	Copyright (C) 2002 Gene Cash All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are
-	met:
-
-	1. Redistributions of source code must retain the above copyright
-	   notice, this list of conditions and the following disclaimer.
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the
-	   distribution.
-
-	THIS SOFTWARE IS PROVIDED BY GENE CASH ``AS IS'' AND ANY EXPRESS OR
-	IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-	OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-	DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
-	ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-	DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-	OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-	ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-
-	This means you may do anything you want with this code, except claim you
-	wrote it. Also, if it breaks you get to keep both pieces.
-
 * tools/translations/*:
 	Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
 

Modified: packages/entertainer/trunk/debian/patches/remove_extra_license.dpatch
===================================================================
--- packages/entertainer/trunk/debian/patches/remove_extra_license.dpatch	2009-01-06 20:49:02 UTC (rev 2171)
+++ packages/entertainer/trunk/debian/patches/remove_extra_license.dpatch	2009-01-07 20:40:07 UTC (rev 2172)
@@ -6,15 +6,14 @@
 
 @DPATCH@
 diff -urNad entertainer-0.3~/setup.py entertainer-0.3/setup.py
---- entertainer-0.3~/setup.py	2008-12-12 19:49:47.000000000 +0000
-+++ entertainer-0.3/setup.py	2008-12-12 19:50:09.000000000 +0000
-@@ -36,9 +36,6 @@
+--- entertainer-0.3~/setup.py	2009-01-07 20:18:28.000000000 +0000
++++ entertainer-0.3/setup.py	2009-01-07 20:23:35.000000000 +0000
+@@ -58,8 +58,6 @@
  data_files.extend(find_files('locale'))
  data_files.append(
      ('share/entertainer/docs', [
 -        'docs/LICENSE',
 -        'docs/COPYING',
--        'docs/EXIF_LICENSE',
          'docs/DEPENDENCIES',
          ]))
  data_files.append(

Modified: packages/entertainer/trunk/debian/watch
===================================================================
--- packages/entertainer/trunk/debian/watch	2009-01-06 20:49:02 UTC (rev 2171)
+++ packages/entertainer/trunk/debian/watch	2009-01-07 20:40:07 UTC (rev 2172)
@@ -1,2 +1,3 @@
 version=3
-http://www.entertainer-project.com/downloads/entertainer-(.*).tar.gz
+https://launchpad.net/entertainer/+download \
+http://launchpad.net/entertainer/(?:.*)/entertainer-(?:.*)/\+download/entertainer-(.*)\.tar\.gz