Skip to content

Commit

Permalink
apply r9875 to r9877 from trunk
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/branches/Version-1_0@9878 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Dec 20, 2008
1 parent 82bbd82 commit a3606d3
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 7 deletions.
6 changes: 6 additions & 0 deletions debian/changelog
@@ -1,3 +1,9 @@
qgis (1.0preview18) experimental; urgency=low

* add suggestion for gpsbabel

-- JÃŒrgen E. Fischer <jef@norbit.de> Sat, 20 Dec 2008 19:08:34 +0100

qgis (1.0preview17) experimental; urgency=low

* include quickprint and coordinate capture plugin
Expand Down
1 change: 1 addition & 0 deletions debian/control
Expand Up @@ -18,6 +18,7 @@ Package: qgis
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: qgis-plugin-grass, python-qgis
Suggests: gpsbabel
Conflicts: uim-qt3
Description: Geographic Information System (GIS)
A Geographic Information System (GIS) manages, analyzes, and displays
Expand Down
2 changes: 1 addition & 1 deletion debian/rules
Expand Up @@ -18,7 +18,7 @@ CMAKE_OPTS = \
-D CMAKE_INSTALL_PREFIX=/usr \
-D CMAKE_SKIP_RPATH=TRUE \
-D BINDINGS_GLOBAL_INSTALL=TRUE \
-D PEDANTIC=TRUE \
-D PEDANTIC=TRUE

ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
Expand Down
12 changes: 6 additions & 6 deletions src/app/composer/qgscomposer.cpp
Expand Up @@ -600,18 +600,18 @@ void QgsComposer::on_mActionExportAsSVG_activated( void )
m->setCheckBoxVisible( true );
m->setCheckBoxQSettingsLabel( myQSettingsLabel );
m->setMessageAsHtml( tr( "<p>The SVG export function in Qgis has several "
"problems due to bugs and deficiencies in the "
"problems due to bugs and deficiencies in the " )
#if QT_VERSION < 0x040300
"Qt4 svg code. Of note, text does not "
+ tr( "Qt4 svg code. Of note, text does not "
"appear in the SVG file and there are problems "
"with the map bounding box clipping other items "
"such as the legend or scale bar.</p>"
"such as the legend or scale bar.</p>" )
#else
"Qt4 svg code. In particular, there are problems "
+ tr( "Qt4 svg code. In particular, there are problems "
"with layers not being clipped to the map "
"bounding box.</p>"
"bounding box.</p>" )
#endif
"If you require a vector-based output file from "
+ tr( "If you require a vector-based output file from "
"Qgis it is suggested that you try printing "
"to PostScript if the SVG output is not "
"satisfactory."
Expand Down
2 changes: 2 additions & 0 deletions src/plugins/gps_importer/qgsgpsplugingui.cpp
Expand Up @@ -335,6 +335,8 @@ void QgsGPSPluginGui::populatePortComboBoxes()
break;
}

cmbDLPort->addItem( "usb:" );
cmbULPort->addItem( "usb:" );
#endif

#ifdef __FreeBSD__ // freebsd
Expand Down

0 comments on commit a3606d3

Please sign in to comment.