apply r9875 to r9877 from trunk

jef · jef · commit a3606d323217 · 2008-12-20T19:33:41.000Z
git-svn-id: http://svn.osgeo.org/qgis/branches/Version-1_0@9878 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/debian/changelog b/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
diff --git a/debian/control b/debian/control
@@ -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
diff --git a/debian/rules b/debian/rules
@@ -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
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -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."
diff --git a/src/plugins/gps_importer/qgsgpsplugingui.cpp b/src/plugins/gps_importer/qgsgpsplugingui.cpp
@@ -335,6 +335,8 @@ void QgsGPSPluginGui::populatePortComboBoxes()
       break;
   }
 
+  cmbDLPort->addItem( "usb:" );
+  cmbULPort->addItem( "usb:" );
 #endif
 
 #ifdef __FreeBSD__ // freebsd

Original file line number	Diff line number	Diff line change
`@@ -335,6 +335,8 @@ void QgsGPSPluginGui::populatePortComboBoxes()`
`335`	`335`	`break;`
`336`	`336`	`}`
`337`	`337`
	`338`	`+ cmbDLPort->addItem( "usb:" );`
	`339`	`+ cmbULPort->addItem( "usb:" );`
`338`	`340`	`#endif`
`339`	`341`
`340`	`342`	`#ifdef __FreeBSD__ // freebsd`