[DebianGIS-dev] r707 - packages/qgis/trunk/debian/patches

[Francesco Lovergine]

Author: frankie
Date: 2007-04-05 12:40:47 +0000 (Thu, 05 Apr 2007)
New Revision: 707

Modified:
   packages/qgis/trunk/debian/patches/gridmaker_bin.dpatch
Log:
Final fix for missing libraries linking


Modified: packages/qgis/trunk/debian/patches/gridmaker_bin.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/gridmaker_bin.dpatch	2007-04-05 10:50:25 UTC (rev 706)
+++ packages/qgis/trunk/debian/patches/gridmaker_bin.dpatch	2007-04-05 12:40:47 UTC (rev 707)
@@ -10,7 +10,7 @@
 @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
++++ qgis/src/plugins/grid_maker/Makefile.in	2007-04-05 14:40:07.000000000 +0200
 @@ -49,7 +49,7 @@
  POST_UNINSTALL = :
  build_triplet = @build@
@@ -20,9 +20,18 @@
  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 12:43:02.000000000 +0200
++++ qgis/src/plugins/grid_maker/dbfopen.c	2007-04-05 14:39:23.000000000 +0200
 @@ -125,9 +125,8 @@
  
  #include <math.h>
@@ -36,7 +45,7 @@
  #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
++++ qgis/src/plugins/grid_maker/main.cpp	2007-04-05 14:39:23.000000000 +0200
 @@ -9,6 +9,7 @@
  #include <QApplication>
  #include <QTranslator>
@@ -47,7 +56,7 @@
  {
 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
++++ 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>