[DebianGIS-dev] r713 - in packages/qgis/trunk/debian: . patches
Francesco Lovergine
frankie at alioth.debian.org
Thu Apr 5 16:29:47 UTC 2007
Author: frankie
Date: 2007-04-05 16:29:47 +0000 (Thu, 05 Apr 2007)
New Revision: 713
Removed:
packages/qgis/trunk/debian/patches/gcc41-extra-qualifications.dpatch
packages/qgis/trunk/debian/patches/ogr-path-fix.dpatch
packages/qgis/trunk/debian/patches/remove-empty-readme.dpatch
Modified:
packages/qgis/trunk/debian/qgis.install
Log:
Removing obsolete patches and updating qgis solib list.
Deleted: packages/qgis/trunk/debian/patches/gcc41-extra-qualifications.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/gcc41-extra-qualifications.dpatch 2007-04-05 14:14:14 UTC (rev 712)
+++ packages/qgis/trunk/debian/patches/gcc41-extra-qualifications.dpatch 2007-04-05 16:29:47 UTC (rev 713)
@@ -1,108 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## gcc41-extra-qualifications.dpatch by <debian at adkgis.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove extra qualifications so we can compile with gcc 4.1
-
- at DPATCH@
-diff -urNad qgis-0.7.4~/plugins/geoprocessing/qgsdlgpgbuffer.h qgis-0.7.4/plugins/geoprocessing/qgsdlgpgbuffer.h
---- qgis-0.7.4~/plugins/geoprocessing/qgsdlgpgbuffer.h 2006-08-19 22:17:21.000000000 -0400
-+++ qgis-0.7.4/plugins/geoprocessing/qgsdlgpgbuffer.h 2006-08-19 22:17:29.000000000 -0400
-@@ -29,7 +29,7 @@
- //! Constructor
- QgsDlgPgBuffer( QgisIface * _qI = 0, QWidget * parent = 0, const char *name = 0);
- //! Destructor
-- QgsDlgPgBuffer::~QgsDlgPgBuffer();
-+ ~QgsDlgPgBuffer();
- //! Set the information label in the dialog
- void setBufferLabel(QString & lbl);
- //! Get the buffer distance
-diff -urNad qgis-0.7.4~/plugins/georeferencer/datapointacetate.h qgis-0.7.4/plugins/georeferencer/datapointacetate.h
---- qgis-0.7.4~/plugins/georeferencer/datapointacetate.h 2005-05-01 16:23:17.000000000 -0400
-+++ qgis-0.7.4/plugins/georeferencer/datapointacetate.h 2006-08-19 22:23:15.000000000 -0400
-@@ -13,7 +13,7 @@
- class DataPointAcetate : public QgsAcetateObject {
- public:
-
-- DataPointAcetate::DataPointAcetate(const QgsPoint& pixelCoords,
-+ DataPointAcetate(const QgsPoint& pixelCoords,
- const QgsPoint& mapCoords)
- // UGLY!
- : QgsAcetateObject(const_cast<QgsPoint&>(pixelCoords)),
-diff -urNad qgis-0.7.4~/plugins/grid_maker/graticulecreator.h qgis-0.7.4/plugins/grid_maker/graticulecreator.h
---- qgis-0.7.4~/plugins/grid_maker/graticulecreator.h 2006-08-19 22:17:21.000000000 -0400
-+++ qgis-0.7.4/plugins/grid_maker/graticulecreator.h 2006-08-19 22:17:29.000000000 -0400
-@@ -19,8 +19,8 @@
- double theXEndPointDouble,
- double theYEndPointDouble);
- ~GraticuleCreator() {};
-- DBFHandle GraticuleCreator::createDbf (QString theDbfName ) ;
-- SHPHandle GraticuleCreator::createShapeFile(QString theFileName );
-+ DBFHandle createDbf (QString theDbfName ) ;
-+ SHPHandle createShapeFile(QString theFileName );
- void writeDbfRecord (DBFHandle theDbfHandle, int theRecordIdInt, QString theLabel) ;
- void writePoint(SHPHandle theShapeHandle, int theRecordInt, double theXDouble, double y );
- //! Writes a WGS 84 .prj file for the generated grid
-diff -urNad qgis-0.7.4~/providers/gpx/qgsgpxprovider.h qgis-0.7.4/providers/gpx/qgsgpxprovider.h
---- qgis-0.7.4~/providers/gpx/qgsgpxprovider.h 2005-02-11 18:36:49.000000000 -0500
-+++ qgis-0.7.4/providers/gpx/qgsgpxprovider.h 2006-08-19 22:22:21.000000000 -0400
-@@ -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);
-diff -urNad qgis-0.7.4~/src/qgslabel.h qgis-0.7.4/src/qgslabel.h
---- qgis-0.7.4~/src/qgslabel.h 2006-08-19 22:17:21.000000000 -0400
-+++ qgis-0.7.4/src/qgslabel.h 2006-08-19 22:17:29.000000000 -0400
-@@ -91,7 +91,7 @@
- void addRequiredFields ( std::list<int> *fields );
-
- //! Available vector fields
-- std::vector<QgsField> & QgsLabel::fields ( void );
-+ std::vector<QgsField> & fields ( void );
-
- //! Pointer to default attributes
- QgsLabelAttributes *layerAttributes ( void );
-diff -urNad qgis-0.7.4~/src/qgsproject.h qgis-0.7.4/src/qgsproject.h
---- qgis-0.7.4~/src/qgsproject.h 2006-08-19 22:17:21.000000000 -0400
-+++ qgis-0.7.4/src/qgsproject.h 2006-08-19 22:17:29.000000000 -0400
-@@ -95,9 +95,9 @@
- write()
- */
- //@{
-- bool QgsProject::dirty() const;
-+ bool dirty() const;
-
-- void QgsProject::dirty( bool b );
-+ void dirty( bool b );
- //@}
-
-
-diff -urNad qgis-0.7.4~/src/qgsprojectproperties.h qgis-0.7.4/src/qgsprojectproperties.h
---- qgis-0.7.4~/src/qgsprojectproperties.h 2006-08-19 22:17:21.000000000 -0400
-+++ qgis-0.7.4/src/qgsprojectproperties.h 2006-08-19 22:17:29.000000000 -0400
-@@ -60,7 +60,7 @@
- /*! Accessor for projection */
- QString projectionWKT();
- /*! Indicates that the projection switch is on */
-- bool QgsProjectProperties::isProjected();
-+ bool isProjected();
- public slots:
- /*!
- * Slot called when a new button (unit) is selected
-diff -urNad qgis-0.7.4~/src/qgsrasterlayerproperties.h qgis-0.7.4/src/qgsrasterlayerproperties.h
---- qgis-0.7.4~/src/qgsrasterlayerproperties.h 2006-08-19 22:17:21.000000000 -0400
-+++ qgis-0.7.4/src/qgsrasterlayerproperties.h 2006-08-19 22:17:29.000000000 -0400
-@@ -69,7 +69,7 @@
- /** \brief slot executed when the three band radio button is pressed. */
- void rbtnThreeBand_toggled( bool );
- /** \brief slot executed when user wishes to refresh raster histogram */
-- void QgsRasterLayerProperties::pbnHistRefresh_clicked();
-+ void pbnHistRefresh_clicked();
- /** Override the SRS specified when the layer was loaded */
- void pbnChangeSpatialRefSys_clicked();
-
Deleted: packages/qgis/trunk/debian/patches/ogr-path-fix.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/ogr-path-fix.dpatch 2007-04-05 14:14:14 UTC (rev 712)
+++ packages/qgis/trunk/debian/patches/ogr-path-fix.dpatch 2007-04-05 16:29:47 UTC (rev 713)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ogr-path-fix.dpatch by <debian at adkgis.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad qgis-0.7.4~/src/qgisapp.cpp qgis-0.7.4/src/qgisapp.cpp
---- qgis-0.7.4~/src/qgisapp.cpp 2005-11-01 19:59:37.000000000 -0500
-+++ qgis-0.7.4/src/qgisapp.cpp 2006-04-07 16:50:06.000000000 -0400
-@@ -1926,9 +1926,9 @@
- filename = openFileDialog->selectedFile();
- enc = openFileDialog->encoding();
-
-- settings.writeEntry("/qgis/UI//lastVectorFileFilter", openFileDialog->selectedFilter());
-+ settings.writeEntry("/qgis/UI/lastVectorFileFilter", openFileDialog->selectedFilter());
-
-- settings.writeEntry("/qgis/UI//lastVectorFileFilterDir", openFileDialog->dirPath());
-+ settings.writeEntry("/qgis/UI/lastVectorFileFilterDir", openFileDialog->dirPath());
- settings.writeEntry("/qgis/UI/encoding", openFileDialog->encoding());
-
- delete openFileDialog;
Deleted: packages/qgis/trunk/debian/patches/remove-empty-readme.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/remove-empty-readme.dpatch 2007-04-05 14:14:14 UTC (rev 712)
+++ packages/qgis/trunk/debian/patches/remove-empty-readme.dpatch 2007-04-05 16:29:47 UTC (rev 713)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## remove-empty-readme.dpatch by <debian at adkgis.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't install this README which essentially has nothing in it
-
- at DPATCH@
-diff -urNad qgis-0.7.4~/doc/Makefile.am qgis-0.7.4/doc/Makefile.am
---- qgis-0.7.4~/doc/Makefile.am 2006-04-08 17:03:34.000000000 -0400
-+++ qgis-0.7.4/doc/Makefile.am 2006-04-08 17:03:35.000000000 -0400
-@@ -18,7 +18,6 @@
- install.pdf \
- plugins \
- qgisdoc.css \
-- README \
- userguide.pdf
-
- # generated by ls -1 | sed -e '/CVS/d' -e '/Makefile/d' -e 's#\(.*\)# \1 \\#'
-diff -urNad qgis-0.7.4~/doc/Makefile.in qgis-0.7.4/doc/Makefile.in
---- qgis-0.7.4~/doc/Makefile.in 2006-04-08 17:03:34.000000000 -0400
-+++ qgis-0.7.4/doc/Makefile.in 2006-04-08 17:03:50.000000000 -0400
-@@ -222,7 +222,6 @@
- install.pdf \
- plugins \
- qgisdoc.css \
-- README \
- userguide.pdf
-
-
Modified: packages/qgis/trunk/debian/qgis.install
===================================================================
--- packages/qgis/trunk/debian/qgis.install 2007-04-05 14:14:14 UTC (rev 712)
+++ packages/qgis/trunk/debian/qgis.install 2007-04-05 16:29:47 UTC (rev 713)
@@ -1,19 +1,20 @@
usr/bin/gridmaker
usr/bin/qgis
usr/lib/qgis/copyrightlabelplugin.so
-usr/lib/qgis/delimitedtext*.so
+usr/lib/qgis/delimitedtextplugin.so
+usr/lib/qgis/delimitedtextprovider.so
usr/lib/qgis/georefplugin.so
usr/lib/qgis/gpsimporterplugin.so
usr/lib/qgis/gpxprovider.so
usr/lib/qgis/gridmakerplugin.so
usr/lib/qgis/libqgsprojectionselector.so
-usr/lib/qgis/libScaleBarplugin.so
usr/lib/qgis/northarrowplugin.so
usr/lib/qgis/ogrprovider.so
usr/lib/qgis/pggeoprocessingplugin.so
usr/lib/qgis/postgresprovider.so
+usr/lib/qgis/scalebarplugin.so
usr/lib/qgis/spitplugin.so
-usr/lib/qgis/designer/*.so
+usr/lib/qgis/wmsprovider.so
usr/share/doc/*
usr/share/man/*
usr/share/pixmaps/*
More information about the Pkg-grass-devel
mailing list