Skip to content
Permalink
Browse files

Merged and squashed pull requests #1923 & #1928 from sebastic/debian

PR#1923: Debian packaging improvements
 * Update copyright file.
  - Remove unused Files paragraph for the python plugin_installer
  - Fix qwtpolar-1.0 typo
  - Remove unused License paragraph for Apache-2.0
  - Add License paragraph for Zlib
 * Remove unused substitution variable.
 * Update watch file, add version mangle.
 * Add upstream metadata.
 * Fix libqgis-customwidgets package name in dh_makeshlibs override, doesn't
   contain ABI anymore.
 * Also install scalable icons.

 PR#1928 Additional Debian packaging improvements
 * Update copyright file.
  - Add additional copyright holders to general files section
  - Add copyright years to general files section
  - Order copyright holder by year
  - Group files sections
  - Sort groups files sections alphanumerically
  - Document copyright holders & licenses for external modules
  - Add license specifications for: Apache-2.0, BSD-2-Clause,
    dxflib-Commercial-License, GPL-2, LGPL-2.1+, QT-Commericial, LGPL-2.1 with
    Digia Qt LGPL Exception 1.1 & GPL-3.
 * Remove extra license file for MetaSearch plugin.
 * Install libqgis_server.so in libqgis-dev.
 * Install schemaExtension.xsd in qgis-server.
 * Install contributors.json & developersmap.html in qgis-common.
  • Loading branch information
sebastic authored and jef-n committed Feb 25, 2015
1 parent 856ef80 commit b321869dd2b73d197525ad3ce9815905aa3cf36f
Showing with 568 additions and 146 deletions.
  1. +0 −1 debian/control.in
  2. +550 −144 debian/copyright
  3. +1 −0 debian/libqgis-dev.install
  4. +2 −0 debian/qgis-common.install
  5. +1 −0 debian/qgis-server.install
  6. +1 −0 debian/qgis.install
  7. +2 −1 debian/rules
  8. +10 −0 debian/upstream/metadata
  9. +1 −0 debian/watch
@@ -262,7 +262,6 @@ Architecture: all
Depends:
#sid jessie saucy sid-oracle trusty# python2.7,
#wheezy precise# python,
${python:Depends},
${misc:Depends}
Breaks: qgis-common (<< 1.5)
Replaces: qgis-common (<< 1.5)

Large diffs are not rendered by default.

@@ -3,6 +3,7 @@ usr/lib/libqgis_core.so
usr/lib/libqgis_gui.so
usr/lib/libqgis_analysis.so
usr/lib/libqgis_networkanalysis.so
usr/lib/libqgis_server.so
usr/lib/libqgisgrass.so
usr/lib/libqgispython.so
usr/share/qgis/FindQGIS.cmake
@@ -7,6 +7,8 @@ usr/share/qgis/doc/INSTALL
usr/share/qgis/doc/INSTALL.html
usr/share/qgis/doc/SPONSORS
usr/share/qgis/doc/TRANSLATORS
usr/share/qgis/doc/contributors.json
usr/share/qgis/doc/developersmap.html
usr/share/qgis/doc/favicon.ico
usr/share/qgis/doc/images
usr/share/qgis/doc/index.html
@@ -1,3 +1,4 @@
usr/lib/cgi-bin/qgis_mapserv.fcgi
usr/lib/cgi-bin/admin.sld
usr/lib/cgi-bin/wms_metadata.xml
usr/lib/cgi-bin/schemaExtension.xsd
@@ -19,3 +19,4 @@ usr/share/applications/
usr/share/mime/packages/
usr/share/mimelnk/
usr/share/icons/hicolor/
usr/share/icons/scalable/
@@ -243,6 +243,7 @@ override_dh_install:
-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
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/MetaSearch/LICENSE.txt

# Man pages are installed by dh_installman
$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1
@@ -267,7 +268,7 @@ override_dh_compress:
dh_compress --exclude=pdf

override_dh_makeshlibs:
dh_makeshlibs -Xqgis-plugin-grass -Xlibqgis-customwidgets$(QGIS_ABI) -- -c0 -v$(QGIS_VERSION)
dh_makeshlibs -Xqgis-plugin-grass -Xlibqgis-customwidgets -- -c0 -v$(QGIS_VERSION)

override_dh_shlibdeps:
dh_shlibdeps -l/usr/lib/$(GRASS)/lib
@@ -0,0 +1,10 @@
---
Bug-Database: http://hub.qgis.org/projects/quantum-gis/issues
Bug-Submit: http://hub.qgis.org/projects/quantum-gis/issues/new
Contact: qgis-developer@lists.osgeo.org
Donation: http://qgis.org/en/site/getinvolved/donations.html
Name: QGIS
Registration: https://www2.osgeo.org/cgi-bin/ldap_create_user.py
Repository: https://github.com/qgis/QGIS.git
Repository-Browse: https://github.com/qgis/QGIS
Screenshots: http://qgis.org/en/site/about/screenshots.html
@@ -1,2 +1,3 @@
version=3
opts="dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/" \
http://qgis.org/downloads/ (?:.*/)?(?:rel|v|qgis)[\-\_](\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

0 comments on commit b321869

Please sign in to comment.
You can’t perform that action at this time.