Skip to content

Commit 53cf3a3

Browse files
author
jef
committedDec 16, 2010
debian packaging fix: separate sql anywhere package, fix lenny build (Qt<4.5)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14924 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 88c72fe commit 53cf3a3

13 files changed

+57
-7
lines changed
 

‎debian/changelog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
qgis (1.7.0) UNRELEASED; urgency=low
22

33
* new development version after 1.7 branch
4-
* include sql anywhere plugin
4+
* add qgis-sqlanywhere1.7.0 package
55

6-
-- J�rgen E. Fischer <jef@norbit.de> Wed, 15 Dec 2010 23:49:44 +0100
6+
-- Jürgen E. Fischer <jef@norbit.de> Thu, 16 Dec 2010 02:08:04 +0100
77

88
qgis (1.6.0) UNRELEASED; urgency=low
99

‎debian/control.lenny

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,3 +172,12 @@ Description: Quantum GIS mapserver
172172
.
173173
This package contains the Quantum GIS mapserver.
174174

175+
Package: qgis-sqlanywhere{QGIS_ABI}
176+
Architecture: any
177+
Depends: ${shlibs:Depends}, ${misc:Depends}
178+
Description: Quantum GIS sql anywhere plugin and provider
179+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
180+
and display databases of geographic information.
181+
.
182+
This package contains the Quantum GIS sqlanywhere plugin and provider.
183+

‎debian/control.lucid

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,3 +173,12 @@ Description: Quantum GIS mapserver
173173
.
174174
This package contains the Quantum GIS mapserver.
175175

176+
Package: qgis-sqlanywhere{QGIS_ABI}
177+
Architecture: any
178+
Depends: ${shlibs:Depends}, ${misc:Depends}
179+
Description: Quantum GIS sql anywhere plugin and provider
180+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
181+
and display databases of geographic information.
182+
.
183+
This package contains the Quantum GIS sqlanywhere plugin and provider.
184+

‎debian/control.maverick

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,3 +174,12 @@ Description: Quantum GIS mapserver
174174
.
175175
This package contains the Quantum GIS mapserver.
176176

177+
Package: qgis-sqlanywhere{QGIS_ABI}
178+
Architecture: any
179+
Depends: ${shlibs:Depends}, ${misc:Depends}
180+
Description: Quantum GIS sql anywhere plugin and provider
181+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
182+
and display databases of geographic information.
183+
.
184+
This package contains the Quantum GIS sqlanywhere plugin and provider.
185+

‎debian/control.natty

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,3 +174,12 @@ Description: Quantum GIS mapserver
174174
.
175175
This package contains the Quantum GIS mapserver.
176176

177+
Package: qgis-sqlanywhere{QGIS_ABI}
178+
Architecture: any
179+
Depends: ${shlibs:Depends}, ${misc:Depends}
180+
Description: Quantum GIS sql anywhere plugin and provider
181+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
182+
and display databases of geographic information.
183+
.
184+
This package contains the Quantum GIS sqlanywhere plugin and provider.
185+

‎debian/control.squeeze

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,3 +173,12 @@ Description: Quantum GIS mapserver
173173
.
174174
This package contains the Quantum GIS mapserver.
175175

176+
Package: qgis-sqlanywhere{QGIS_ABI}
177+
Architecture: any
178+
Depends: ${shlibs:Depends}, ${misc:Depends}
179+
Description: Quantum GIS sql anywhere plugin and provider
180+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
181+
and display databases of geographic information.
182+
.
183+
This package contains the Quantum GIS sqlanywhere plugin and provider.
184+

‎debian/qgis-providers.install

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ usr/lib/qgis/plugins/libwmsprovider.so
77
usr/lib/qgis/plugins/libmemoryprovider.so
88
usr/lib/qgis/plugins/libspatialiteprovider.so
99
usr/lib/qgis/plugins/libosmprovider.so
10-
usr/lib/qgis/plugins/libsqlanywhereprovider.so

‎debian/qgis-sqlanywhere{QGIS_ABI}.install

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
usr/lib/qgis/plugins/libsqlanywhereplugin.so
2+
usr/lib/qgis/plugins/libsqlanywhereprovider.so
3+
usr/lib/libsqlanyconnection.so.{QGIS_ABI}

‎debian/qgis.install

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ usr/lib/qgis/plugins/librasterterrainplugin.so
1919
usr/lib/qgis/plugins/libspatialqueryplugin.so
2020
usr/lib/qgis/plugins/libdisplacementplugin.so
2121
usr/lib/qgis/plugins/libofflineeditingplugin.so
22-
usr/lib/qgis/plugins/libsqlanywhereplugin.so
2322
usr/share/pixmaps/qgis-icon.xpm
2423
usr/share/pixmaps/qgis-mime-icon.png
2524
usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes

‎src/analysis/raster/qgsrastercalclexer.ll

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
***************************************************************************/
1818

1919
%option noyywrap
20+
%option nounput
2021
%option case-insensitive
2122
%option never-interactive
2223

‎src/app/composer/qgscomposer.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,9 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
818818
//height in pixel
819819
int height = ( int )( mComposition->paperHeight() * mComposition->printResolution() / 25.4 );
820820
generator.setSize( QSize( width, height ) );
821+
#if QT_VERSION >= 0x040500
821822
generator.setViewBox( QRect( 0, 0, width, height ) );
823+
#endif
822824
generator.setResolution( mComposition->printResolution() ); //because the rendering is done in mm, convert the dpi
823825

824826
QPainter p( &generator );

‎src/gui/symbology-ng/qgsstylev2managerdialog.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* pa
2626

2727
setupUi( this );
2828

29+
#if QT_VERSION >= 0x40500
30+
tabItemType->setDocumentMode( true );
31+
#endif
32+
2933
// setup icons
3034
btnAddItem->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.png" ) ) );
3135
btnEditItem->setIcon( QIcon( QgsApplication::iconPath( "symbologyEdit.png" ) ) );

‎src/ui/qgsstylev2managerdialogbase.ui

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@
3131
<height>22</height>
3232
</size>
3333
</property>
34-
<property name="documentMode">
35-
<bool>true</bool>
36-
</property>
3734
<widget class="QWidget" name="tabMarker">
3835
<property name="sizePolicy">
3936
<sizepolicy hsizetype="Preferred" vsizetype="Ignored">

0 commit comments

Comments
 (0)