tags 356215 + patch
thanks
I've uploaded the following NMU to delayed-2.
diff -u qgis-0.7.4/debian/changelog qgis-0.7.4/debian/changelog
--- qgis-0.7.4/debian/changelog
+++ qgis-0.7.4/debian/changelog
@@ -1,3 +1,11 @@
+qgis (0.7.4-4.1) unstable; urgency=low
+
+ * NMU as part of the GCC 4.1 transition.
+ * patches/gcc41-extra-qualifications.dpatch: Update to remove two more
+ extra qualifications from C++ files (Closes: #356215)
+
+ -- Martin Michlmayr <[EMAIL PROTECTED]> Fri, 26 May 2006 23:57:18 +0200
+
qgis (0.7.4-4) unstable; urgency=low
* Apply patch for building with gcc 4.1 (Closes: #356215)
diff -u qgis-0.7.4/debian/patches/gcc41-extra-qualifications.dpatch
qgis-0.7.4/debian/patches/gcc41-extra-qualifications.dpatch
--- qgis-0.7.4/debian/patches/gcc41-extra-qualifications.dpatch
+++ qgis-0.7.4/debian/patches/gcc41-extra-qualifications.dpatch
@@ -84,0 +85,24 @@
+--- a/providers/gpx/qgsgpxprovider.h~ 2006-05-15 22:33:39.000000000 +0000
++++ b/providers/gpx/qgsgpxprovider.h 2006-05-15 22:33:43.000000000 +0000
+@@ -142,7 +142,7 @@
+ const std::map<QString, QString>& attrs);
+
+ /** Adds one feature (used by addFeatures()) */
+- bool QgsGPXProvider::addFeature(QgsFeature* f);
++ bool addFeature(QgsFeature* f);
+
+ /**Returns the default value for attribute @c attr for feature @c f. */
+ QString getDefaultValue(const QString& attr, QgsFeature* f);
+--- a/plugins/georeferencer/datapointacetate.h~ 2006-05-15
22:45:28.000000000 +0000
++++ b/plugins/georeferencer/datapointacetate.h 2006-05-15 22:45:41.000000000
+0000
+@@ -13,8 +13,7 @@
+ class DataPointAcetate : public QgsAcetateObject {
+ public:
+
+- DataPointAcetate::DataPointAcetate(const QgsPoint& pixelCoords,
+- const QgsPoint& mapCoords)
++ DataPointAcetate(const QgsPoint& pixelCoords, const QgsPoint& mapCoords)
+ // UGLY!
+ : QgsAcetateObject(const_cast<QgsPoint&>(pixelCoords)),
+ mCoords(mapCoords) {
+
--
Martin Michlmayr
http://www.cyrius.com/
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
