Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
debian packaging update
  • Loading branch information
jef-n committed Sep 11, 2014
1 parent fba5c5a commit 95f3550
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
3 changes: 2 additions & 1 deletion debian/changelog
Expand Up @@ -6,8 +6,9 @@ qgis (2.5.0) UNRELEASED; urgency=medium
* drop support for ubuntu quantal and raring and add utopic
* merge downstream debian changes
* add build dependency to pyqt4.qsci-dev
* adapt debian downstream changes

-- Jürgen E. Fischer <jef@norbit.de> Sun, 31 Aug 2014 23:00:35 +0200
-- Jürgen E. Fischer <jef@norbit.de> Wed, 10 Sep 2014 23:27:34 +0200

qgis (2.4.0) unstable; urgency=medium

Expand Down
4 changes: 2 additions & 2 deletions debian/control
Expand Up @@ -259,13 +259,13 @@ Description: collection of data providers to QGIS - architecture-independent fil

Package: qgis-server
Architecture: any
Replaces: qgis-mapserver
Provides: qgis-mapserver
Replaces: qgis-mapserver
Depends:
qgis-providers (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Description: QGIS server
Description: QGIS server providing various OGC services
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
Expand Down
2 changes: 1 addition & 1 deletion debian/control.in
Expand Up @@ -323,7 +323,7 @@ Depends:
qgis-providers (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Description: QGIS mapserver
Description: QGIS server providing various OGC services
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
Expand Down
11 changes: 6 additions & 5 deletions debian/copyright
Expand Up @@ -41,7 +41,7 @@ Copyright: Gary E.Sherman <sherman@mrcc dot com>
2008 Paolo L. Scala, Barbara Rita Barricelli, Marco Padula
License: GPL-2+

Files: python/pyspatialite/*
Files: python/ext-libs/pyspatialite/*
Copyright: 2004-2007 Gerhard Häring <gh@ghaering.de>
License: Zlib

Expand Down Expand Up @@ -641,7 +641,7 @@ Copyright: 2004, 2010, Paul Wessel, SOEST
2004, 2010, Walter Smith, NOAA
License: GPL-2+

Files: images/themes/gis/*
Files: images/themes/default/*
Copyright: 2011, Robert Szczepanek
Anita Graser
Comment: GIS icons by Robert Szczepanek is licensed under a Creative Commons
Expand All @@ -650,11 +650,11 @@ Comment: GIS icons by Robert Szczepanek is licensed under a Creative Commons
to include licence.txt file in your work.
License: CC-BY-SA-3.0

Files: python/plugins/GdalTools
Files: python/plugins/GdalTools/*
Copyright: 2009 Faunalia
License: MIT

Files: python/plugins/fTools
Files: python/plugins/fTools/*
Copyright: 2009 Carson J.Q. Farmer
License: MIT

Expand All @@ -663,7 +663,8 @@ Copyright: 2007 Matthew T. Perry
2008-2009 Borys Jurgiel
License: MIT

Files: src/app/gps/qwtpolar/*
Files: src/app/gps/qwtpolar-0.1/*
src/app/gps/qwtpolor-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
Expand Down

0 comments on commit 95f3550

Please sign in to comment.