[DebianGIS-dev] r961 - in packages/qgis/trunk/debian: . patches

frankie at alioth.debian.org frankie at alioth.debian.org
Tue Jul 10 13:22:28 UTC 2007


Author: frankie
Date: 2007-07-10 13:22:27 +0000 (Tue, 10 Jul 2007)
New Revision: 961

Removed:
   packages/qgis/trunk/debian/patches/ax_python.dpatch
   packages/qgis/trunk/debian/patches/gcc43-fixes.dpatch
   packages/qgis/trunk/debian/patches/gridmaker_bin.dpatch
   packages/qgis/trunk/debian/patches/move-doc-dir.dpatch
Modified:
   packages/qgis/trunk/debian/changelog
   packages/qgis/trunk/debian/control
   packages/qgis/trunk/debian/patches/00list
   packages/qgis/trunk/debian/rules
Log:
Usual misc fixes


Modified: packages/qgis/trunk/debian/changelog
===================================================================
--- packages/qgis/trunk/debian/changelog	2007-07-04 18:24:16 UTC (rev 960)
+++ packages/qgis/trunk/debian/changelog	2007-07-10 13:22:27 UTC (rev 961)
@@ -8,8 +8,10 @@
     (closes: #429984)
   * Removed obsolete libmysqlclient14-dev build-dep.
   * Added a grid_maker patch to compile standalone binaries.
+  * Added a versioned explicit dependency on libqgis1 to avoid possible
+    breakages by mixing 0.8.0 and 0.8.1 stuff.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 29 Jun 2007 16:03:56 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 10 Jul 2007 15:20:59 +0200
 
 qgis (0.8.0-5) unstable; urgency=low
 

Modified: packages/qgis/trunk/debian/control
===================================================================
--- packages/qgis/trunk/debian/control	2007-07-04 18:24:16 UTC (rev 960)
+++ packages/qgis/trunk/debian/control	2007-07-10 13:22:27 UTC (rev 961)
@@ -11,7 +11,7 @@
 
 Package: qgis
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqgis1 (= ${Source-Version})
 Suggests: qgis-plugin-grass, python
 Description: Geographic Information System (GIS)
  A Geographic Information System (GIS) manages,

Modified: packages/qgis/trunk/debian/patches/00list
===================================================================
--- packages/qgis/trunk/debian/patches/00list	2007-07-04 18:24:16 UTC (rev 960)
+++ packages/qgis/trunk/debian/patches/00list	2007-07-10 13:22:27 UTC (rev 961)
@@ -1,7 +1,3 @@
 cmake
 georef
 grid_maker
-#move-doc-dir
-#gridmaker_bin
-#gcc43-fixes
-#ax_python

Deleted: packages/qgis/trunk/debian/patches/ax_python.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/ax_python.dpatch	2007-07-04 18:24:16 UTC (rev 960)
+++ packages/qgis/trunk/debian/patches/ax_python.dpatch	2007-07-10 13:22:27 UTC (rev 961)
@@ -1,36 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ax_python.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad qgis-0.8.0~/acinclude.m4 qgis-0.8.0/acinclude.m4
---- qgis-0.8.0~/acinclude.m4	2007-06-15 14:33:00.000000000 +0200
-+++ qgis-0.8.0/acinclude.m4	2007-06-20 16:42:41.000000000 +0200
-@@ -803,12 +803,15 @@
-    if test x$ax_python_lib = x; then
-       ax_python_lib=no
-    fi
-+
-+   python_version=`python -c 'import sys; print (sys.version)' 2>&1 | head -n 1 | cut -d ' ' -f 1 | cut -d . -f 1-2`
-+   ax_python_header=/usr/include/python$python_version
-+   ax_python_lib=python$python_version
-  
-    AC_MSG_RESULT([  results of the Python check:])
-    AC_MSG_RESULT([    Binary:      $ax_python_bin])
-    AC_MSG_RESULT([    Library:     $ax_python_lib])
-    AC_MSG_RESULT([    Include Dir: $ax_python_header])
--   AC_MSG_RESULT([    Have python: $ac_use_python])
-  
-    if test x$ax_python_header != xno; then
-      PYTHON_INCLUDE_DIR=-I$ax_python_header
-@@ -823,6 +826,8 @@
-     ac_use_python=yes
-     HAVE_PYTHON=-DHAVE_PYTHON
-   fi 
-+
-+   AC_MSG_RESULT([    Have python: $ac_use_python])
- fi
- 
- AM_CONDITIONAL([USE_PYTHON], [test "$ac_use_python" = "yes"])

Deleted: packages/qgis/trunk/debian/patches/gcc43-fixes.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/gcc43-fixes.dpatch	2007-07-04 18:24:16 UTC (rev 960)
+++ packages/qgis/trunk/debian/patches/gcc43-fixes.dpatch	2007-07-10 13:22:27 UTC (rev 961)
@@ -1,97 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## gcc43-fixes.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad qgis-0.8.0~/src/composer/qgscomposition.cpp qgis-0.8.0/src/composer/qgscomposition.cpp
---- qgis-0.8.0~/src/composer/qgscomposition.cpp	2006-12-08 05:26:10.000000000 +0100
-+++ qgis-0.8.0/src/composer/qgscomposition.cpp	2007-05-21 12:10:14.000000000 +0200
-@@ -30,7 +30,9 @@
- #include <QMatrix>
- #include <QMessageBox>
- 
-+#include <cstdlib>
- #include <iostream>
-+#include <typeinfo>
- 
- QgsCompositionPaper::QgsCompositionPaper ( QString name, int w, int h, bool c) 
-   :mName(name), mWidth(w), mHeight(h), mCustom(c)
-diff -urNad qgis-0.8.0~/src/core/qgslogger.h qgis-0.8.0/src/core/qgslogger.h
---- qgis-0.8.0~/src/core/qgslogger.h	2006-04-07 18:26:45.000000000 +0200
-+++ qgis-0.8.0/src/core/qgslogger.h	2007-05-21 12:09:35.000000000 +0200
-@@ -18,6 +18,7 @@
- #ifndef QGSLOGGER_H
- #define QGSLOGGER_H
- 
-+#include <cstdlib>
- #include <iostream>
- #include <sstream>
- #include <QString>
-diff -urNad qgis-0.8.0~/src/plugins/grass/qgsgrassmapcalc.cpp qgis-0.8.0/src/plugins/grass/qgsgrassmapcalc.cpp
---- qgis-0.8.0~/src/plugins/grass/qgsgrassmapcalc.cpp	2006-11-04 20:41:11.000000000 +0100
-+++ qgis-0.8.0/src/plugins/grass/qgsgrassmapcalc.cpp	2007-05-21 12:11:11.000000000 +0200
-@@ -13,6 +13,7 @@
-  *                                                                       *
-  *************************************************************************/
- #include <iostream>
-+#include <typeinfo>
- 
- #include <qapplication.h>
- #include <qstringlist.h>
-diff -urNad qgis-0.8.0~/src/plugins/grass/qgsgrassmodule.cpp qgis-0.8.0/src/plugins/grass/qgsgrassmodule.cpp
---- qgis-0.8.0~/src/plugins/grass/qgsgrassmodule.cpp	2006-12-20 02:47:44.000000000 +0100
-+++ qgis-0.8.0/src/plugins/grass/qgsgrassmodule.cpp	2007-05-21 12:11:35.000000000 +0200
-@@ -14,6 +14,7 @@
-  *                                                                         *
-  ***************************************************************************/
- #include <iostream>
-+#include <typeinfo>
- 
- #include <qapplication.h>
- #include <qdir.h>
-diff -urNad qgis-0.8.0~/src/providers/grass/qgsgrass.cpp qgis-0.8.0/src/providers/grass/qgsgrass.cpp
---- qgis-0.8.0~/src/providers/grass/qgsgrass.cpp	2006-12-24 22:56:43.000000000 +0100
-+++ qgis-0.8.0/src/providers/grass/qgsgrass.cpp	2007-05-21 12:08:56.000000000 +0200
-@@ -15,6 +15,7 @@
-  ***************************************************************************/
- /* $Id: qgsgrass.cpp 6290 2006-12-20 04:51:35Z telwertowski $ */
- 
-+#include <cstdlib>
- #include <iostream>
- 
- #include "qstring.h"
-diff -urNad qgis-0.8.0~/src/providers/postgres/qgspostgisbox2d.cpp qgis-0.8.0/src/providers/postgres/qgspostgisbox2d.cpp
---- qgis-0.8.0~/src/providers/postgres/qgspostgisbox2d.cpp	2006-03-03 21:38:20.000000000 +0100
-+++ qgis-0.8.0/src/providers/postgres/qgspostgisbox2d.cpp	2007-05-21 12:08:56.000000000 +0200
-@@ -17,6 +17,7 @@
-  ***************************************************************************/
- /* $Id: qgspostgisbox2d.cpp 4501 2006-01-08 01:17:57Z timlinux $ */
- 
-+#include <cstdlib>
- #include <fstream>
- 
- #include <qstring.h>
-diff -urNad qgis-0.8.0~/src/providers/postgres/qgspostgisbox3d.cpp qgis-0.8.0/src/providers/postgres/qgspostgisbox3d.cpp
---- qgis-0.8.0~/src/providers/postgres/qgspostgisbox3d.cpp	2006-03-03 21:38:20.000000000 +0100
-+++ qgis-0.8.0/src/providers/postgres/qgspostgisbox3d.cpp	2007-05-21 12:08:56.000000000 +0200
-@@ -17,6 +17,7 @@
-  ***************************************************************************/
- /* $Id: qgspostgisbox3d.cpp 4501 2006-01-08 01:17:57Z timlinux $ */
- 
-+#include <cstdlib>
- #include <fstream>
- 
- #include <qstring.h>
-diff -urNad qgis-0.8.0~/src/providers/postgres/qgspostgresextentthread.cpp qgis-0.8.0/src/providers/postgres/qgspostgresextentthread.cpp
---- qgis-0.8.0~/src/providers/postgres/qgspostgresextentthread.cpp	2006-03-03 21:38:20.000000000 +0100
-+++ qgis-0.8.0/src/providers/postgres/qgspostgresextentthread.cpp	2007-05-21 12:08:56.000000000 +0200
-@@ -17,6 +17,7 @@
-  ***************************************************************************/
- /* $Id: qgspostgresextentthread.cpp 4501 2006-01-08 01:17:57Z timlinux $ */
- 
-+#include <cstdlib>
- #include <fstream>
- #include <qevent.h>
- #include <qapplication.h>

Deleted: packages/qgis/trunk/debian/patches/gridmaker_bin.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/gridmaker_bin.dpatch	2007-07-04 18:24:16 UTC (rev 960)
+++ packages/qgis/trunk/debian/patches/gridmaker_bin.dpatch	2007-07-10 13:22:27 UTC (rev 961)
@@ -1,67 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## gridmaker_bin.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-## DP: Reintroduces gridmaker binary due to a fault in MING_FALSE definition for other platforms
-## DP: Also a few header #include directives miss in 3 different files
-##
-
- at DPATCH@
-diff -urNad qgis~/src/plugins/grid_maker/Makefile.in qgis/src/plugins/grid_maker/Makefile.in
---- qgis~/src/plugins/grid_maker/Makefile.in	2006-12-30 03:12:19.000000000 +0100
-+++ qgis/src/plugins/grid_maker/Makefile.in	2007-04-05 14:40:07.000000000 +0200
-@@ -49,7 +49,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
-- at MINGW_FALSE@bin_PROGRAMS = gridmaker$(EXEEXT)
-+bin_PROGRAMS = gridmaker$(EXEEXT)
- subdir = src/plugins/grid_maker
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -319,7 +319,7 @@
- 	plugingui.cpp \
- 	$(standalone_MOC) 
- 
--gridmaker_LDADD = $(QT_LDADD) 
-+gridmaker_LDADD = $(QT_LDADD) ../../core/libqgis_core.la ../../gui/libqgis_gui.la -lproj
- gridmaker_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
- gridmaker_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PKGDATAPATH) $(DEBUG_QGIS) -I../../gui -I../../ui -I../../core
- standalone_MOC = plugingui.moc.cpp 
-diff -urNad qgis~/src/plugins/grid_maker/dbfopen.c qgis/src/plugins/grid_maker/dbfopen.c
---- qgis~/src/plugins/grid_maker/dbfopen.c	2007-04-05 12:41:21.000000000 +0200
-+++ qgis/src/plugins/grid_maker/dbfopen.c	2007-04-05 14:39:23.000000000 +0200
-@@ -125,9 +125,8 @@
- 
- #include <math.h>
- #include <stdlib.h>
--#ifdef WIN32
- #include <string.h>
--#endif
-+
- typedef unsigned char uchar;
- 
- #ifndef FALSE
-diff -urNad qgis~/src/plugins/grid_maker/main.cpp qgis/src/plugins/grid_maker/main.cpp
---- qgis~/src/plugins/grid_maker/main.cpp	2007-04-05 12:41:33.000000000 +0200
-+++ qgis/src/plugins/grid_maker/main.cpp	2007-04-05 14:39:23.000000000 +0200
-@@ -9,6 +9,7 @@
- #include <QApplication>
- #include <QTranslator>
- #include <QString>
-+#include <QTextCodec>
- 
- int main(int argc, char *argv[])
- {
-diff -urNad qgis~/src/plugins/grid_maker/shpopen.c qgis/src/plugins/grid_maker/shpopen.c
---- qgis~/src/plugins/grid_maker/shpopen.c	2007-04-05 12:41:20.000000000 +0200
-+++ qgis/src/plugins/grid_maker/shpopen.c	2007-04-05 14:39:23.000000000 +0200
-@@ -137,6 +137,7 @@
- #include <limits.h>
- #include <assert.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- typedef unsigned char uchar;
- 

Deleted: packages/qgis/trunk/debian/patches/move-doc-dir.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/move-doc-dir.dpatch	2007-07-04 18:24:16 UTC (rev 960)
+++ packages/qgis/trunk/debian/patches/move-doc-dir.dpatch	2007-07-10 13:22:27 UTC (rev 961)
@@ -1,44 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## move-doc-dir.dpatch by  <debian at adkgis.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Install and access docs in /usr/share/doc/qgis to conform to
-## DP: policy.
-
- at DPATCH@
-diff -urNad qgis~/doc/Makefile.in qgis/doc/Makefile.in
---- qgis~/doc/Makefile.in	2007-04-04 14:16:22.000000000 +0200
-+++ qgis/doc/Makefile.in	2007-04-04 15:32:19.000000000 +0200
-@@ -239,7 +239,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--docdatadir = $(datadir)/$(PACKAGE)/doc
-+docdatadir = $(datadir)/doc/$(PACKAGE)/doc
- docdata_DATA = \
- 							 favicon.ico \
- 							 index.html \
-diff -urNad qgis~/doc/images/Makefile.in qgis/doc/images/Makefile.in
---- qgis~/doc/images/Makefile.in	2007-04-04 14:17:49.000000000 +0200
-+++ qgis/doc/images/Makefile.in	2007-04-04 15:34:11.000000000 +0200
-@@ -230,7 +230,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--docdatadir = $(datadir)/$(PACKAGE)/doc/images
-+docdatadir = $(datadir)/doc/$(PACKAGE)/doc/images
- docdata_DATA = qgis_new_80pct.png
- 
- # generated by ls -1 | sed -e '/CVS/d' -e '/Makefile/d' -e 's#\(.*\)#     \1 \\#'
-diff -urNad qgis~/doc/install_guide/Makefile.in qgis/doc/install_guide/Makefile.in
---- qgis~/doc/install_guide/Makefile.in	2007-04-04 14:16:22.000000000 +0200
-+++ qgis/doc/install_guide/Makefile.in	2007-04-04 15:33:51.000000000 +0200
-@@ -230,7 +230,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--docdatadir = $(datadir)/$(PACKAGE)/doc/install_guide
-+docdatadir = $(datadir)/doc/$(PACKAGE)/doc/install_guide
- # The files needed for the doc install have to be manually added here and
- # the next section enabled when doing a make dist or make release
- docdata_DATA = #contents.png \

Modified: packages/qgis/trunk/debian/rules
===================================================================
--- packages/qgis/trunk/debian/rules	2007-07-04 18:24:16 UTC (rev 960)
+++ packages/qgis/trunk/debian/rules	2007-07-10 13:22:27 UTC (rev 961)
@@ -28,17 +28,6 @@
 CMakeCache.txt: CMakeLists.txt
 	dh_testdir
 	# Add here commands to configure the package.
-#	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-                    --prefix=/usr \
-                    --mandir=\$${prefix}/share/man \
-                    --infodir=\$${prefix}/share/info \
-                    --with-qtdir=/usr/share/qt4 \
-                    --enable-spit \
-                    --with-postgresql \
-                    --with-grass=/usr/lib/grass \
-		    --with-wfs \
-		    --with-python \
-                    --disable-debug
 	uudecode -o $(CURDIR)/src/plugins/georeferencer/pencil.png $(CURDIR)/debian/pencil.uu
 	cmake -D CMAKE_INSTALL_PREFIX=/usr .
 
@@ -49,7 +38,6 @@
 
 	# Add here commands to compile the package.
 	$(MAKE)
-	#/usr/bin/docbook-to-man debian/qgis.sgml > qgis.1
 
 	touch build-stamp
 
@@ -64,14 +52,6 @@
 	# Add here commands to clean up after the build process.
 	-$(MAKE) clean
 
-#ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-#	cp -f /usr/share/misc/config.sub config.sub
-#endif
-#ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-#	cp -f /usr/share/misc/config.guess config.guess
-#endif
-#	rm -f config.status config.log
-
 	rm -f CMakeCache.txt
 	rm -f $(CURDIR)/src/plugins/georeferencer/pencil.png
 




More information about the Pkg-grass-devel mailing list