[Pkg-osm-commits] [SCM] monav branch, master, updated. debian/0.2+svn405-1-11-gc87b014

[David Paleino]

The following commit has been merged in the master branch:
commit c87b014f6a99fe805ca3df2ddbcbc153a7f8766e
Author: David Paleino <dapal at debian.org>
Date:   Mon Mar 14 13:09:02 2011 +0100

    Don't install the extra license file for Oxygen icons; rather, list them in debian/copyright

diff --git a/debian/changelog b/debian/changelog
index 2b4d9e1..a6d57c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,10 @@ monav (0.2+svn450-1) UNRELEASED; urgency=low
     arch-independent package, instead of embedding them into a Qt
     Resource file (03-dont_embed_resources.patch and other files)
   * Fix some source code typos (04-fix_typos.patch)
+  * Don't install the extra license file for Oxygen icons; rather,
+    list them in debian/copyright
 
- -- David Paleino <dapal at debian.org>  Mon, 14 Mar 2011 13:03:11 +0100
+ -- David Paleino <dapal at debian.org>  Mon, 14 Mar 2011 13:08:44 +0100
 
 monav (0.2+svn405-1) experimental; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 843778a..06e3819 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,6 +17,15 @@ Files: debian/*
 Copyright: © 2010-2011, David Paleino <dapal at debian.org>
 License: GPL-3+
 
+Files: images/oxygen/*
+Copyright: © 2007, David Vignoni <david at icon-king.com>
+ © 2007, Johann Ollivier Lapeyre <johann at oxygen-icons.org>
+ © 2007, Kenneth Wimer <kwwii at bootsplash.org>
+ © 2007, Nuno Pinheiro <nuno at oxygen-icons.org>
+ © 2007, Riccardo Iaconelli <riccardo at oxygen-icons.org>
+ © 2007, David Miller <miller at oxygen-icons.org>
+License: LGPL-3+
+
 Files: images/world/*
 Author: Natural Earth <http://www.naturalearthdata.com/>
 License: PD
@@ -106,3 +115,20 @@ License: GPL-2+
  along with this program. If not, see <http://www.gnu.org/licenses/>
 X-Comment: on Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: LGPL-3+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+X-Comment: on Debian systems, the complete text of the GNU Lesser
+ General Public License version 3 can be found in
+ "/usr/share/common-licenses/LGPL-3".
diff --git a/debian/rules b/debian/rules
index b2e02d9..685f949 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,6 +35,10 @@ override_dh_auto_clean: configure
 	done
 	-rm -rf bin/
 
+override_dh_install:
+	dh_install
+	-find $(CURDIR)/debian/ -name "COPYING" -delete
+
 %:
 	dh $@
 

-- 
fast navigation system featuring exact routing