[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-11-ge7dd1f7

2013-04-21 Thread David Paleino 
The following commit has been merged in the master branch:
commit fe59f45d6ceaa1be7a45c6992f607108a323577e
Author: David Paleino da...@debian.org
Date:   Sun Apr 21 10:27:29 2013 +0200

Adapt debian/rules get-orig-source target to new upstream layout

diff --git a/debian/changelog b/debian/changelog
index 41990ad..8697f14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ mapnik (2.0.1+ds1-1) UNRELEASED; urgency=low
 - 03-fix_ImportError_mips.patc, 03-fix_big-endian.patch and
   04-port_to_new_boost.patch removed
   * Python bindings testsuite temporarily disabled
+  * Adapt debian/rules get-orig-source target to new upstream layout
 
- -- David Paleino da...@debian.org  Fri, 25 May 2012 19:00:10 +0200
+ -- David Paleino da...@debian.org  Sun, 21 Apr 2013 10:27:11 +0200
 
 mapnik (2.0.0+ds1-3) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 82e9dcb..31573ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,9 +91,8 @@ get-orig-source:
tar xvf mapnik_$(UPVER).orig.tar.gz
@rm -vrf mapnik_$(UPVER).orig.tar.gz
@echo Removing third-party sources from orig.tar.gz
-   @rm -rf mapnik-mapnik-*/fonts/dejavu*
-   @rm -rf mapnik-mapnik-*/scons/
-   @rm -rf mapnik-mapnik-*/tinyxml/
-   tar cf $(TARNAME) mapnik-mapnik-*/
+   @rm -rf mapnik-$(UPVER)/fonts/dejavu*
+   @rm -rf mapnik-$(UPVER)/scons/
+   tar cf $(TARNAME) mapnik-$(UPVER)/
gzip -9 $(TARNAME)
-   rm -rf mapnik-mapnik-*/
+   rm -rf mapnik-$(UPVER)/

-- 
C++/Python toolkit for developing GIS applications

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-11-ge7dd1f7

2013-04-21 Thread David Paleino 
The following commit has been merged in the master branch:
commit e7dd1f7e08bfebb3621e4fe2a86b92cad9affb5d
Merge: fe59f45d6ceaa1be7a45c6992f607108a323577e 
df98083d654000aa3194bca0c1ee7ea6cc729a48
Author: David Paleino da...@debian.org
Date:   Sun Apr 21 10:29:43 2013 +0200

Merge branch 'master' of git+ssh://git.debian.org/git/pkg-grass/mapnik

Conflicts:
debian/changelog

diff --combined debian/changelog
index 8697f14,bdae036..21eaa27
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,6 +1,6 @@@
  mapnik (2.0.1+ds1-1) UNRELEASED; urgency=low
  
+   [ David Paleino ]
* New upstream version
* Switch debian/watch to github tags
* debian/patches/:
@@@ -7,9 -8,11 +8,12 @@@
  - 03-fix_ImportError_mips.patc, 03-fix_big-endian.patch and
04-port_to_new_boost.patch removed
* Python bindings testsuite temporarily disabled
 +  * Adapt debian/rules get-orig-source target to new upstream layout
  
-  -- David Paleino da...@debian.org  Sun, 21 Apr 2013 10:27:11 +0200
+   [ Andrew Harvey ]
+   * Change debian/rules to use top level font directory (Closes: 665798)
+ 
+  -- Andrew Harvey andrew.harv...@gmail.com  Sat, 04 Aug 2012 16:05:42 +1000
  
  mapnik (2.0.0+ds1-3) unstable; urgency=low
  
diff --combined debian/rules
index 31573ee,98703bf..8e5bc90
--- a/debian/rules
+++ b/debian/rules
@@@ -13,7 -13,7 +13,7 @@@ TARNAME := mapnik_$(UPVER)+ds1.orig.ta
  # scons flags
  SCONS_FLAGS := 
INPUT_PLUGINS=gdal,geos,kismet,ogr,osm,postgis,raster,rasterlite,shape,sqlite
  SCONS_FLAGS += PROJ_INCLUDES=/usr/include PROJ_LIBS=/usr/lib
- SCONS_FLAGS += SYSTEM_FONTS=/usr/share/fonts/truetype/ttf-dejavu
+ SCONS_FLAGS += SYSTEM_FONTS=/usr/share/fonts
  SCONS_FLAGS += XMLPARSER=libxml2
  SCONS_FLAGS += PREFIX=/usr LIB_DIR_NAME=/mapnik/2.0
  
@@@ -91,8 -91,9 +91,8 @@@ get-orig-source
tar xvf mapnik_$(UPVER).orig.tar.gz
@rm -vrf mapnik_$(UPVER).orig.tar.gz
@echo Removing third-party sources from orig.tar.gz
 -  @rm -rf mapnik-mapnik-*/fonts/dejavu*
 -  @rm -rf mapnik-mapnik-*/scons/
 -  @rm -rf mapnik-mapnik-*/tinyxml/
 -  tar cf $(TARNAME) mapnik-mapnik-*/
 +  @rm -rf mapnik-$(UPVER)/fonts/dejavu*
 +  @rm -rf mapnik-$(UPVER)/scons/
 +  tar cf $(TARNAME) mapnik-$(UPVER)/
gzip -9 $(TARNAME)
 -  rm -rf mapnik-mapnik-*/
 +  rm -rf mapnik-$(UPVER)/

-- 
C++/Python toolkit for developing GIS applications

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel