[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 
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   Fri, 25 May 2012 19:00:10 +0200
+ -- David Paleino   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 
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   Sun, 21 Apr 2013 10:27:11 +0200
+   [ Andrew Harvey ]
+   * Change debian/rules to use top level font directory (Closes: 665798)
+ 
+  -- Andrew Harvey   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


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

2013-04-21 Thread David Paleino
The following commit has been merged in the master branch:
commit 242673f7e1e199bc9b073100df791f772a6b0382
Merge: e7dd1f7e08bfebb3621e4fe2a86b92cad9affb5d 
f5307a966fb88833eab150e51665264e513f96dd
Author: David Paleino 
Date:   Sun Apr 21 10:31:46 2013 +0200

Merge tag 'upstream/2.1.0+ds1'

Upstream version 2.1.0+ds1

# gpg: Signature made dom 21 apr 2013 10:31:39 CEST using DSA key ID 
1392B174
# gpg: Good signature from "David Paleino "
# gpg: aka "[jpeg image of size 6708]"
# gpg: aka "Hanska "
# gpg: aka "David Paleino "
# gpg: aka "David Paleino "


-- 
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-14-ga75401a

2013-04-21 Thread David Paleino
The following commit has been merged in the master branch:
commit a75401a76571d6526dc9245dd202b6bf79c1a2b5
Author: David Paleino 
Date:   Sun Apr 21 10:32:37 2013 +0200

New upstream version

diff --git a/debian/changelog b/debian/changelog
index 21eaa27..5cfe3c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mapnik (2.0.1+ds1-1) UNRELEASED; urgency=low
+mapnik (2.1.0+ds1-1) UNRELEASED; urgency=low
 
   [ David Paleino ]
   * New upstream version
@@ -13,7 +13,7 @@ mapnik (2.0.1+ds1-1) UNRELEASED; urgency=low
   [ Andrew Harvey ]
   * Change debian/rules to use top level font directory (Closes: 665798)
 
- -- Andrew Harvey   Sat, 04 Aug 2012 16:05:42 +1000
+ -- David Paleino   Sun, 21 Apr 2013 10:31:58 +0200
 
 mapnik (2.0.0+ds1-3) unstable; urgency=low
 

-- 
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, pristine-tar, updated. 7670164572aba9b6cb85629487ca960f2c2e242e

2013-04-21 Thread David Paleino
The following commit has been merged in the pristine-tar branch:
commit 7670164572aba9b6cb85629487ca960f2c2e242e
Author: David Paleino 
Date:   Sun Apr 21 10:31:39 2013 +0200

pristine-tar data for mapnik_2.1.0+ds1.orig.tar.gz

diff --git a/mapnik_2.1.0+ds1.orig.tar.gz.delta 
b/mapnik_2.1.0+ds1.orig.tar.gz.delta
new file mode 100644
index 000..77f90ba
Binary files /dev/null and b/mapnik_2.1.0+ds1.orig.tar.gz.delta differ
diff --git a/mapnik_2.1.0+ds1.orig.tar.gz.id b/mapnik_2.1.0+ds1.orig.tar.gz.id
new file mode 100644
index 000..07676f1
--- /dev/null
+++ b/mapnik_2.1.0+ds1.orig.tar.gz.id
@@ -0,0 +1 @@
+97c57037dd23264ac5732d61375844c86e516d0f

-- 
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 annotated tag, upstream/2.0.1+ds1, created. upstream/2.0.1+ds1

2013-04-21 Thread David Paleino
The annotated tag, upstream/2.0.1+ds1 has been created
at  70030f54820b9c25d8c3e006f7f03c413ad07cad (tag)
   tagging  56a51cad66cb0f3fde4076c41a6a0eed67815f60 (commit)
  replaces  upstream/2.0.0+ds1
 tagged by  David Paleino
on  Sun May 20 08:54:46 2012 +0200

- Shortlog 
Upstream version 2.0.1+ds1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEABECAAYFAk+4lTYACgkQ5qqQFxOSsXTdSACcCelNTjSSs+HaJ8gslzBPwe3k
Cj4AoJeA/h5Onhc5bTyschgwjTFImZVZ
=V5um
-END PGP SIGNATURE-

David Paleino (1):
  Imported Upstream version 2.0.1+ds1

---

-- 
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 annotated tag, upstream/2.1.0+ds1, created. upstream/2.1.0+ds1

2013-04-21 Thread David Paleino
The annotated tag, upstream/2.1.0+ds1 has been created
at  34e8ef823d189a98380f2fcd5405951662392ebd (tag)
   tagging  f5307a966fb88833eab150e51665264e513f96dd (commit)
  replaces  upstream/2.0.1+ds1
 tagged by  David Paleino
on  Sun Apr 21 10:31:39 2013 +0200

- Shortlog 
Upstream version 2.1.0+ds1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEABECAAYFAlFzo+sACgkQ5qqQFxOSsXRUOQCfUepv2qOpche1tGObcItd2zzY
4pEAni8dH1ecJfY7TvokFRsWdIKrR3sE
=rYkB
-END PGP SIGNATURE-

David Paleino (1):
  Imported Upstream version 2.1.0+ds1

---

-- 
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-19-g1769249

2013-04-21 Thread David Paleino
The following commit has been merged in the master branch:
commit 7829eec83a187329e73b2288d1650094388eea92
Author: David Paleino 
Date:   Sun Apr 21 10:36:34 2013 +0200

Build-Depends on libpng-dev instead of libpng12-dev (Closes: #662425)

diff --git a/debian/changelog b/debian/changelog
index 5cfe3c4..37454d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,11 +9,12 @@ mapnik (2.1.0+ds1-1) UNRELEASED; urgency=low
   04-port_to_new_boost.patch removed
   * Python bindings testsuite temporarily disabled
   * Adapt debian/rules get-orig-source target to new upstream layout
+  * Build-Depends on libpng-dev instead of libpng12-dev (Closes: #662425)
 
   [ Andrew Harvey ]
   * Change debian/rules to use top level font directory (Closes: 665798)
 
- -- David Paleino   Sun, 21 Apr 2013 10:31:58 +0200
+ -- David Paleino   Sun, 21 Apr 2013 10:36:14 +0200
 
 mapnik (2.0.0+ds1-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 2d4c1be..742ba86 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  , libboost-python-dev
  , libboost-system-dev
  , libboost-program-options-dev
- , libpng12-dev
+ , libpng-dev
  , libjpeg-dev
  , libtiff4-dev
  , zlib1g-dev

-- 
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-19-g1769249

2013-04-21 Thread David Paleino
The following commit has been merged in the master branch:
commit 6fa0e472c9142f108b389a68abc0f16e4edec686
Author: David Paleino 
Date:   Sun Apr 21 10:40:01 2013 +0200

Bump debhelper compatibility to 9

diff --git a/debian/changelog b/debian/changelog
index 37454d2..7e7a684 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,11 +10,12 @@ mapnik (2.1.0+ds1-1) UNRELEASED; urgency=low
   * Python bindings testsuite temporarily disabled
   * Adapt debian/rules get-orig-source target to new upstream layout
   * Build-Depends on libpng-dev instead of libpng12-dev (Closes: #662425)
+  * Bump debhelper compatibility to 9
 
   [ Andrew Harvey ]
   * Change debian/rules to use top level font directory (Closes: 665798)
 
- -- David Paleino   Sun, 21 Apr 2013 10:36:14 +0200
+ -- David Paleino   Sun, 21 Apr 2013 10:39:50 +0200
 
 mapnik (2.0.0+ds1-3) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 742ba86..641beec 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Debian OpenStreetMap Team 

  , Francesco Paolo Lovergine 
 Build-Depends:
  scons
- , debhelper (>= 8~)
+ , debhelper (>= 9~)
  , libtool
  , python-all-dev (>= 2.6.6-3~)
  , libboost-thread-dev

-- 
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-19-g1769249

2013-04-21 Thread David Paleino
The following commit has been merged in the master branch:
commit 3ade46f029260e730e8621132111fc51cabf1a72
Author: David Paleino 
Date:   Sun Apr 21 10:40:40 2013 +0200

Fix changelog

diff --git a/debian/changelog b/debian/changelog
index 7e7a684..c7d6ebd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 mapnik (2.1.0+ds1-1) UNRELEASED; urgency=low
 
+  [ Andrew Harvey ]
+  * Change debian/rules to use top level font directory (Closes: #665798)
+
   [ David Paleino ]
   * New upstream version
   * Switch debian/watch to github tags
@@ -12,9 +15,6 @@ mapnik (2.1.0+ds1-1) UNRELEASED; urgency=low
   * Build-Depends on libpng-dev instead of libpng12-dev (Closes: #662425)
   * Bump debhelper compatibility to 9
 
-  [ Andrew Harvey ]
-  * Change debian/rules to use top level font directory (Closes: 665798)
-
  -- David Paleino   Sun, 21 Apr 2013 10:39:50 +0200
 
 mapnik (2.0.0+ds1-3) unstable; urgency=low

-- 
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-19-g1769249

2013-04-21 Thread David Paleino
The following commit has been merged in the master branch:
commit b6599209a964d632b6833235bb7fdc90de2f4fa9
Author: David Paleino 
Date:   Sun Apr 21 10:41:02 2013 +0200

Bump Standards-Version to 3.9.4, no changes needed

diff --git a/debian/changelog b/debian/changelog
index c7d6ebd..7202ded 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,9 @@ mapnik (2.1.0+ds1-1) UNRELEASED; urgency=low
   * Adapt debian/rules get-orig-source target to new upstream layout
   * Build-Depends on libpng-dev instead of libpng12-dev (Closes: #662425)
   * Bump debhelper compatibility to 9
+  * Bump Standards-Version to 3.9.4, no changes needed
 
- -- David Paleino   Sun, 21 Apr 2013 10:39:50 +0200
+ -- David Paleino   Sun, 21 Apr 2013 10:40:52 +0200
 
 mapnik (2.0.0+ds1-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 641beec..820708c 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Build-Depends:
  , librasterlite-dev (>= 1.1~)
  , libgeos-dev
  , pkg-config
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Section: libs
 X-Python-Version: >= 2.5
 Homepage: http://www.mapnik.org/

-- 
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-19-g1769249

2013-04-21 Thread David Paleino
The following commit has been merged in the master branch:
commit 176924905d2c7afd0c3c2939eb4b5911e744ba7e
Author: David Paleino 
Date:   Sun Apr 21 10:43:23 2013 +0200

Add bug fixed by newer version

diff --git a/debian/changelog b/debian/changelog
index 7202ded..7c3c831 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ mapnik (2.1.0+ds1-1) UNRELEASED; urgency=low
 
   [ David Paleino ]
   * New upstream version
+- fixed compatibility with PostGIS 2.0 (AsBinary() → ST_AsBinary())
+  (Closes: #699079)
   * Switch debian/watch to github tags
   * debian/patches/:
 - 02-fix_FTBFS_binutils-gold.patch refreshed

-- 
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

Bug#701318: Not a mapnik bug

2013-04-21 Thread David Paleino
affects 695826 libmapnik2-2.0
block 701318 by 695826
thanks

Hello Matthias,

this really is a bug caused by Boost with the libc6 available in experimental.
Keeping this bug open just to track the progress with Boost.

David

-- 
 . ''`.   Debian developer | http://wiki.debian.org/DavidPaleino
 : :'  : Linuxer #334216 --|-- http://www.hanskalabs.net/
 `. `'`  GPG: 1392B174 | http://deb.li/dapal
   `-   2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174


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

Processed: Not a mapnik bug

2013-04-21 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

> affects 695826 libmapnik2-2.0
Bug #695826 [libboost1.49-dev] libboost1.49-dev: unable to compile applicatios 
using boost_thread
Added indication that 695826 affects libmapnik2-2.0
> block 701318 by 695826
Bug #701318 [src:mapnik] mapnik: ftbfs with GCC-4.8
701318 was not blocked by any bugs.
701318 was not blocking any bugs.
Added blocking bug(s) of 701318: 695826
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
695826: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695826
701318: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701318
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

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