Skip to content
Permalink
Browse files

Merge pull request #1923 from sebastic/debian

Debian packaging improvements
  • Loading branch information
jef-n committed Feb 23, 2015
2 parents 0ccc07a + 6c142ed commit 4629205f2aedd00a9609124c0b221b12fa92f17c
Showing with 29 additions and 38 deletions.
  1. +0 −1 debian/control.in
  2. +16 −36 debian/copyright
  3. +1 −0 debian/qgis.install
  4. +1 −1 debian/rules
  5. +10 −0 debian/upstream/metadata
  6. +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)
@@ -658,35 +658,13 @@ Files: python/plugins/fTools/*
Copyright: 2009 Carson J.Q. Farmer
License: MIT

Files: python/plugins/plugin_installer
Copyright: 2007 Matthew T. Perry
2008-2009 Borys Jurgiel
License: MIT

Files: src/app/gps/qwtpolar-0.1/*
src/app/gps/qwtpolor-1.0/*
src/app/gps/qwtpolar-1.0/*
Copyright: 2008 Uwe Rathmann
Comment: This library is free software; you can redistribute it and/or
modify it under the terms of the Qwt License, Version 1.0
License: QWT-1.0

License: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
.
http://www.apache.org/licenses/LICENSE-2.0
.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
.
See the License for the specific language governing permissions and
limitations under the License.
.
On Debian systems, the complete text of the Apache License version 2
an be found in the `/usr/share/common-licenses/Apache-2.0' file.

License: Apache-Style-Software-License-Version-1.1
Apache-Style Software License for ColorBrewer software and ColorBrewer
Color Schemes
@@ -1816,19 +1794,21 @@ License: QWT-1.0
the Qwt project (http://qwt.sf.net).

License: Zlib
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
This software is provided 'as-is', without any express or implied warranty. In
no event will the authors be held liable for any damages arising from the use
of this software.
.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
.
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
including commercial applications, and to alter it and redistribute it freely,
subject to the following restrictions:
.
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software in
a product, an acknowledgment in the product documentation would be
appreciated but is not required.
.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
.
3. This notice may not be removed or altered from any source distribution.

@@ -19,3 +19,4 @@ usr/share/applications/
usr/share/mime/packages/
usr/share/mimelnk/
usr/share/icons/hicolor/
usr/share/icons/scalable/
@@ -267,7 +267,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 4629205

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