[lordsawar] 48/133: Comment in copyright about differences in licenses

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository lordsawar.

commit c9f80839fc0fd8fc47f38f54fe60f8e7a0104a9d
Author: Barry deFreese <bddebian at comcast.net>
Date:   Sat Jul 26 16:12:37 2008 +0000

    Comment in copyright about differences in licenses
---
 debian/changelog | 42 +++++++++++++++++++++++++-----------------
 debian/copyright |  1 +
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e1ed5b8..cf8d148 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lordsawar (0.1.0-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Move 0.0.8-2.1 changelog entry to correct point in changelog.
+  * Make lordsawar-data suggest lordsawar.
+
+ -- Barry deFreese <bddebian at comcast.net>  Thu, 24 Jul 2008 12:56:39 -0400
+
 lordsawar (0.1.0-1) unstable; urgency=low
 
   * New upstream release.
@@ -30,6 +38,23 @@ lordsawar (0.0.8-3) unstable; urgency=low
 
  -- Debian Games Team <pkg-games-devel at lists.alioth.debian.org>  Sat, 26 Apr 2008 20:23:06 +0200
 
+lordsawar (0.0.8-2.1) unstable; urgency=high
+
+  [ Eddy Petrișor ]
+  * fix Vcs-Svn URL to point to svn, not the incomplete ssh location
+
+  [ Alexander Schmehl ]
+  * Added patches/ftbfs_gcc-4.3_fix.diff to fix FTBFS with gcc 4.3
+    (Closes: #474856)
+
+  [ Gonéri Le Bouder ]
+  * touch aclocal.m4, Makefile.in and configure to make autotools happy
+    and avoid autoreconf with ftbfs_gcc-4.3_fix.diff
+  * clean the .pc directory
+  * 
+
+ -- Gonéri Le Bouder <goneri at rulezlan.org>  Sat, 26 Apr 2008 20:23:06 +0200
+
 lordsawar (0.0.8-2) unstable; urgency=high
 
   [ Eddy Petrișor ]
@@ -96,20 +121,3 @@ lordsawar (0.0.3-1) unstable; urgency=low
   * Override upstream desktop files until they are fixed
 
  -- Barry deFreese <bddebian at comcast.net>  Thu, 27 Sep 2007 21:27:07 -0400
-
-lordsawar (0.0.8-2.1) unstable; urgency=high
-
-  [ Eddy Petrișor ]
-  * fix Vcs-Svn URL to point to svn, not the incomplete ssh location
-
-  [ Alexander Schmehl ]
-  * Added patches/ftbfs_gcc-4.3_fix.diff to fix FTBFS with gcc 4.3
-    (Closes: #474856)
-
-  [ Gonéri Le Bouder ]
-  * touch aclocal.m4, Makefile.in and configure to make autotools happy
-    and avoid autoreconf with ftbfs_gcc-4.3_fix.diff
-  * clean the .pc directory
-  * 
-
- -- Gonéri Le Bouder <goneri at rulezlan.org>  Sat, 26 Apr 2008 20:23:06 +0200
diff --git a/debian/copyright b/debian/copyright
index 3772b2c..4bfc4c5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -95,6 +95,7 @@ src/ucompose.hpp:
   Public License can be found in `/usr/share/common-licenses/LGPL'.
 
 
+All other files:
     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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lordsawar.git