[DebianGIS-dev] r1028 - in packages/mapnik-viewer/debian: . patches

[pere at alioth.debian.org]

Author: pere
Date: 2007-08-08 12:12:29 +0000 (Wed, 08 Aug 2007)
New Revision: 1028

Modified:
   packages/mapnik-viewer/debian/control
   packages/mapnik-viewer/debian/patches/10_mapnik-0.4.0.dpatch
   packages/mapnik-viewer/debian/patches/20_freetype.dpatch
Log:
Get dpatching to work.

Modified: packages/mapnik-viewer/debian/control
===================================================================
--- packages/mapnik-viewer/debian/control	2007-08-08 12:08:20 UTC (rev 1027)
+++ packages/mapnik-viewer/debian/control	2007-08-08 12:12:29 UTC (rev 1028)
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Petter Reinholdtsen <pere at debian.org>
-Build-Depends: debhelper (>> 3.0.0), cdbs, qt4-dev-tools, libmapnik-dev, libboost-serialization-dev, libfreetype6-dev
+Build-Depends: debhelper (>> 3.0.0), cdbs, dpatch, qt4-dev-tools, libmapnik-dev, libboost-serialization-dev, libfreetype6-dev
 Standards-Version: 3.7.2
 
 Package: mapnik-viewer

Modified: packages/mapnik-viewer/debian/patches/10_mapnik-0.4.0.dpatch
===================================================================
--- packages/mapnik-viewer/debian/patches/10_mapnik-0.4.0.dpatch	2007-08-08 12:08:20 UTC (rev 1027)
+++ packages/mapnik-viewer/debian/patches/10_mapnik-0.4.0.dpatch	2007-08-08 12:12:29 UTC (rev 1028)
@@ -1,8 +1,9 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## foo.dpatch by  <pere at localhost>
+## 10_mapnik-0.4.0.dpatch by Petter Reinholdtsen <pere at hungry.com>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Comment out code needing newer version of mapnik than is
+## DP: currently in debian.
 
 @DPATCH@
 Index: mapnik-viewer/styles_model.cpp

Modified: packages/mapnik-viewer/debian/patches/20_freetype.dpatch
===================================================================
--- packages/mapnik-viewer/debian/patches/20_freetype.dpatch	2007-08-08 12:08:20 UTC (rev 1027)
+++ packages/mapnik-viewer/debian/patches/20_freetype.dpatch	2007-08-08 12:12:29 UTC (rev 1028)
@@ -1,7 +1,14 @@
-Index: viewer.pro
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_freetype.dpatch by Petter Reinholdtsen <pere at hungry.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use Debian include path for freetype
+
+ at DPATCH@
+Index: mapnik-viewer/viewer.pro
 ===================================================================
---- viewer.pro	(revision 499)
-+++ viewer.pro	(working copy)
+--- mapnik-viewer~/viewer.pro	(revision 499)
++++ mapnik-viewer/viewer.pro	(working copy)
 @@ -6,7 +6,8 @@
  
  INCLUDEPATH += /usr/local/include