qgis · Jul 16, 2014
diff --git a/‎debian/changelog
Lines changed: 2 additions & 1 deletion b/‎debian/changelog
Lines changed: 2 additions & 1 deletion
diff --git a/‎debian/libqgis-core{QGIS_ABI}.lintian-overrides
Lines changed: 0 additions & 2 deletions b/‎debian/libqgis-core{QGIS_ABI}.lintian-overrides
Lines changed: 0 additions & 2 deletions
diff --git a/‎debian/libqgisgrass{QGIS_ABI}.lintian-overrides
Lines changed: 0 additions & 1 deletion b/‎debian/libqgisgrass{QGIS_ABI}.lintian-overrides
Lines changed: 0 additions & 1 deletion
diff --git a/‎debian/qgis-api-doc.links
Lines changed: 1 addition & 0 deletions b/‎debian/qgis-api-doc.links
Lines changed: 1 addition & 0 deletions
diff --git a/‎debian/qgis-common.install
Lines changed: 0 additions & 1 deletion b/‎debian/qgis-common.install
Lines changed: 0 additions & 1 deletion
diff --git a/‎debian/qgis-plugin-globe-common.lintian-override
Lines changed: 0 additions & 1 deletion b/‎debian/qgis-plugin-globe-common.lintian-override
Lines changed: 0 additions & 1 deletion
diff --git a/‎debian/qgis-providers-common.lintian-overrides
Lines changed: 0 additions & 2 deletions b/‎debian/qgis-providers-common.lintian-overrides
Lines changed: 0 additions & 2 deletions
diff --git a/‎debian/rules
Lines changed: 4 additions & 2 deletions b/‎debian/rules
Lines changed: 4 additions & 2 deletions
@@ -4,8 +4,9 @@ qgis (2.5.0) UNRELEASED; urgency=medium
   * add libqscintilla2-dev as build dependency
   * add remove sqlanywhere plugin and provider
   * drop support for ubuntu quantal and raring and add utopic
+  * merge downstream debian changes
 
- -- Jürgen E. Fischer <jef@norbit.de>  Tue, 15 Jul 2014 09:09:52 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Wed, 16 Jul 2014 09:09:57 +0200
 
 qgis (2.4.0) unstable; urgency=medium
 
 
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js usr/share/qgis/doc/api/html/jquery.js
@@ -5,7 +5,6 @@ usr/share/qgis/doc/CONTRIBUTORS
 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
 
@@ -226,13 +226,15 @@ 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/api/html/jquery.js
 
 	# Don't include a copy of the world.tif also included in osgearth-data
 	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/globe/world.tif
 
 	# remove extra license files
 	-find $(CURDIR)/debian/tmp/usr/share/qgis/resources/cpt-city-qgis-min/ -name COPYING.xml -delete
+	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/LICENSE
+	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/db_manager/LICENSE
 
 	# Man pages are installed by dh_installman
 	$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1
@@ -257,7 +259,7 @@ override_dh_compress:
 	dh_compress --exclude=pdf
 
 override_dh_makeshlibs:
-	dh_makeshlibs -Xqgis-plugin-grass -- -c0 -v$(QGIS_VERSION)
+	dh_makeshlibs -Xqgis-plugin-grass -Xlibqgis-customwidgets$(QGIS_ABI) -- -c0 -v$(QGIS_VERSION)
 
 override_dh_shlibdeps:
 	dh_shlibdeps -l/usr/lib/$(GRASS)/lib
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+usr/share/javascript/jquery/jquery.js usr/share/qgis/doc/api/html/jquery.js`