Skip to content

Commit 69fdb04

Browse files
author
jef
committed
debian packaging update
git-svn-id: http://svn.osgeo.org/qgis/trunk@11854 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent da8e398 commit 69fdb04

File tree

9 files changed

+83
-26
lines changed

9 files changed

+83
-26
lines changed

debian/changelog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ qgis (1.4.0) UNRELEASED; urgency=low
33
* new development version after 1.3 branch
44
* use templates for configuration for ABIs and distributions
55
* policy updated to 3.8.3
6-
* remove README.Debian from libqgis{QGIS_ABI}-dev
6+
* remove README.Debian from libqgis-dev
77
* add symbol files for shared libraries
88
* shorten qgis.sh
99

debian/control.hardy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
99
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
1010
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
1111
libsm-dev, pyqt4-dev-tools
12-
Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
12+
Build-Conflicts: libqgis-dev, qgis-dev
1313
Standards-Version: 3.8.0
1414
XS-Python-Version: current
1515
Homepage: http://qgis.org/
@@ -50,7 +50,7 @@ Description: Quantum GIS - shared libraries
5050
This package contains the shared core and gui library that provide an
5151
interface for plugins and stand-alone applications.
5252

53-
Package: libqgis{QGIS_ABI}-dev
53+
Package: libqgis-dev
5454
Architecture: any
5555
Section: libdevel
5656
Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
@@ -59,8 +59,8 @@ Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
5959
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
6060
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
6161
qt4-designer (>=4.2.0)
62-
Provides: libqgis-dev, qgis-dev
63-
Replaces: libqgis-dev, qgis-dev, libqgis1-dev
62+
Provides: qgis-dev
63+
Replaces: qgis-dev, libqgis1-dev
6464
Description: Quantum GIS - development files
6565
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
6666
and display databases of geographic information.

debian/control.intrepid

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
99
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
1010
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
1111
libsm-dev, pyqt4-dev-tools
12-
Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
12+
Build-Conflicts: libqgis-dev, qgis-dev
1313
Standards-Version: 3.8.0
1414
XS-Python-Version: current
1515
Homepage: http://qgis.org/
@@ -50,7 +50,7 @@ Description: Quantum GIS - shared libraries
5050
This package contains the shared core and gui library that provide an
5151
interface for plugins and stand-alone applications.
5252

53-
Package: libqgis{QGIS_ABI}-dev
53+
Package: libqgis-dev
5454
Architecture: any
5555
Section: libdevel
5656
Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
@@ -59,7 +59,7 @@ Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
5959
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
6060
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
6161
qt4-designer (>=4.2.0)
62-
Provides: libqgis-dev, qgis-dev
62+
Provides: qgis-dev
6363
Replaces: libqgis-dev, qgis-dev, libqgis1-dev
6464
Description: Quantum GIS - development files
6565
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

debian/control.jaunty

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
99
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
1010
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
1111
libsm-dev, pyqt4-dev-tools
12-
Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
12+
Build-Conflicts: libqgis-dev, qgis-dev
1313
Standards-Version: 3.8.0
1414
XS-Python-Version: current
1515
Homepage: http://qgis.org/
@@ -50,7 +50,7 @@ Description: Quantum GIS - shared libraries
5050
This package contains the shared core and gui library that provide an
5151
interface for plugins and stand-alone applications.
5252

53-
Package: libqgis{QGIS_ABI}-dev
53+
Package: libqgis-dev
5454
Architecture: any
5555
Section: libdevel
5656
Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
@@ -59,8 +59,8 @@ Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
5959
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
6060
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
6161
qt4-designer (>=4.2.0)
62-
Provides: libqgis-dev, qgis-dev
63-
Replaces: libqgis-dev, qgis-dev, libqgis1-dev
62+
Provides: qgis-dev
63+
Replaces: qgis-dev, libqgis1-dev
6464
Description: Quantum GIS - development files
6565
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
6666
and display databases of geographic information.

debian/control.karmic

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
99
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
1010
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
1111
libsm-dev, pyqt4-dev-tools
12-
Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
12+
Build-Conflicts: libqgis-dev, qgis-dev
1313
Standards-Version: 3.8.0
1414
XS-Python-Version: current
1515
Homepage: http://qgis.org/
@@ -50,7 +50,7 @@ Description: Quantum GIS - shared libraries
5050
This package contains the shared core and gui library that provide an
5151
interface for plugins and stand-alone applications.
5252

53-
Package: libqgis{QGIS_ABI}-dev
53+
Package: libqgis-dev
5454
Architecture: any
5555
Section: libdevel
5656
Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
@@ -59,8 +59,8 @@ Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
5959
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
6060
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
6161
qt4-designer (>=4.2.0)
62-
Provides: libqgis-dev, qgis-dev
63-
Replaces: libqgis-dev, qgis-dev, libqgis1-dev
62+
Provides: qgis-dev
63+
Replaces: qgis-dev, libqgis1-dev
6464
Description: Quantum GIS - development files
6565
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
6666
and display databases of geographic information.

debian/control.lenny

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
99
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
1010
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
1111
libsm-dev, pyqt4-dev-tools
12-
Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
12+
Build-Conflicts: libqgis-dev, qgis-dev
1313
Standards-Version: 3.8.0
1414
XS-Python-Version: current
1515
Homepage: http://qgis.org/
@@ -50,7 +50,7 @@ Description: Quantum GIS - shared libraries
5050
This package contains the shared core and gui library that provide an
5151
interface for plugins and stand-alone applications.
5252

53-
Package: libqgis{QGIS_ABI}-dev
53+
Package: libqgis-dev
5454
Architecture: any
5555
Section: libdevel
5656
Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
@@ -59,8 +59,8 @@ Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
5959
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
6060
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
6161
qt4-designer (>=4.2.0)
62-
Provides: libqgis-dev, qgis-dev
63-
Replaces: libqgis-dev, qgis-dev, libqgis1-dev
62+
Provides: qgis-dev
63+
Replaces: qgis-dev, libqgis1-dev
6464
Description: Quantum GIS - development files
6565
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
6666
and display databases of geographic information.

debian/control.sid

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
99
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
1010
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
1111
libsm-dev, pyqt4-dev-tools
12-
Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
12+
Build-Conflicts: libqgis-dev, qgis-dev
1313
Standards-Version: 3.8.3
1414
XS-Python-Version: current
1515
Homepage: http://qgis.org/
@@ -50,7 +50,7 @@ Description: Quantum GIS - shared libraries
5050
This package contains the shared core and gui library that provide an
5151
interface for plugins and stand-alone applications.
5252

53-
Package: libqgis{QGIS_ABI}-dev
53+
Package: libqgis-dev
5454
Architecture: any
5555
Section: libdevel
5656
Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
@@ -59,8 +59,8 @@ Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
5959
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
6060
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
6161
qt4-designer (>=4.2.0)
62-
Provides: libqgis-dev, qgis-dev
63-
Replaces: libqgis-dev, qgis-dev, libqgis1-dev
62+
Provides: qgis-dev
63+
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
6464
Description: Quantum GIS - development files
6565
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
6666
and display databases of geographic information.
@@ -70,7 +70,7 @@ Description: Quantum GIS - development files
7070

7171
Package: qgis-plugin-grass
7272
Architecture: any
73-
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass, grass640-5
73+
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass, grass{GRASS_ABI}
7474
Description: GRASS plugin for Quantum GIS
7575
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
7676
and display databases of geographic information.

0 commit comments

Comments
 (0)