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

Thu Mar 31 05:51:34 UTC 2011

Date: Thursday, March 31, 2011 @ 05:51:32
  Author: cjsmo-guest
Revision: 6875

removed trailing white space in control, changelog, rules, added my email address to desktop patch, rm README.source, update copyright to DEP5-rev173, added pydist-overrided

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

Deleted: packages/upnp-inspector/trunk/debian/README.source
===================================================================

--- packages/upnp-inspector/trunk/debian/README.source	2011-03-30 22:37:47 UTC (rev 6874)
+++ packages/upnp-inspector/trunk/debian/README.source	2011-03-31 05:51:32 UTC (rev 6875)
@@ -1,8 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.  Please see:
-
-    /usr/share/doc/quilt/README.source
-
-for more information on how to apply the patches, modify patches, or
-remove a patch.

Modified: packages/upnp-inspector/trunk/debian/changelog
===================================================================
--- packages/upnp-inspector/trunk/debian/changelog	2011-03-30 22:37:47 UTC (rev 6874)
+++ packages/upnp-inspector/trunk/debian/changelog	2011-03-31 05:51:32 UTC (rev 6875)
@@ -1,12 +1,10 @@
 upnp-inspector (0.2.2+dfsg-3) UNRELEASED; urgency=low
 
-  [ Charlie Smotherman ]
   * Updated header info for 01_upnp-inspector.desktop_fix to DEP3.
   * Switched to using source format 3.0 (quilt).
-  * With the switch to source format 3.0 (quilt) debian/README.source is no
-    longer needed, so it has been removed.
   * Added debian/pydist-overrides.
-  * Updated debian/copyright to DEP5 rev173.
+  * Updated debian/copyright to DEP5 rev173, added comment about tarball
+    repack.
   * debian/rules:
     - switched to "--with python2".
     - added dh_install exclude for win32 dir. It is only needed by windows
@@ -18,14 +16,11 @@
     - bumped Standards Version to 3.9.1, no changes needed.
     - use X-P-V instead of XS-P-V.
 
-  [ Ryan Kavanagh ]
-  * Added a README.source, as required by Debian Policy Manual section 4.14 
-
  -- Charlie Smotherman <cjsmo at cableone.net>  Sat, 26 Mar 2011 13:33:42 -0500
 
 upnp-inspector (0.2.2+dfsg-2) unstable; urgency=low
 
-  * Moved python and python-setuptools from Build-Depends-Indep to the 
+  * Moved python and python-setuptools from Build-Depends-Indep to the
     Build-Depends field.
   * Changed Depends to python-coherence.
   * Bumped Standards Version to 3.8.3. No changes needed

Modified: packages/upnp-inspector/trunk/debian/control
===================================================================
--- packages/upnp-inspector/trunk/debian/control	2011-03-30 22:37:47 UTC (rev 6874)
+++ packages/upnp-inspector/trunk/debian/control	2011-03-31 05:51:32 UTC (rev 6875)
@@ -20,5 +20,3 @@
  discover and explore UPnP devices on your network. Detected devices are 
  displayed in a tree-view, where actions can be called and state-variables may
  be queried.
-
-

Modified: packages/upnp-inspector/trunk/debian/copyright
===================================================================
--- packages/upnp-inspector/trunk/debian/copyright	2011-03-30 22:37:47 UTC (rev 6874)
+++ packages/upnp-inspector/trunk/debian/copyright	2011-03-31 05:51:32 UTC (rev 6875)
@@ -5,7 +5,7 @@
 
 Files: *
 Copyright: 2006 Frank Scholz <coherence at beebits.net>
-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 restriction, including without limitation the
@@ -26,17 +26,17 @@
 
 File: upnp_inspector/icons/blankalbum.png
 Copyright: 2006 Ampache.org
