r3464 - packages/trunk/desmume/debian

[Pascal Giard]

Author: pascal
Date: 2007-07-27 20:29:58 +0000 (Fri, 27 Jul 2007)
New Revision: 3464

Modified:
   packages/trunk/desmume/debian/changelog
   packages/trunk/desmume/debian/copyright
Log:
Fixed following inclusion reject.


Modified: packages/trunk/desmume/debian/changelog
===================================================================
--- packages/trunk/desmume/debian/changelog	2007-07-25 21:44:55 UTC (rev 3463)
+++ packages/trunk/desmume/debian/changelog	2007-07-27 20:29:58 UTC (rev 3464)
@@ -1,29 +1,27 @@
-desmume (0.7.2-1) UNRELEASED; urgency=low
+desmume (0.7.2-1) unstable; urgency=low
 
-  * New upstream release.
-  * [debian/README.Debian]: Procedure updated reflecting previous changes.
-  * [debian/docs]: Added AUTHORS file.
-	
- -- Pascal Giard <pascal at debian.org>  Sun, 08 Jul 2007 03:42:38 -0400
-
-desmume (0.7.1-1) unstable; urgency=low
-
   [ Pascal Giard ]
   * Upload to unstable (closes: #405616).
-  * [debian/README.Debian]: Clarified CVS build instructions.
+  * [debian/README.Debian]:
+    - Procedure updated reflecting previous changes.
+    - Clarified CVS build instructions.
   * [debian/rules]:
     - Removed CFLAGS="-D_REENTRANT" as it was slowing things down considerably.
     - Install glade interfaces.
     - Install desktop menu files.
-  * [debian/docs]: Removed empty files.
+  * [debian/docs]:
+    - Removed empty files.
+    - Added AUTHORS file.
   * [debian/dirs]: Added directories for glade interfaces.
   * [debian/desmume-cli.1, debian/desmume-glade.1]:
     Added manpages for command-line and glade binairies.
+  * [debian/copyright]:
+    - Added LGPL license note for glade-xml.c and gtk/dev-cpp/* .
 	
   [ Reinhard Tartler ]
   * Change maintainer to 'Debian Games Team'
 
- -- Pascal Giard <pascal at debian.org>  Sat, 10 Feb 2007 22:59:06 +0100
+ -- Pascal Giard <pascal at debian.org>  Fri, 27 Jul 2007 16:27:43 -0400
 
 desmume (0.6.0-0ubuntu1) feisty; urgency=low
 

Modified: packages/trunk/desmume/debian/copyright
===================================================================
--- packages/trunk/desmume/debian/copyright	2007-07-25 21:44:55 UTC (rev 3463)
+++ packages/trunk/desmume/debian/copyright	2007-07-27 20:29:58 UTC (rev 3464)
@@ -11,8 +11,13 @@
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
+Exception to this are src/gtk-glade/glade-xml.c and the files in gtk/dev-cpp/
+which are licensed under the less restrictive license LGPL.
+
 On Debian systems, the complete text of the GNU General Public License
 can be found in the '/usr/share/common-licenses/GPL' file.
+Similarly, the complete text of the GNU Lesser General Public License
+can be found in the '/usr/share/common-licenses/LGPL' file.
 
 The original copyright owner was a French developer known as YopYop156 <yopyop156 at ifrance.com>.
 Current upstream development is being made by the DeSmuME team, see /usr/share/doc/desmume/AUTHORS.