[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-8-gbec5544
The following commit has been merged in the master branch:
commit 74e961dffdba938237d0dfc2bb7185bab5fd92e3
Author: David Paleino da...@debian.org
Date: Tue Nov 10 13:31:04 2009 +0100
debian/rules: rewritten to use dh7
diff --git a/debian/changelog b/debian/changelog
index 50b6c70..2a42b0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,13 +13,15 @@ mapnik (0.6.1-2) UNRELEASED; urgency=low
- added quilt Build-Dependency
- remove duplicate Section in libmapnik0.6
* debian/watch updated to use new url
- * debian/rules: added quilt infrastructure
+ * debian/rules:
+- added quilt infrastructure
+- rewritten to use dh7
* debian/patches/01-fix_deprecated_includes.patch added
* debian/copyright, substitute (C) with © to make lintian happy
* debian/mapnik-doc.doc-base added
* debian/libmapnik-dev.dirs added
- -- David Paleino da...@debian.org Tue, 10 Nov 2009 13:30:23 +0100
+ -- David Paleino da...@debian.org Tue, 10 Nov 2009 13:30:41 +0100
mapnik (0.6.1-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 959d170..bf41483 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,5 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -17,96 +12,45 @@
SCONS_FLAGS=INPUT_PLUGINS=raster,sqlite,postgis,ogr,shape,osm,gdal,kismet PROJ_I
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
+ export CFLAGS += -O0
else
- CFLAGS += -O2
+ export CFLAGS += -O2
endif
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- python scons/scons.py configure $(SCONS_FLAGS)
- touch configure-stamp
+override_dh_auto_configure:
+ python scons/scons.py configure $(SCONS_FLAGS) $(CFLAGS)
+ dh_auto_configure
-
-build: build-stamp
-build-stamp: configure-stamp $(QUILT_STAMPFN)
- dh_testdir
-
- # Add here commands to compile the package.
+override_dh_auto_build:
python scons/scons.py
# We don't provide pkg-config files so this Makefile is just confusing
# when installed as a demo
- rm -f demo/c++/Makefile
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
+ #rm -f demo/c++/Makefile
+ dh_auto_build
- # Add here commands to clean up after the build process.
+override_dh_auto_clean:
python scons/scons.py --clean
- rm -rf .sconf_temp
find -name '*.pyc' -exec rm -f {} \;
- rm -f config.log bindings/python/mapnik/paths.py
find -name '.sconsign*' -exec rm -f {} \;
find -name '*.o' -exec rm -f {} \;
- rm -f utils/shapeindex/shapeindex
- rm -f config.py config.cache
+ rm -rf .sconf_temp config.log bindings/python/mapnik/paths.py \
+ utils/shapeindex/shapeindex config.py config.cache
# Lintian fix
chmod -x demo/viewer/images/*.png
bindings/python/mapnik/ogcserver/modserver.py
- dh_clean
+ dh_auto_clean
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp
+override_dh_auto_install:
python scons/scons.py install
- find $(CURDIR)/debian/tmp -name '.sconsign' -exec rm -f {} \;
- install -d $(CURDIR)/debian/tmp/usr/bin
+ find $(CURDIR)/debian/tmp -name '.sconsign' -delete
+ find $(CURDIR)/debian/tmp -wholename 'c++/Makefile' -delete
install -m 0755 debian/mapnik-plugin-base $(CURDIR)/debian/tmp/usr/bin
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
+override_dh_installexamples:
dh_installexamples -Xdata/new
- dh_install --sourcedir=debian/tmp
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
- dh_pycentral
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-8-gbec5544
The following commit has been merged in the master branch: commit bec55442f48d9da0939e6f15d754f736791e6566 Author: David Paleino da...@debian.org Date: Wed Nov 11 00:41:56 2009 +0100 Add --with quilt to dh7 debian/rules diff --git a/debian/rules b/debian/rules index bf41483..c03c681 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,7 @@ override_dh_auto_build: # We don't provide pkg-config files so this Makefile is just confusing # when installed as a demo #rm -f demo/c++/Makefile - dh_auto_build + dh_auto_build --with quilt override_dh_auto_clean: python scons/scons.py --clean @@ -39,7 +39,7 @@ override_dh_auto_clean: # Lintian fix chmod -x demo/viewer/images/*.png bindings/python/mapnik/ogcserver/modserver.py - dh_auto_clean + dh_auto_clean --with quilt override_dh_auto_install: python scons/scons.py install @@ -53,4 +53,4 @@ override_dh_installexamples: %: # dh_installexamples -Xdata/new # dh_install --sourcedir=debian/tmp - dh $@ + dh --with quilt $@ -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. upstream/0.0.svn18009-14-gd76e942
The following commit has been merged in the master branch: commit 628cc007bc41beca00ac54dceff594fdd163dd10 Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Sun Dec 6 21:25:25 2009 +0100 d/ch: added list of new plugins diff --git a/debian/changelog b/debian/changelog index aa02323..45892ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,17 @@ josm-plugins (0.0.svn18885-1) UNRELEASED; urgency=low [ Giovanni Mascellani ] * Updated to revision 18885 (synchronized with josm) + * Added plugins: ++ cadastre-fr - A special handler for the French land registry WMS + server (closes: #555723) ++ DirectUpload - Directly uploads GPS Traces from current active + layer in JOSM to openstreetmap.org ++ editgpx - Anonymizes timestamps and deletes parts of huge GPX tracks + very fast ++ lakewalker - Helps vectorizing WMS images ++ routing - Provides routing capabilities - -- Giovanni Mascellani mascell...@poisson.phc.unipi.it Sat, 05 Dec 2009 01:00:12 +0100 + -- Giovanni Mascellani mascell...@poisson.phc.unipi.it Sun, 06 Dec 2009 21:21:06 +0100 josm-plugins (0.0.svn18009-1) unstable; urgency=low -- Plugins for josm ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. upstream/0.0.svn18009-14-gd76e942
The following commit has been merged in the master branch:
commit d76e94205f1dba31196294797f983d07a3a5fa94
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Sun Dec 6 21:52:54 2009 +0100
Added new dependencies (for routing plugin)
diff --git a/debian/control b/debian/control
index c2aef3a..1901662 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,9 @@ Uploaders: Giovanni Mascellani
mascell...@poisson.phc.unipi.it,
Andreas Putzo andr...@putzo.net,
David Paleino da...@debian.org
Build-Depends: ant, cdbs, dpatch, debhelper (= 5), default-jdk,
- josm (= 0.0.svn2255), libmetadata-extractor-java
-Build-Conflicts: josm (= 0.0.svn2256)
+ josm (= 0.0.svn2561), libmetadata-extractor-java, liblog4j1.2-java,
+ libjgrapht0.7-java
+Build-Conflicts: josm (= 0.0.svn2562)
Standards-Version: 3.8.3
Homepage: http://josm.openstreetmap.de/wiki/Plugins
Vcs-Git: git://git.debian.org/pkg-grass/josm-plugins.git
@@ -15,8 +16,8 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-grass/josm-plugins.git
Package: josm-plugins
Architecture: all
-Depends: josm (= 0.0.svn2255), libmetadata-extractor-java, ${misc:Depends}
-Conflicts: josm (= 0.0.svn2256)
+Depends: josm (= 0.0.svn2561), libmetadata-extractor-java, ${misc:Depends}
+Conflicts: josm (= 0.0.svn2562)
Suggests: gpsd
Description: Plugins for JOSM
JOSM (Java OpenStreetMap) plugin collection.
--
Plugins for josm
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. upstream/0.0.svn18009-16-gf4340d9
The following commit has been merged in the master branch:
commit 8e6a7c594d02a915684f6e5c22c436a6cbce96ca
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Sun Dec 6 22:21:04 2009 +0100
Dependencies for routing plugin fixed
diff --git a/debian/control b/debian/control
index 1901662..4d39323 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,8 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-grass/josm-plugins.git
Package: josm-plugins
Architecture: all
-Depends: josm (= 0.0.svn2561), libmetadata-extractor-java, ${misc:Depends}
+Depends: josm (= 0.0.svn2561), libmetadata-extractor-java, ${misc:Depends},
+ liblog4j1.2-java, libjgrapht0.7-java
Conflicts: josm (= 0.0.svn2562)
Suggests: gpsd
Description: Plugins for JOSM
diff --git a/debian/patches/150_routing.dpatch
b/debian/patches/150_routing.dpatch
index ad16e67..80eb74a 100755
--- a/debian/patches/150_routing.dpatch
+++ b/debian/patches/150_routing.dpatch
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad josm-plugins~/routing/build.xml josm-plugins/routing/build.xml
--- josm-plugins~/routing/build.xml2009-12-05 01:01:22.0 +0100
-+++ josm-plugins/routing/build.xml 2009-12-06 21:42:54.0 +0100
josm-plugins/routing/build.xml 2009-12-06 22:20:03.0 +0100
@@ -4,8 +4,8 @@
property name=plugin.dist.dirvalue=../../dist/
property name=plugin.build.dir value=build/
@@ -30,3 +30,11 @@ diff -urNad josm-plugins~/routing/build.xml
josm-plugins/routing/build.xml
copy todir=${plugin.build.dir}/
fileset dir=resources
include name=*.xml/
+@@ -46,6 +44,7 @@
+ attribute name=Plugin-Mainversion value=2450/
+ attribute name=Plugin-Stage value=50/
+ attribute name=Plugin-Version
value=${version.entry.commit.revision}/
++attribute name=Class-Path value=${jgrapht} ${log4j}/
+ /manifest
+ /jar
+ /target
--
Plugins for josm
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. upstream/0.0.svn18009-16-gf4340d9
The following commit has been merged in the master branch: commit f4340d997f4da28af442c7c7c1d71ac4052e29ba Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Sun Dec 6 22:31:34 2009 +0100 d/ch: updated plugin list diff --git a/debian/control b/debian/control index 4d39323..e7783a9 100644 --- a/debian/control +++ b/debian/control @@ -36,6 +36,14 @@ Description: Plugins for JOSM * utilsplugin- Several helper utilities. * validator - Data validator. * wmsplugin - Displays background images from any WMS source. + * cadastre-fr- A special handler for the French land registry WMS + server. + * DirectUpload - Directly uploads GPS Traces from current active + layer in JOSM to openstreetmap.org. + * editgpx- Anonymizes timestamps and deletes parts of huge GPX + tracks very fast. + * lakewalker - Helps vectorizing WMS images. + * routing- Provides routing capabilities. . JOSM is an editor for OpenStreetMap (OSM) written in Java. The current version supports stand alone GPX tracks, GPX track data -- Plugins for josm ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm branch, master, updated. upstream/0.0.svn2255-13-gbf52dcb
The following commit has been merged in the master branch:
commit bf52dcbc4b0c682eb0135bef49eb70c9780cfb1c
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Sun Dec 6 22:42:50 2009 +0100
d/copyright: updated
diff --git a/debian/copyright b/debian/copyright
index 2f312e2..c0831ce 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,7 +26,8 @@ License: GPL-3+
systems, the complete text of the GNU General Public License Version 3 can be
found in `/usr/share/common-licenses/GPL-3'.
-Files: src/org/openstreetmap/gui/jmapviewer/Coordinate.java
+Files: src/org/openstreetmap/gui/jmapviewer/Coordinate.java,
+ src/org/openstreetmap/gui/jmapviewer/interfaces/MapRectangle.java
Copyright: Copyright (c) 2009 Stefan Zeller
License: GPL-3+
@@ -175,7 +176,10 @@ Copyright: Copyright (c) 2008, Henrik Niehaus
License: BSD
Files: src/org/openstreetmap/josm/tools/CopyList.java,
- src/org/openstreetmap/josm/tools/DateUtils.java
+ src/org/openstreetmap/josm/tools/DateUtils.java,
+ src/org/openstreetmap/josm/data/osm/Storage.java,
+ src/org/openstreetmap/josm/data/osm/Hash.java,
+ src/org/openstreetmap/josm/data/osm/DataSetListener.java
Copyright: Copyright (c) 2008 Petr Nejedly p.neje...@sh.cvut.cz
License: GPL-3+
@@ -183,6 +187,18 @@ Files: src/org/openstreetmap/josm/data/coor/QuadTiling.java
Copyright: Copyright (c) 2009 Dave Hansen
License: GPL-3+
+Files: src/org/openstreetmap/josm/data/projection/NTV2SubGrid.java,
+ src/org/openstreetmap/josm/data/projection/NTV2Util.java,
+ src/org/openstreetmap/josm/data/projection/NTV2GridShiftFile.java,
+ src/org/openstreetmap/josm/data/projection/NTV2GridShift.java
+Copyright: Copyright (c) 2003 Objectix Pty Ltd
+License: LGPL
+
+Files: src/org/openstreetmap/josm/data/projection/Puwg.java
+Copyright: Copyright (c) 2007 by Immanuel Scholz and others
+ Copyright (c) 2009 by Łukasz Stelmach
+License: GPL-3+
+
Files: i18n/po/{ar,bg,cs,da,el,es,et,fi,gl,he,is,ja,nb,nl,ro,ru,sk,sl,sv}.po
Copyright: Copyright (c) 2009 Rosetta Contributers and Canonical Ltd 2009
License: GPL-3+
--
Java OpenStreetMap editor
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