-License: GPLv2
+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: GPLv2
+License: GPL-2+
 
 Files: debian/*
 Copyright: 2009 Michael StÃ¶cker <micha at ThinkpadR61Ubuntu.homebase>
            2009 Charlie Smotherman <cjsmo at cableone.net>
-License: GPLv2
+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
@@ -51,7 +51,7 @@
  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
+ 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>
@@ -63,7 +63,7 @@
            Tuomas Kuosmanen <tigert at tigert.com>
            Garrett LeSage <garrett at novell.com>
            Jakub Steiner <jimmac at novell.com>
-License: Public Domain
+License: public-domain
  The person or persons who have associated work with this document (the
  "Dedicator" or "Certifier") hereby either (a) certifies that, to the best of
  his knowledge, the work of authorship identified is in the public domain of
@@ -90,3 +90,7 @@
  otherwise exploited by anyone for any purpose, commercial or non-commercial,
  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.

Modified: packages/upnp-inspector/trunk/debian/patches/01_upnp-inspector.desktop_fix
===================================================================
--- packages/upnp-inspector/trunk/debian/patches/01_upnp-inspector.desktop_fix	2011-03-30 22:37:47 UTC (rev 6874)
+++ packages/upnp-inspector/trunk/debian/patches/01_upnp-inspector.desktop_fix	2011-03-31 05:51:32 UTC (rev 6875)
@@ -1,5 +1,5 @@
 Description: This patch allows the desktop file to validate
-Author: Charlie Smotherman 06032009
+Author: Charlie Smotherman <cjsmo at cableone.net> 06032009
 
 Index: upnp-inspector-0.2.2/misc/upnp-inspector.desktop
 ===================================================================

Added: packages/upnp-inspector/trunk/debian/pydist-overrides
===================================================================
--- packages/upnp-inspector/trunk/debian/pydist-overrides	                        (rev 0)
+++ packages/upnp-inspector/trunk/debian/pydist-overrides	2011-03-31 05:51:32 UTC (rev 6875)
@@ -0,0 +1 @@
+Coherence python-coherence

Modified: packages/upnp-inspector/trunk/debian/rules
===================================================================
--- packages/upnp-inspector/trunk/debian/rules	2011-03-30 22:37:47 UTC (rev 6874)
+++ packages/upnp-inspector/trunk/debian/rules	2011-03-31 05:51:32 UTC (rev 6875)
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 %:
-
 	dh $@ --with python2
 
 override_dh_auto_install:

Modified: packages/upnp-inspector/trunk/debian/upnp-inspector.1
===================================================================
--- packages/upnp-inspector/trunk/debian/upnp-inspector.1	2011-03-30 22:37:47 UTC (rev 6874)
+++ packages/upnp-inspector/trunk/debian/upnp-inspector.1	2011-03-31 05:51:32 UTC (rev 6875)
@@ -6,20 +6,26 @@
 UPnP-Inspector\- Is a UPnP device and service analyzer.
 
 .SH DESCRIPTION
-The Inspector is an UPnP Device and Service analyzer, and a debugging tool, based on the Coherence DLNA/UPnP framework.  Modeled loosely after the Intel UPnP Device Spy and Device Validator.
+The Inspector is an UPnP Device and Service analyzer, and a debugging tool,
+based on the Coherence DLNA/UPnP framework.  Modeled loosely after the Intel
+UPnP Device Spy and Device Validator.
 
-The Inspector is a GUI to discover and explorer of UPnP devices on your network. Detected devices are displayed in a tree-view, where, amongst other things, actions can be called and state\-variables be queried.
+The Inspector is a GUI to discover and explorer of UPnP devices on your
+network. Detected devices are displayed in a tree\-view, where, amongst other
+things, actions can be called and state\-variables be queried.
 
-The Inspector will host the tests from our UPnP test-suite, to provide a central place to verify device implementations and hunt down any UPnP anomalies.
+The Inspector will host the tests from our UPnP test\-suite, to provide a
+central place to verify device implementations and hunt down any UPnP
+anomalies.
 
 .SH OPTIONS
 .B
-.IP -OPTION
-There are no command line options for upnp-inspector.
+.IP OPTION
+There are no command line options for upnp\-inspector.
 
 .SH "AUTHORS"
 .LP 
-UPnP-Inspector was written by Frank Scholz <coherence at beebits.net>.
+UPnP\-Inspector was written by Frank Scholz <coherence at beebits.net>.
 .P
-This man page was created by Charlie Smotherman <cjsmo at cableone.net> for Frank Scholz and the Debian Project.
-
+This man page was created by Charlie Smotherman <cjsmo at cableone.net> for
+Frank Scholz and the Debian Project.


