[Python-apps-commits] r6977 - in packages/upnp-inspector/trunk/debian (5 files)

Wed Apr 27 06:18:26 UTC 2011

Date: Wednesday, April 27, 2011 @ 06:18:13
  Author: cjsmo-guest
Revision: 6977

removed date from 01_inspector.desktop_fix, removed --single-version-externally-managed from rules, reordered copyright, removed pydis-overrides not needed

Modified:
  packages/upnp-inspector/trunk/debian/changelog
  packages/upnp-inspector/trunk/debian/copyright
  packages/upnp-inspector/trunk/debian/patches/01_upnp-inspector.desktop_fix
  packages/upnp-inspector/trunk/debian/rules
Deleted:
  packages/upnp-inspector/trunk/debian/pydist-overrides

Modified: packages/upnp-inspector/trunk/debian/changelog
===================================================================

--- packages/upnp-inspector/trunk/debian/changelog	2011-04-26 12:58:48 UTC (rev 6976)
+++ packages/upnp-inspector/trunk/debian/changelog	2011-04-27 06:18:13 UTC (rev 6977)
@@ -5,10 +5,12 @@
   * Added debian/pydist-overrides.
   * Updated debian/copyright to DEP5 rev173, added comment about tarball
     repack.
+  * Removed date from debian/patches/01_upnp-inspector.desktop_fix.
+  * Reorded copyright stanza's.
   * debian/rules:
     - switched to "--with python2".
-    - added dh_install exclude for win32 dir. It is only needed by windows
-      users.
+    - remove --single-version-externally-managed no longer needed.
+    - added override_dh_clean rule to remove "*.egg-info" during build.
   * debian/control:
     - removed dependency on quilt.
     - increased min python version to (>=2.6.6-3).

Modified: packages/upnp-inspector/trunk/debian/copyright
===================================================================
--- packages/upnp-inspector/trunk/debian/copyright	2011-04-26 12:58:48 UTC (rev 6976)
+++ packages/upnp-inspector/trunk/debian/copyright	2011-04-27 06:18:13 UTC (rev 6977)
@@ -3,7 +3,7 @@
 Upstream-Contact: Frank Scholz <coherence at beebits.net>
 Source: https://coherence.beebits.net/download/
 
-Files: *
+Files: /*
 Copyright: 2006 Frank Scholz <coherence at beebits.net>
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -24,35 +24,10 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
-File: upnp_inspector/icons/blankalbum.png
-Copyright: 2006 Ampache.org
-License: GPL-2+
+Comment: The upstream tarball has been repacked to include a copy of the GPL-2
+ license for the icons being used.  This was added so the package complies
+ with DFSG.
 
-Files: upnp_inspector/icons/inspector-icon.png
-       upnp_inspector/icons/inspector-logo.png
-Copyright: 2006 Frank Scholz <coherence at beebits.net>
-License: GPL-2+
-
-Files: debian/*
-Copyright: 2009 Michael StÃ¶cker <micha at ThinkpadR61Ubuntu.homebase>
-           2009 Charlie Smotherman <cjsmo at cableone.net>
-License: GPL-2+
- 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 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.
- .
- You should have received a copy of the GNU General Public License along with
- this program; if not, write to the Free Software Foundation, Inc., 51
- Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- .
- For full wording of above license, see '/usr/share/common-licenses/GPL-2'.
-
 Files: upnp_inspector/icons/*
 Copyright: Ulisse Perusin <uli.peru at gmail.com>
            Steven Garrity <sgarrity at silverorange.com>
@@ -91,6 +66,31 @@
  and in any way, including by methods that have not yet been invented or
  conceived.
 
-Comment: The upstream tarball has been repacked to include a copy of the GPL-2
- license for the icons being used.  This was added so the package complies
- with DFSG.
+File: upnp_inspector/icons/blankalbum.png
+Copyright: 2006 Ampache.org
+License: GPL-2+
+
+Files: upnp_inspector/icons/inspector-icon.png
+       upnp_inspector/icons/inspector-logo.png
+Copyright: 2006 Frank Scholz <coherence at beebits.net>
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2009 Michael StÃ¶cker <micha at ThinkpadR61Ubuntu.homebase>
+           2009 Charlie Smotherman <cjsmo at cableone.net>
+License: GPL-2+
+ 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 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.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this program; if not, write to the Free Software Foundation, Inc., 51
+ Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ For full wording of above license, see '/usr/share/common-licenses/GPL-2'.

Modified: packages/upnp-inspector/trunk/debian/patches/01_upnp-inspector.desktop_fix
===================================================================
--- packages/upnp-inspector/trunk/debian/patches/01_upnp-inspector.desktop_fix	2011-04-26 12:58:48 UTC (rev 6976)
+++ packages/upnp-inspector/trunk/debian/patches/01_upnp-inspector.desktop_fix	2011-04-27 06:18:13 UTC (rev 6977)
@@ -1,5 +1,5 @@
 Description: This patch allows the desktop file to validate
-Author: Charlie Smotherman <cjsmo at cableone.net> 06032009
+Author: Charlie Smotherman <cjsmo at cableone.net>
 
 Index: upnp-inspector-0.2.2/misc/upnp-inspector.desktop
 ===================================================================

Deleted: packages/upnp-inspector/trunk/debian/pydist-overrides
===================================================================
--- packages/upnp-inspector/trunk/debian/pydist-overrides	2011-04-26 12:58:48 UTC (rev 6976)
+++ packages/upnp-inspector/trunk/debian/pydist-overrides	2011-04-27 06:18:13 UTC (rev 6977)
@@ -1 +0,0 @@
-Coherence python-coherence

Modified: packages/upnp-inspector/trunk/debian/rules
===================================================================
--- packages/upnp-inspector/trunk/debian/rules	2011-04-26 12:58:48 UTC (rev 6976)
+++ packages/upnp-inspector/trunk/debian/rules	2011-04-27 06:18:13 UTC (rev 6977)
@@ -3,10 +3,10 @@
 %:
 	dh $@ --with python2
 
+override_dh_clean:
+	find . -name "*.egg-info" -exec rm -rf {} \;
+	dh_clean
+
 override_dh_auto_install:
 	dh_auto_install -- --install-scripts=/usr/share/upnp-inspector \
-                           --install-lib=/usr/share/upnp-inspector \
-                           --single-version-externally-managed
-
-override_dh_install:
-	dh_install -Xwin32
+                       --install-lib=/usr/share/upnp-inspector


