Author: pere Date: 2007-08-08 12:08:20 +0000 (Wed, 08 Aug 2007) New Revision: 1027
Added: packages/mapnik-viewer/debian/patches/00list packages/mapnik-viewer/debian/patches/10_mapnik-0.4.0.dpatch packages/mapnik-viewer/debian/patches/20_freetype.dpatch Removed: packages/mapnik-viewer/debian/patches/foo.dpatch packages/mapnik-viewer/debian/patches/local.diff Log: Cleanup patching. Added: packages/mapnik-viewer/debian/patches/00list =================================================================== --- packages/mapnik-viewer/debian/patches/00list (rev 0) +++ packages/mapnik-viewer/debian/patches/00list 2007-08-08 12:08:20 UTC (rev 1027) @@ -0,0 +1,2 @@ +10_mapnik-0.4.0 +20_freetype Copied: packages/mapnik-viewer/debian/patches/10_mapnik-0.4.0.dpatch (from rev 1026, packages/mapnik-viewer/debian/patches/foo.dpatch) =================================================================== --- packages/mapnik-viewer/debian/patches/10_mapnik-0.4.0.dpatch (rev 0) +++ packages/mapnik-viewer/debian/patches/10_mapnik-0.4.0.dpatch 2007-08-08 12:08:20 UTC (rev 1027) @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## foo.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + [EMAIL PROTECTED]@ +Index: mapnik-viewer/styles_model.cpp +=================================================================== +--- mapnik-viewer~/styles_model.cpp (revision 499) ++++ mapnik-viewer/styles_model.cpp (working copy) +@@ -183,6 +183,7 @@ + : QAbstractItemModel(parent), + root_(new node(map_node(map))) + { ++#if 0 + typedef std::map<std::string,mapnik::feature_type_style> style_type; + style_type const & styles = map->styles(); + style_type::const_iterator itr = styles.begin(); +@@ -197,6 +198,7 @@ + style->add_child(new node(rule_node(QString("Rule"),*itr2),style)); + } + } ++#endif + } + + StyleModel::~StyleModel() {} Copied: packages/mapnik-viewer/debian/patches/20_freetype.dpatch (from rev 1026, packages/mapnik-viewer/debian/patches/local.diff) =================================================================== --- packages/mapnik-viewer/debian/patches/20_freetype.dpatch (rev 0) +++ packages/mapnik-viewer/debian/patches/20_freetype.dpatch 2007-08-08 12:08:20 UTC (rev 1027) @@ -0,0 +1,14 @@ +Index: viewer.pro +=================================================================== +--- viewer.pro (revision 499) ++++ viewer.pro (working copy) +@@ -6,7 +6,8 @@ + + INCLUDEPATH += /usr/local/include + INCLUDEPATH += /opt/boost_1_35/include/boost-1_35 +-INCLUDEPATH += /usr/local/include/freetype2 ++# The path reported from freetype-config --cflags ++INCLUDEPATH += /usr/include/freetype2 + + INCLUDEPATH += . + Deleted: packages/mapnik-viewer/debian/patches/foo.dpatch =================================================================== --- packages/mapnik-viewer/debian/patches/foo.dpatch 2007-08-08 12:05:37 UTC (rev 1026) +++ packages/mapnik-viewer/debian/patches/foo.dpatch 2007-08-08 12:08:20 UTC (rev 1027) @@ -1,27 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## foo.dpatch by <[EMAIL PROTECTED]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - [EMAIL PROTECTED]@ -Index: mapnik-viewer/styles_model.cpp -=================================================================== ---- mapnik-viewer~/styles_model.cpp (revision 499) -+++ mapnik-viewer/styles_model.cpp (working copy) -@@ -183,6 +183,7 @@ - : QAbstractItemModel(parent), - root_(new node(map_node(map))) - { -+#if 0 - typedef std::map<std::string,mapnik::feature_type_style> style_type; - style_type const & styles = map->styles(); - style_type::const_iterator itr = styles.begin(); -@@ -197,6 +198,7 @@ - style->add_child(new node(rule_node(QString("Rule"),*itr2),style)); - } - } -+#endif - } - - StyleModel::~StyleModel() {} Deleted: packages/mapnik-viewer/debian/patches/local.diff =================================================================== --- packages/mapnik-viewer/debian/patches/local.diff 2007-08-08 12:05:37 UTC (rev 1026) +++ packages/mapnik-viewer/debian/patches/local.diff 2007-08-08 12:08:20 UTC (rev 1027) @@ -1,14 +0,0 @@ -Index: viewer.pro -=================================================================== ---- viewer.pro (revision 499) -+++ viewer.pro (working copy) -@@ -6,7 +6,8 @@ - - INCLUDEPATH += /usr/local/include - INCLUDEPATH += /opt/boost_1_35/include/boost-1_35 --INCLUDEPATH += /usr/local/include/freetype2 -+# The path reported from freetype-config --cflags -+INCLUDEPATH += /usr/include/freetype2 - - INCLUDEPATH += . - _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel