Skip to content

Commit 95f3550

Browse files
committed
debian packaging update
1 parent fba5c5a commit 95f3550

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

debian/changelog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ qgis (2.5.0) UNRELEASED; urgency=medium
66
* drop support for ubuntu quantal and raring and add utopic
77
* merge downstream debian changes
88
* add build dependency to pyqt4.qsci-dev
9+
* adapt debian downstream changes
910

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

1213
qgis (2.4.0) unstable; urgency=medium
1314

debian/control

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,13 @@ Description: collection of data providers to QGIS - architecture-independent fil
259259

260260
Package: qgis-server
261261
Architecture: any
262-
Replaces: qgis-mapserver
263262
Provides: qgis-mapserver
263+
Replaces: qgis-mapserver
264264
Depends:
265265
qgis-providers (= ${binary:Version}),
266266
${shlibs:Depends},
267267
${misc:Depends}
268-
Description: QGIS server
268+
Description: QGIS server providing various OGC services
269269
QGIS is a Geographic Information System (GIS) which manages, analyzes and
270270
display databases of geographic information.
271271
.

debian/control.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ Depends:
323323
qgis-providers (= ${binary:Version}),
324324
${shlibs:Depends},
325325
${misc:Depends}
326-
Description: QGIS mapserver
326+
Description: QGIS server providing various OGC services
327327
QGIS is a Geographic Information System (GIS) which manages, analyzes and
328328
display databases of geographic information.
329329
.

debian/copyright

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Copyright: Gary E.Sherman <sherman@mrcc dot com>
4141
2008 Paolo L. Scala, Barbara Rita Barricelli, Marco Padula
4242
License: GPL-2+
4343

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

@@ -641,7 +641,7 @@ Copyright: 2004, 2010, Paul Wessel, SOEST
641641
2004, 2010, Walter Smith, NOAA
642642
License: GPL-2+
643643

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

653-
Files: python/plugins/GdalTools
653+
Files: python/plugins/GdalTools/*
654654
Copyright: 2009 Faunalia
655655
License: MIT
656656

657-
Files: python/plugins/fTools
657+
Files: python/plugins/fTools/*
658658
Copyright: 2009 Carson J.Q. Farmer
659659
License: MIT
660660

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

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

0 commit comments

Comments
 (0)