debian packaging update: include LICENSE (fixes #8712)

qgis · Jun 22, 2014 · c8375f5 · c8375f5
1 parent 422148c
commit c8375f5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/debian/qgis-common.install b/debian/qgis-common.install
@@ -1,18 +1,19 @@
+usr/share/qgis/doc/AUTHORS
 usr/share/qgis/doc/CODING
 usr/share/qgis/doc/CODING.html
-usr/share/qgis/doc/favicon.ico 
-usr/share/qgis/doc/index.html
-usr/share/qgis/doc/style.css
-usr/share/qgis/doc/AUTHORS
-usr/share/qgis/doc/SPONSORS
 usr/share/qgis/doc/CONTRIBUTORS
-usr/share/qgis/doc/TRANSLATORS
 usr/share/qgis/doc/DONORS
 usr/share/qgis/doc/INSTALL
 usr/share/qgis/doc/INSTALL.html
+usr/share/qgis/doc/LICENSE
+usr/share/qgis/doc/SPONSORS
+usr/share/qgis/doc/TRANSLATORS
+usr/share/qgis/doc/favicon.ico
+usr/share/qgis/doc/images
+usr/share/qgis/doc/index.html
 usr/share/qgis/doc/news
 usr/share/qgis/doc/news.html
-usr/share/qgis/doc/images
+usr/share/qgis/doc/style.css
 usr/share/qgis/i18n/*
 usr/share/qgis/images/*
 usr/share/qgis/resources/spatialite.db
diff --git a/debian/rules b/debian/rules
@@ -227,7 +227,6 @@ override_dh_install:
 	# remove unwanted files
 	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
 	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/jquery.js
-	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/LICENCE
 
 	# Don't include a copy of the world.tif also included in osgearth-data
 	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/globe/world.tif

diff --git a/python/plugins/db_manager/CMakeLists.txt b/python/plugins/db_manager/CMakeLists.txt
@@ -1,7 +1,7 @@
 ADD_SUBDIRECTORY(db_plugins)
 ADD_SUBDIRECTORY(icons)
 
-FILE(GLOB OTHER_FILES LICENCE README TODO)
+FILE(GLOB OTHER_FILES LICENSE README TODO)
 FILE(GLOB PY_FILES *.py)
 
 FILE(GLOB UI_FILES ui/*.ui)