Skip to content

Commit 8f46f35

Browse files
author
jef
committedAug 17, 2010
fix r14087
git-svn-id: http://svn.osgeo.org/qgis/trunk@14096 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent cd32e63 commit 8f46f35

File tree

11 files changed

+12
-12
lines changed

11 files changed

+12
-12
lines changed
 

‎debian/changelog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ qgis (1.6.0) UNRELEASED; urgency=low
44
* qgis-plugin-grass-common breaks earlier versions of qgis-common: add
55
control fields.
66
* include displacementplugin plugin
7-
* add svnversion as build dependency for trunk
7+
* add subversion as build dependency for trunk
88

9-
-- Jürgen E. Fischer <jef@norbit.de> Mon, 16 Aug 2010 09:11:29 +0200
9+
-- Jürgen E. Fischer <jef@norbit.de> Tue, 17 Aug 2010 07:18:01 +0200
1010

1111
qgis (1.5.0) UNRELEASED; urgency=low
1212

‎debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
77
flex, bison, python-dev, cmake (>= 2.6), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
88
sip4 (>= 4.5), libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
99
libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
10-
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev
10+
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, subversion
1111
Build-Conflicts: libqgis-dev, qgis-dev
1212
Standards-Version: 3.8.4
1313
XS-Python-Version: current

‎debian/control.hardy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
77
flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
88
sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
99
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
10-
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, svnversion
10+
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, subversion
1111
Build-Conflicts: libqgis-dev, qgis-dev
1212
Standards-Version: 3.8.0
1313
XS-Python-Version: current

‎debian/control.intrepid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
77
flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
88
sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
99
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
10-
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, svnversion
10+
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, subversion
1111
Build-Conflicts: libqgis-dev, qgis-dev
1212
Standards-Version: 3.8.0
1313
XS-Python-Version: current

‎debian/control.jaunty

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
77
flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
88
sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
99
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
10-
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, svnversion
10+
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, subversion
1111
Build-Conflicts: libqgis-dev, qgis-dev
1212
Standards-Version: 3.8.0
1313
XS-Python-Version: current

‎debian/control.karmic

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
77
flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
88
sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
99
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
10-
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, svnversion
10+
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, subversion
1111
Build-Conflicts: libqgis-dev, qgis-dev
1212
Standards-Version: 3.8.0
1313
XS-Python-Version: current

‎debian/control.lenny

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
77
flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
88
sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
99
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
10-
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, pkg-config, svnversion
10+
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, pkg-config, subversion
1111
Build-Conflicts: libqgis-dev, qgis-dev
1212
Standards-Version: 3.8.0
1313
XS-Python-Version: current

‎debian/control.lucid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev,
77
flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0), python-central (>=0.5), python,
88
libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
99
libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
10-
python-sip-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev, svnversion
10+
python-sip-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev, subversion
1111
Build-Conflicts: libqgis-dev, qgis-dev
1212
Standards-Version: 3.8.4
1313
XS-Python-Version: current

‎debian/control.maverick

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev,
88
libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
99
libqt4-sql (>=4.4.0), libqtwebkit-dev,
1010
python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0), python-sip-dev (>= 4.5.0), pyqt4-dev-tools,
11-
libqwt5-qt4-dev, libspatialite-dev, svnversion
11+
libqwt5-qt4-dev, libspatialite-dev, subversion
1212
Build-Conflicts: libqgis-dev, qgis-dev
1313
Standards-Version: 3.8.4
1414
XS-Python-Version: current

‎debian/control.sid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev,
88
libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
99
libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
1010
python-sip-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev,
11-
pkg-config, svnversion
11+
pkg-config, subversion
1212
Build-Conflicts: libqgis-dev, qgis-dev
1313
Standards-Version: 3.8.4
1414
XS-Python-Version: current

‎debian/control.squeeze

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev,
88
libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
99
libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
1010
python-sip-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev,
11-
pkg-config, svnversion
11+
pkg-config, subversion
1212
Build-Conflicts: libqgis-dev, qgis-dev
1313
Standards-Version: 3.8.4
1414
XS-Python-Version: current

0 commit comments

Comments
 (0)
Please sign in to comment.