[QGIS Commit] r14096 - trunk/qgis/debian

svn_qgis at osgeo.org svn_qgis at osgeo.org
Tue Aug 17 01:19:56 EDT 2010


Author: jef
Date: 2010-08-17 05:19:56 +0000 (Tue, 17 Aug 2010)
New Revision: 14096

Modified:
   trunk/qgis/debian/changelog
   trunk/qgis/debian/control
   trunk/qgis/debian/control.hardy
   trunk/qgis/debian/control.intrepid
   trunk/qgis/debian/control.jaunty
   trunk/qgis/debian/control.karmic
   trunk/qgis/debian/control.lenny
   trunk/qgis/debian/control.lucid
   trunk/qgis/debian/control.maverick
   trunk/qgis/debian/control.sid
   trunk/qgis/debian/control.squeeze
Log:
fix r14087

Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog	2010-08-16 20:18:00 UTC (rev 14095)
+++ trunk/qgis/debian/changelog	2010-08-17 05:19:56 UTC (rev 14096)
@@ -4,9 +4,9 @@
   * qgis-plugin-grass-common breaks earlier versions of qgis-common: add
     control fields.
   * include displacementplugin plugin
-  * add svnversion as build dependency for trunk
+  * add subversion as build dependency for trunk
  
- -- Jürgen E. Fischer <jef at norbit.de>  Mon, 16 Aug 2010 09:11:29 +0200
+ -- Jürgen E. Fischer <jef at norbit.de>  Tue, 17 Aug 2010 07:18:01 +0200
 
 qgis (1.5.0) UNRELEASED; urgency=low
 

Modified: trunk/qgis/debian/control
===================================================================
--- trunk/qgis/debian/control	2010-08-16 20:18:00 UTC (rev 14095)
+++ trunk/qgis/debian/control	2010-08-17 05:19:56 UTC (rev 14096)
@@ -7,7 +7,7 @@
  flex, bison, python-dev, cmake (>= 2.6), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
  sip4 (>= 4.5), libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
  libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current

Modified: trunk/qgis/debian/control.hardy
===================================================================
--- trunk/qgis/debian/control.hardy	2010-08-16 20:18:00 UTC (rev 14095)
+++ trunk/qgis/debian/control.hardy	2010-08-17 05:19:56 UTC (rev 14096)
@@ -7,7 +7,7 @@
  flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
  sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, svnversion
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current

Modified: trunk/qgis/debian/control.intrepid
===================================================================
--- trunk/qgis/debian/control.intrepid	2010-08-16 20:18:00 UTC (rev 14095)
+++ trunk/qgis/debian/control.intrepid	2010-08-17 05:19:56 UTC (rev 14096)
@@ -7,7 +7,7 @@
  flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
  sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, svnversion
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current

Modified: trunk/qgis/debian/control.jaunty
===================================================================
--- trunk/qgis/debian/control.jaunty	2010-08-16 20:18:00 UTC (rev 14095)
+++ trunk/qgis/debian/control.jaunty	2010-08-17 05:19:56 UTC (rev 14096)
@@ -7,7 +7,7 @@
  flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
  sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, svnversion
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current

Modified: trunk/qgis/debian/control.karmic
===================================================================
--- trunk/qgis/debian/control.karmic	2010-08-16 20:18:00 UTC (rev 14095)
+++ trunk/qgis/debian/control.karmic	2010-08-17 05:19:56 UTC (rev 14096)
@@ -7,7 +7,7 @@
  flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
  sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, svnversion
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current

Modified: trunk/qgis/debian/control.lenny
===================================================================
--- trunk/qgis/debian/control.lenny	2010-08-16 20:18:00 UTC (rev 14095)
+++ trunk/qgis/debian/control.lenny	2010-08-17 05:19:56 UTC (rev 14096)
@@ -7,7 +7,7 @@
  flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
  sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, pkg-config, svnversion
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, pkg-config, subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current

Modified: trunk/qgis/debian/control.lucid
===================================================================
--- trunk/qgis/debian/control.lucid	2010-08-16 20:18:00 UTC (rev 14095)
+++ trunk/qgis/debian/control.lucid	2010-08-17 05:19:56 UTC (rev 14096)
@@ -7,7 +7,7 @@
  flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0), python-central (>=0.5), python,
  libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
  libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- python-sip-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev, svnversion
+ python-sip-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev, subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current

Modified: trunk/qgis/debian/control.maverick
===================================================================
--- trunk/qgis/debian/control.maverick	2010-08-16 20:18:00 UTC (rev 14095)
+++ trunk/qgis/debian/control.maverick	2010-08-17 05:19:56 UTC (rev 14096)
@@ -8,7 +8,7 @@
  libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
  libqt4-sql (>=4.4.0), libqtwebkit-dev,
  python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0), python-sip-dev (>= 4.5.0), pyqt4-dev-tools,
- libqwt5-qt4-dev, libspatialite-dev, svnversion
+ libqwt5-qt4-dev, libspatialite-dev, subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current

Modified: trunk/qgis/debian/control.sid
===================================================================
--- trunk/qgis/debian/control.sid	2010-08-16 20:18:00 UTC (rev 14095)
+++ trunk/qgis/debian/control.sid	2010-08-17 05:19:56 UTC (rev 14096)
@@ -8,7 +8,7 @@
  libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
  libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  python-sip-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev,
- pkg-config, svnversion
+ pkg-config, subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current

Modified: trunk/qgis/debian/control.squeeze
===================================================================
--- trunk/qgis/debian/control.squeeze	2010-08-16 20:18:00 UTC (rev 14095)
+++ trunk/qgis/debian/control.squeeze	2010-08-17 05:19:56 UTC (rev 14096)
@@ -8,7 +8,7 @@
  libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
  libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  python-sip-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev,
- pkg-config, svnversion
+ pkg-config, subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current



More information about the QGIS-commit mailing list