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

[Francesco Lovergine]

Author: frankie
Date: 2007-04-05 10:50:25 +0000 (Thu, 05 Apr 2007)
New Revision: 706

Added:
   packages/qgis/trunk/debian/patches/gridmaker_bin.dpatch
Modified:
   packages/qgis/trunk/debian/changelog
   packages/qgis/trunk/debian/compat
   packages/qgis/trunk/debian/control
   packages/qgis/trunk/debian/patches/00list
   packages/qgis/trunk/debian/rules
Log:
Fixing some sytax errors in 0.8


Modified: packages/qgis/trunk/debian/changelog
===================================================================
--- packages/qgis/trunk/debian/changelog	2007-04-04 18:37:20 UTC (rev 705)
+++ packages/qgis/trunk/debian/changelog	2007-04-05 10:50:25 UTC (rev 706)
@@ -2,6 +2,7 @@
 
   * New upstream release.
   * Patchset updated.
+    New patch: gridmaker_bin to generate gridmaker binary as it should (?). 
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Wed,  4 Apr 2007 14:19:48 +0200
 

Modified: packages/qgis/trunk/debian/compat
===================================================================
--- packages/qgis/trunk/debian/compat	2007-04-04 18:37:20 UTC (rev 705)
+++ packages/qgis/trunk/debian/compat	2007-04-05 10:50:25 UTC (rev 706)
@@ -1 +1 @@
-4
+5

Modified: packages/qgis/trunk/debian/control
===================================================================
--- packages/qgis/trunk/debian/control	2007-04-04 18:37:20 UTC (rev 705)
+++ packages/qgis/trunk/debian/control	2007-04-05 10:50:25 UTC (rev 706)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libgdal1-dev, libqt3-mt-dev (>= 3:3.2.1-6), libqt3-compat-headers (>= 3:3.2.3-2), libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1-1), dpatch, grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libmysqlclient15-dev | libmysqlclient14-dev
+Build-Depends: debhelper (>= 5.0.0), libgdal1-dev, libqt4-dev, libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1-1), dpatch, grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libmysqlclient15-dev | libmysqlclient14-dev
 Standards-Version: 3.7.2
 
 Package: qgis

Modified: packages/qgis/trunk/debian/patches/00list
===================================================================
--- packages/qgis/trunk/debian/patches/00list	2007-04-04 18:37:20 UTC (rev 705)
+++ packages/qgis/trunk/debian/patches/00list	2007-04-05 10:50:25 UTC (rev 706)
@@ -2,4 +2,4 @@
 move-doc-dir
 #remove-empty-readme
 #ogr-path-fix
-
+gridmaker_bin

Added: packages/qgis/trunk/debian/patches/gridmaker_bin.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/gridmaker_bin.dpatch	2007-04-04 18:37:20 UTC (rev 705)
+++ packages/qgis/trunk/debian/patches/gridmaker_bin.dpatch	2007-04-05 10:50:25 UTC (rev 706)
@@ -0,0 +1,58 @@
+#! /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 12:42:35.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
+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 12:43:02.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 12:42:50.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 12:43:14.000000000 +0200
+@@ -137,6 +137,7 @@
+ #include <limits.h>
+ #include <assert.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ typedef unsigned char uchar;
+ 


Property changes on: packages/qgis/trunk/debian/patches/gridmaker_bin.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/qgis/trunk/debian/rules
===================================================================
--- packages/qgis/trunk/debian/rules	2007-04-04 18:37:20 UTC (rev 705)
+++ packages/qgis/trunk/debian/rules	2007-04-05 10:50:25 UTC (rev 706)
@@ -32,7 +32,7 @@
                     --prefix=/usr \
                     --mandir=\$${prefix}/share/man \
                     --infodir=\$${prefix}/share/info \
-                    --with-qtdir=/usr/share/qt3 \
+                    --with-qtdir=/usr/share/qt4 \
                     --enable-spit \
                     --with-postgresql \
                     --with-grass=/usr/lib/grass \