[DebianGIS-dev] r2365 - packages/mkgmap/tarballs
Author: nd-guest Date: 2009-07-16 08:47:23 + (Thu, 16 Jul 2009) New Revision: 2365 Added: packages/mkgmap/tarballs/mkgmap_0.0.0+svn1067.orig.tar.gz Removed: packages/mkgmap/tarballs/mkgmap_0.0.0+svn1067.orig.tar.gz Log: replace symlink with orig.tgz Deleted: packages/mkgmap/tarballs/mkgmap_0.0.0+svn1067.orig.tar.gz === --- packages/mkgmap/tarballs/mkgmap_0.0.0+svn1067.orig.tar.gz 2009-07-16 08:17:56 UTC (rev 2364) +++ packages/mkgmap/tarballs/mkgmap_0.0.0+svn1067.orig.tar.gz 2009-07-16 08:47:23 UTC (rev 2365) @@ -1 +0,0 @@ -link mkgmap-r1067-src.tar.gz \ No newline at end of file Added: packages/mkgmap/tarballs/mkgmap_0.0.0+svn1067.orig.tar.gz === (Binary files differ) Property changes on: packages/mkgmap/tarballs/mkgmap_0.0.0+svn1067.orig.tar.gz ___ Added: svn:mime-type + application/octet-stream ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2366 - packages/mkgmap/tarballs
Author: nd-guest Date: 2009-07-16 08:53:06 + (Thu, 16 Jul 2009) New Revision: 2366 Added: packages/mkgmap/tarballs/mkgmap_0.0.0+svn630.orig.tar.gz Removed: packages/mkgmap/tarballs/mkgmap_0.0.0+svn630.orig.tar.gz Log: replace previous tgz as well Deleted: packages/mkgmap/tarballs/mkgmap_0.0.0+svn630.orig.tar.gz === --- packages/mkgmap/tarballs/mkgmap_0.0.0+svn630.orig.tar.gz2009-07-16 08:47:23 UTC (rev 2365) +++ packages/mkgmap/tarballs/mkgmap_0.0.0+svn630.orig.tar.gz2009-07-16 08:53:06 UTC (rev 2366) @@ -1 +0,0 @@ -link mkgmap-r630-src.tar.gz \ No newline at end of file Added: packages/mkgmap/tarballs/mkgmap_0.0.0+svn630.orig.tar.gz === (Binary files differ) Property changes on: packages/mkgmap/tarballs/mkgmap_0.0.0+svn630.orig.tar.gz ___ Added: svn:mime-type + application/octet-stream ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2333 - packages/osm2pgsql/trunk/debian
Author: nd-guest Date: 2009-07-01 19:35:54 + (Wed, 01 Jul 2009) New Revision: 2333 Added: packages/osm2pgsql/trunk/debian/examples Modified: packages/osm2pgsql/trunk/debian/changelog packages/osm2pgsql/trunk/debian/rules Log: add 900913.sql, #535221 Modified: packages/osm2pgsql/trunk/debian/changelog === --- packages/osm2pgsql/trunk/debian/changelog 2009-06-26 14:17:24 UTC (rev 2332) +++ packages/osm2pgsql/trunk/debian/changelog 2009-07-01 19:35:54 UTC (rev 2333) @@ -1,3 +1,10 @@ +osm2pgsql (0.66.20090526-2) UNRELEASED; urgency=low + + * NOT RELEASED YET + * Added 900913.sql, containing EPSG:900913 for postgis, as example. + + -- Andreas Putzo andr...@putzo.net Wed, 01 Jul 2009 19:33:44 + + osm2pgsql (0.66.20090526-1) unstable; urgency=low * New upstream svn snapshot. (Closes: #532145) Added: packages/osm2pgsql/trunk/debian/examples === --- packages/osm2pgsql/trunk/debian/examples(rev 0) +++ packages/osm2pgsql/trunk/debian/examples2009-07-01 19:35:54 UTC (rev 2333) @@ -0,0 +1 @@ +900913.sql Modified: packages/osm2pgsql/trunk/debian/rules === --- packages/osm2pgsql/trunk/debian/rules 2009-06-26 14:17:24 UTC (rev 2332) +++ packages/osm2pgsql/trunk/debian/rules 2009-07-01 19:35:54 UTC (rev 2333) @@ -68,6 +68,7 @@ dh_testroot dh_installchangelogs dh_installdocs + dh_installexamples dh_install dh_installman dh_link ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2328 - packages/mkgmap/trunk/debian
Author: nd-guest
Date: 2009-06-25 17:35:31 + (Thu, 25 Jun 2009)
New Revision: 2328
Modified:
packages/mkgmap/trunk/debian/changelog
packages/mkgmap/trunk/debian/compat
packages/mkgmap/trunk/debian/control
packages/mkgmap/trunk/debian/copyright
packages/mkgmap/trunk/debian/watch
Log:
upgrading mkgmap
Modified: packages/mkgmap/trunk/debian/changelog
===
--- packages/mkgmap/trunk/debian/changelog 2009-06-24 20:43:28 UTC (rev
2327)
+++ packages/mkgmap/trunk/debian/changelog 2009-06-25 17:35:31 UTC (rev
2328)
@@ -1,3 +1,13 @@
+mkgmap (0.0.0+svn1067-1) unstable; urgency=low
+
+ * New upstream snapshot.
+ * Added ${misc:Depends} among dependencies to fix a lintian warning.
+ * Bumped debhelper compatibility level to 7.
+ * Updated long description.
+ * Updated Homepage in debian/control, debian/copyright, debian/watch.
+
+ -- Andreas Putzo andr...@putzo.net Thu, 25 Jun 2009 17:31:38 +
+
mkgmap (0.0.0+svn630-1) unstable; urgency=low
* Initial release (Closes: #475773)
Modified: packages/mkgmap/trunk/debian/compat
===
--- packages/mkgmap/trunk/debian/compat 2009-06-24 20:43:28 UTC (rev 2327)
+++ packages/mkgmap/trunk/debian/compat 2009-06-25 17:35:31 UTC (rev 2328)
@@ -1 +1 @@
-5
+7
Modified: packages/mkgmap/trunk/debian/control
===
--- packages/mkgmap/trunk/debian/control2009-06-24 20:43:28 UTC (rev
2327)
+++ packages/mkgmap/trunk/debian/control2009-06-25 17:35:31 UTC (rev
2328)
@@ -3,16 +3,16 @@
Priority: extra
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Andreas Putzo andr...@putzo.net
-Build-Depends: ant, cdbs, debhelper (= 5), java-gcj-compat-dev
+Build-Depends: ant, cdbs, debhelper (= 7), java-gcj-compat-dev
Standards-Version: 3.8.0
-Homepage: http://www.parabola.me.uk/mkgmap
+Homepage: http://www.mkgmap.org.uk
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/mkgmap/trunk
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/mkgmap/trunk
Package: mkgmap
Architecture: all
-Depends: openjdk-6-jre-headless | java5-runtime-headless
+Depends: ${misc:Depends} openjdk-6-jre-headless | java5-runtime-headless
Suggests: josm, qlandkarte
Description: Generate Garmin maps from OpenStreetMap data
This program converts OpenStreetMap data into a map that
- can be loaded onto a Garmin GPS device.
+ can be loaded onto compatible Garmin GPS units.
Modified: packages/mkgmap/trunk/debian/copyright
===
--- packages/mkgmap/trunk/debian/copyright 2009-06-24 20:43:28 UTC (rev
2327)
+++ packages/mkgmap/trunk/debian/copyright 2009-06-25 17:35:31 UTC (rev
2328)
@@ -1,7 +1,7 @@
This package was debianized by Andreas Putzo andr...@putzo.net on
Sun, 13 Apr 2008 19:29:58 +.
-It was downloaded from http://www.parabola.me.uk/mkgmap/snapshots/
+It was downloaded from http://www.mkgmap.org.uk/snapshots/
Upstream Author:
Modified: packages/mkgmap/trunk/debian/watch
===
--- packages/mkgmap/trunk/debian/watch 2009-06-24 20:43:28 UTC (rev 2327)
+++ packages/mkgmap/trunk/debian/watch 2009-06-25 17:35:31 UTC (rev 2328)
@@ -1,3 +1,3 @@
version=3
opts=dversionmangle=s/0.0.0.svn//,uversionmangle=s/^r// \
-http://www.parabola.me.uk/mkgmap/snapshots/mkgmap-(.*)-src\.tar\.gz
+http://www.mkgmap.org.uk/snapshots/mkgmap-(.*)-src\.tar\.gz
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2329 - packages/mkgmap/trunk/debian
Author: nd-guest
Date: 2009-06-25 18:16:40 + (Thu, 25 Jun 2009)
New Revision: 2329
Modified:
packages/mkgmap/trunk/debian/changelog
packages/mkgmap/trunk/debian/control
packages/mkgmap/trunk/debian/copyright
packages/mkgmap/trunk/debian/docs
Log:
finish package.
Modified: packages/mkgmap/trunk/debian/changelog
===
--- packages/mkgmap/trunk/debian/changelog 2009-06-25 17:35:31 UTC (rev
2328)
+++ packages/mkgmap/trunk/debian/changelog 2009-06-25 18:16:40 UTC (rev
2329)
@@ -1,12 +1,17 @@
mkgmap (0.0.0+svn1067-1) unstable; urgency=low
* New upstream snapshot.
- * Added ${misc:Depends} among dependencies to fix a lintian warning.
- * Bumped debhelper compatibility level to 7.
- * Updated long description.
+ * Added ${misc:Depends} among dependencies to fix a lintian warning.
+ * Bumped debhelper compatibility level to 7.
+ * Updated long description.
* Updated Homepage in debian/control, debian/copyright, debian/watch.
+ * Added numerous files from /doc to debian/docs.
+ * Mentioned Bernhard Heibler in debian/copyright and updated copyright
+year of software and packaging.
+ * Bumped policy to 3.8.2, without changes.
+ * Added DM-Upload-Allowed to debian/control.
- -- Andreas Putzo andr...@putzo.net Thu, 25 Jun 2009 17:31:38 +
+ -- Andreas Putzo andr...@putzo.net Thu, 25 Jun 2009 18:04:29 +
mkgmap (0.0.0+svn630-1) unstable; urgency=low
Modified: packages/mkgmap/trunk/debian/control
===
--- packages/mkgmap/trunk/debian/control2009-06-25 17:35:31 UTC (rev
2328)
+++ packages/mkgmap/trunk/debian/control2009-06-25 18:16:40 UTC (rev
2329)
@@ -3,15 +3,16 @@
Priority: extra
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Andreas Putzo andr...@putzo.net
+DM-Upload-Allowed: yes
Build-Depends: ant, cdbs, debhelper (= 7), java-gcj-compat-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
Homepage: http://www.mkgmap.org.uk
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/mkgmap/trunk
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/mkgmap/trunk
Package: mkgmap
Architecture: all
-Depends: ${misc:Depends} openjdk-6-jre-headless | java5-runtime-headless
+Depends: ${misc:Depends}, openjdk-6-jre-headless | java5-runtime-headless
Suggests: josm, qlandkarte
Description: Generate Garmin maps from OpenStreetMap data
This program converts OpenStreetMap data into a map that
Modified: packages/mkgmap/trunk/debian/copyright
===
--- packages/mkgmap/trunk/debian/copyright 2009-06-25 17:35:31 UTC (rev
2328)
+++ packages/mkgmap/trunk/debian/copyright 2009-06-25 18:16:40 UTC (rev
2329)
@@ -9,7 +9,7 @@
Copyright:
-Copyright (C) 2007, 2008 Steve Ratcliffe s...@parabola.me.uk
+Copyright (C) 2007-2009 Steve Ratcliffe s...@parabola.me.uk
License:
@@ -21,7 +21,7 @@
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -29,5 +29,15 @@
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'.
-The Debian packaging is (C) 2008, Andreas Putzo andr...@putzo.net and
+
+The files:
+ src/uk/me/parabola/mkgmap/general/MapPointMultimap.java,
+ src/uk/me/parabola/mkgmap/general/MapPointFastFindMap.java,
+ src/uk/me/parabola/mkgmap/build/LocatorConfig.java,
+ src/uk/me/parabola/mkgmap/build/Locator.java,
+are Copyright (C) 2009 Bernhard Heibler and
+are licensed under the GPL version 2, see above.
+
+
+The Debian packaging is (C) 2008,2009, Andreas Putzo andr...@putzo.net and
is licensed under the GPL version 2, see above.
Modified: packages/mkgmap/trunk/debian/docs
===
--- packages/mkgmap/trunk/debian/docs 2009-06-25 17:35:31 UTC (rev 2328)
+++ packages/mkgmap/trunk/debian/docs 2009-06-25 18:16:40 UTC (rev 2329)
@@ -1,3 +1,8 @@
README
doc/Credits
+doc/Zoom
+doc/map-features.txt
+doc/style-rules.txt
+doc/style-examples.txt
+doc/style.txt
resources/garmin_feature_list.csv
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2330 - packages/mkgmap/tags
Author: nd-guest Date: 2009-06-25 18:18:49 + (Thu, 25 Jun 2009) New Revision: 2330 Added: packages/mkgmap/tags/0.0.0+svn569-1/ Log: [svn-buildpackage] Tagging mkgmap (0.0.0+svn569-1) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2331 - in packages/mkgmap: . tarballs
Author: nd-guest Date: 2009-06-25 18:20:30 + (Thu, 25 Jun 2009) New Revision: 2331 Added: packages/mkgmap/tarballs/ packages/mkgmap/tarballs/mkgmap_0.0.0+svn1067.orig.tar.gz packages/mkgmap/tarballs/mkgmap_0.0.0+svn630.orig.tar.gz Log: add orig tarballs Added: packages/mkgmap/tarballs/mkgmap_0.0.0+svn1067.orig.tar.gz === --- packages/mkgmap/tarballs/mkgmap_0.0.0+svn1067.orig.tar.gz (rev 0) +++ packages/mkgmap/tarballs/mkgmap_0.0.0+svn1067.orig.tar.gz 2009-06-25 18:20:30 UTC (rev 2331) @@ -0,0 +1 @@ +link mkgmap-r1067-src.tar.gz \ No newline at end of file Property changes on: packages/mkgmap/tarballs/mkgmap_0.0.0+svn1067.orig.tar.gz ___ Added: svn:special + * Added: packages/mkgmap/tarballs/mkgmap_0.0.0+svn630.orig.tar.gz === --- packages/mkgmap/tarballs/mkgmap_0.0.0+svn630.orig.tar.gz (rev 0) +++ packages/mkgmap/tarballs/mkgmap_0.0.0+svn630.orig.tar.gz2009-06-25 18:20:30 UTC (rev 2331) @@ -0,0 +1 @@ +link mkgmap-r630-src.tar.gz \ No newline at end of file Property changes on: packages/mkgmap/tarballs/mkgmap_0.0.0+svn630.orig.tar.gz ___ Added: svn:special + * ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2308 - packages/gosmore/trunk/debian
Author: nd-guest Date: 2009-06-24 10:34:31 + (Wed, 24 Jun 2009) New Revision: 2308 Modified: packages/gosmore/trunk/debian/changelog packages/gosmore/trunk/debian/rules Log: yet another svn snapshot fixing a bug in FindResource() Modified: packages/gosmore/trunk/debian/changelog === --- packages/gosmore/trunk/debian/changelog 2009-06-23 18:29:41 UTC (rev 2307) +++ packages/gosmore/trunk/debian/changelog 2009-06-24 10:34:31 UTC (rev 2308) @@ -1,7 +1,7 @@ -gosmore (0.0.0.20090623-1) UNRELEASED; urgency=low +gosmore (0.0.0.20090624-1) UNRELEASED; urgency=low * NOT RELEASED YET - * New upstream snapshot fetched from svn, revision 15979. (Closes: #533372) + * New upstream snapshot fetched from svn, revision 16088. (Closes: #533372) * debian/rules get-orig-source: - Remove debian/ dir. - Ignore externals in svn export command. Modified: packages/gosmore/trunk/debian/rules === --- packages/gosmore/trunk/debian/rules 2009-06-23 18:29:41 UTC (rev 2307) +++ packages/gosmore/trunk/debian/rules 2009-06-24 10:34:31 UTC (rev 2308) @@ -9,7 +9,7 @@ CFLAGS := -DRES_DIR='\/usr/share/gosmore/\' SVNREPO := http://svn.openstreetmap.org/applications/rendering/gosmore -SVNREV := 16083 +SVNREV := 16088 DATE := $(shell date +%Y%m%d) get-orig-source: ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2309 - packages/gosmore/trunk/debian
Author: nd-guest Date: 2009-06-24 11:24:32 + (Wed, 24 Jun 2009) New Revision: 2309 Removed: packages/gosmore/trunk/debian/patches/ Modified: packages/gosmore/trunk/debian/changelog packages/gosmore/trunk/debian/control packages/gosmore/trunk/debian/rules Log: remove dpatch, last patch has gone Modified: packages/gosmore/trunk/debian/changelog === --- packages/gosmore/trunk/debian/changelog 2009-06-24 10:34:31 UTC (rev 2308) +++ packages/gosmore/trunk/debian/changelog 2009-06-24 11:24:32 UTC (rev 2309) @@ -11,8 +11,10 @@ data files. (Closes: #491842) * Dropped dependency on libgps-dev, gosmore tries to parse NMEA sentences on its own. (Closes: #524042) + * Removed dpatch build-dependency and debian/patches since there are +no patches currently. - -- Andreas Putzo andr...@putzo.net Mon, 22 Jun 2009 21:35:00 + + -- Andreas Putzo andr...@putzo.net Wed, 24 Jun 2009 11:21:49 + gosmore (0.0.0.20080704-1) unstable; urgency=low Modified: packages/gosmore/trunk/debian/control === --- packages/gosmore/trunk/debian/control 2009-06-24 10:34:31 UTC (rev 2308) +++ packages/gosmore/trunk/debian/control 2009-06-24 11:24:32 UTC (rev 2309) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org, Petter Reinholdtsen p...@debian.org, Andreas Putzo andr...@putzo.net -Build-Depends: debhelper ( 5.0.0), cdbs, libgtk2.0-dev, flite-dev, dpatch, libxml2-dev +Build-Depends: debhelper ( 5.0.0), cdbs, libgtk2.0-dev, flite-dev, libxml2-dev Standards-Version: 3.8.0 Homepage: http://wiki.openstreetmap.org/index.php/Gosmore Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gosmore/trunk Modified: packages/gosmore/trunk/debian/rules === --- packages/gosmore/trunk/debian/rules 2009-06-24 10:34:31 UTC (rev 2308) +++ packages/gosmore/trunk/debian/rules 2009-06-24 11:24:32 UTC (rev 2309) @@ -2,7 +2,6 @@ include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/dpatch.mk DESTDIR := $(CURDIR)/debian/gosmore DEB_MAKE_INSTALL_TARGET := DESTDIR=$(DESTDIR) prefix=/usr install ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2321 - packages/gosmore/trunk/debian
Author: nd-guest Date: 2009-06-24 20:07:26 + (Wed, 24 Jun 2009) New Revision: 2321 Modified: packages/gosmore/trunk/debian/changelog packages/gosmore/trunk/debian/control Log: bump policy add dm-upload-allowed Modified: packages/gosmore/trunk/debian/changelog === --- packages/gosmore/trunk/debian/changelog 2009-06-24 13:53:32 UTC (rev 2320) +++ packages/gosmore/trunk/debian/changelog 2009-06-24 20:07:26 UTC (rev 2321) @@ -7,14 +7,16 @@ - Ignore externals in svn export command. * Removed 10-findresources.dpatch, applied upstream. * Mentioned ConvertUTF.c in debian/copyright. - * Added a note to the long description that gosmore needs additional + * Added a note to the long description that gosmore needs additional data files. (Closes: #491842) * Dropped dependency on libgps-dev, gosmore tries to parse NMEA sentences on its own. (Closes: #524042) * Removed dpatch build-dependency and debian/patches since there are no patches currently. + * Bumped policy to 3.8.2, without changes. + * Added DM-Upload-Allowed to debian/control. - -- Andreas Putzo andr...@putzo.net Wed, 24 Jun 2009 11:21:49 + + -- Andreas Putzo andr...@putzo.net Wed, 24 Jun 2009 19:59:08 + gosmore (0.0.0.20080704-1) unstable; urgency=low Modified: packages/gosmore/trunk/debian/control === --- packages/gosmore/trunk/debian/control 2009-06-24 13:53:32 UTC (rev 2320) +++ packages/gosmore/trunk/debian/control 2009-06-24 20:07:26 UTC (rev 2321) @@ -3,8 +3,9 @@ Priority: optional Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org, Petter Reinholdtsen p...@debian.org, Andreas Putzo andr...@putzo.net +DM-Upload-Allowed: yes Build-Depends: debhelper ( 5.0.0), cdbs, libgtk2.0-dev, flite-dev, libxml2-dev -Standards-Version: 3.8.0 +Standards-Version: 3.8.2 Homepage: http://wiki.openstreetmap.org/index.php/Gosmore Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gosmore/trunk Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gosmore/trunk ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2322 - packages/gosmore/trunk/debian
Author: nd-guest Date: 2009-06-24 20:08:28 + (Wed, 24 Jun 2009) New Revision: 2322 Modified: packages/gosmore/trunk/debian/changelog packages/gosmore/trunk/debian/copyright Log: fixate copyright Modified: packages/gosmore/trunk/debian/changelog === --- packages/gosmore/trunk/debian/changelog 2009-06-24 20:07:26 UTC (rev 2321) +++ packages/gosmore/trunk/debian/changelog 2009-06-24 20:08:28 UTC (rev 2322) @@ -6,7 +6,7 @@ - Remove debian/ dir. - Ignore externals in svn export command. * Removed 10-findresources.dpatch, applied upstream. - * Mentioned ConvertUTF.c in debian/copyright. + * Mentioned ConvertUTF.c, elemstyles.xml and icons.* in debian/copyright. * Added a note to the long description that gosmore needs additional data files. (Closes: #491842) * Dropped dependency on libgps-dev, gosmore tries to parse NMEA sentences Modified: packages/gosmore/trunk/debian/copyright === --- packages/gosmore/trunk/debian/copyright 2009-06-24 20:07:26 UTC (rev 2321) +++ packages/gosmore/trunk/debian/copyright 2009-06-24 20:08:28 UTC (rev 2322) @@ -11,7 +11,7 @@ This software is placed by in the public domain by its authors. -The files +The files ConvertUTF.c ConvertUTF.h are Copyright (C) 2001-2004 Unicode, Inc. @@ -35,3 +35,29 @@ Unicode Standard, and to make copies of this file in any form for internal or external distribution as long as this notice remains attached. + + +The files +elemstyle.xml +icons.csv +icons.xpm +are Copyright (C) 2006-2009 The Gpsdrive Development Team + +License: + +This package is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free Software +Foundation; either version 2 of the License, or (at your option) any later +version. + +This package is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +more details. + +You should have received a copy of the GNU General Public License along with +this package; if not, write to the Free Software Foundation, Inc., 51 +Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL' ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2323 - packages/gosmore/trunk/debian
Author: nd-guest Date: 2009-06-24 20:11:30 + (Wed, 24 Jun 2009) New Revision: 2323 Modified: packages/gosmore/trunk/debian/changelog Log: prepare for release Modified: packages/gosmore/trunk/debian/changelog === --- packages/gosmore/trunk/debian/changelog 2009-06-24 20:08:28 UTC (rev 2322) +++ packages/gosmore/trunk/debian/changelog 2009-06-24 20:11:30 UTC (rev 2323) @@ -1,6 +1,5 @@ -gosmore (0.0.0.20090624-1) UNRELEASED; urgency=low +gosmore (0.0.0.20090624-1) unstable; urgency=low - * NOT RELEASED YET * New upstream snapshot fetched from svn, revision 16088. (Closes: #533372) * debian/rules get-orig-source: - Remove debian/ dir. @@ -16,7 +15,7 @@ * Bumped policy to 3.8.2, without changes. * Added DM-Upload-Allowed to debian/control. - -- Andreas Putzo andr...@putzo.net Wed, 24 Jun 2009 19:59:08 + + -- Andreas Putzo andr...@putzo.net Wed, 24 Jun 2009 20:08:34 + gosmore (0.0.0.20080704-1) unstable; urgency=low ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2324 - packages/gosmore/tarballs
Author: nd-guest Date: 2009-06-24 20:12:44 + (Wed, 24 Jun 2009) New Revision: 2324 Added: packages/gosmore/tarballs/gosmore_0.0.0.20090624.orig.tar.gz Removed: packages/gosmore/tarballs/gosmore_0.0.0.20090623.orig.tar.gz Log: once more replace the orig tarball.. Deleted: packages/gosmore/tarballs/gosmore_0.0.0.20090623.orig.tar.gz === (Binary files differ) Added: packages/gosmore/tarballs/gosmore_0.0.0.20090624.orig.tar.gz === (Binary files differ) Property changes on: packages/gosmore/tarballs/gosmore_0.0.0.20090624.orig.tar.gz ___ Added: svn:mime-type + application/octet-stream ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2325 - packages/gosmore/trunk/debian
Author: nd-guest Date: 2009-06-24 20:31:37 + (Wed, 24 Jun 2009) New Revision: 2325 Modified: packages/gosmore/trunk/debian/changelog packages/gosmore/trunk/debian/control Log: flite support vanished Modified: packages/gosmore/trunk/debian/changelog === --- packages/gosmore/trunk/debian/changelog 2009-06-24 20:12:44 UTC (rev 2324) +++ packages/gosmore/trunk/debian/changelog 2009-06-24 20:31:37 UTC (rev 2325) @@ -14,8 +14,9 @@ no patches currently. * Bumped policy to 3.8.2, without changes. * Added DM-Upload-Allowed to debian/control. + * Removed build-dependency on flite-dev, feature has been removed. - -- Andreas Putzo andr...@putzo.net Wed, 24 Jun 2009 20:08:34 + + -- Andreas Putzo andr...@putzo.net Wed, 24 Jun 2009 20:18:41 + gosmore (0.0.0.20080704-1) unstable; urgency=low Modified: packages/gosmore/trunk/debian/control === --- packages/gosmore/trunk/debian/control 2009-06-24 20:12:44 UTC (rev 2324) +++ packages/gosmore/trunk/debian/control 2009-06-24 20:31:37 UTC (rev 2325) @@ -4,7 +4,7 @@ Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org, Petter Reinholdtsen p...@debian.org, Andreas Putzo andr...@putzo.net DM-Upload-Allowed: yes -Build-Depends: debhelper ( 5.0.0), cdbs, libgtk2.0-dev, flite-dev, libxml2-dev +Build-Depends: debhelper ( 5.0.0), cdbs, libgtk2.0-dev, libxml2-dev Standards-Version: 3.8.2 Homepage: http://wiki.openstreetmap.org/index.php/Gosmore Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gosmore/trunk ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2326 - packages/gosmore/trunk/debian
Author: nd-guest Date: 2009-06-24 20:37:43 + (Wed, 24 Jun 2009) New Revision: 2326 Modified: packages/gosmore/trunk/debian/changelog packages/gosmore/trunk/debian/compat packages/gosmore/trunk/debian/control Log: bumped debhelper compat level Modified: packages/gosmore/trunk/debian/changelog === --- packages/gosmore/trunk/debian/changelog 2009-06-24 20:31:37 UTC (rev 2325) +++ packages/gosmore/trunk/debian/changelog 2009-06-24 20:37:43 UTC (rev 2326) @@ -15,8 +15,9 @@ * Bumped policy to 3.8.2, without changes. * Added DM-Upload-Allowed to debian/control. * Removed build-dependency on flite-dev, feature has been removed. + * Bumped debhelper compatibility level to 7. - -- Andreas Putzo andr...@putzo.net Wed, 24 Jun 2009 20:18:41 + + -- Andreas Putzo andr...@putzo.net Wed, 24 Jun 2009 20:32:38 + gosmore (0.0.0.20080704-1) unstable; urgency=low Modified: packages/gosmore/trunk/debian/compat === --- packages/gosmore/trunk/debian/compat2009-06-24 20:31:37 UTC (rev 2325) +++ packages/gosmore/trunk/debian/compat2009-06-24 20:37:43 UTC (rev 2326) @@ -1 +1 @@ -5 +7 Modified: packages/gosmore/trunk/debian/control === --- packages/gosmore/trunk/debian/control 2009-06-24 20:31:37 UTC (rev 2325) +++ packages/gosmore/trunk/debian/control 2009-06-24 20:37:43 UTC (rev 2326) @@ -4,7 +4,7 @@ Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org, Petter Reinholdtsen p...@debian.org, Andreas Putzo andr...@putzo.net DM-Upload-Allowed: yes -Build-Depends: debhelper ( 5.0.0), cdbs, libgtk2.0-dev, libxml2-dev +Build-Depends: debhelper ( 7.0.0), cdbs, libgtk2.0-dev, libxml2-dev Standards-Version: 3.8.2 Homepage: http://wiki.openstreetmap.org/index.php/Gosmore Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gosmore/trunk ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2327 - packages/gosmore/tags
Author: nd-guest Date: 2009-06-24 20:43:28 + (Wed, 24 Jun 2009) New Revision: 2327 Added: packages/gosmore/tags/0.0.0.20080704-1/ Log: [svn-buildpackage] Tagging gosmore (0.0.0.20080704-1) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2305 - in packages/gosmore: . tarballs
Author: nd-guest Date: 2009-06-23 13:48:44 + (Tue, 23 Jun 2009) New Revision: 2305 Added: packages/gosmore/tarballs/ packages/gosmore/tarballs/gosmore_0.0.0.20090618.orig.tar.gz Log: add orig.tgz Added: packages/gosmore/tarballs/gosmore_0.0.0.20090618.orig.tar.gz === (Binary files differ) Property changes on: packages/gosmore/tarballs/gosmore_0.0.0.20090618.orig.tar.gz ___ Added: svn:mime-type + application/octet-stream ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2306 - packages/gosmore/trunk/debian
Author: nd-guest
Date: 2009-06-23 18:28:52 + (Tue, 23 Jun 2009)
New Revision: 2306
Modified:
packages/gosmore/trunk/debian/changelog
packages/gosmore/trunk/debian/rules
Log:
update svnrev, fixing a Makefile bug
don't fetch svn externals, saves bandwidth
Modified: packages/gosmore/trunk/debian/changelog
===
--- packages/gosmore/trunk/debian/changelog 2009-06-23 13:48:44 UTC (rev
2305)
+++ packages/gosmore/trunk/debian/changelog 2009-06-23 18:28:52 UTC (rev
2306)
@@ -1,8 +1,10 @@
-gosmore (0.0.0.20090618-1) UNRELEASED; urgency=low
+gosmore (0.0.0.20090623-1) UNRELEASED; urgency=low
* NOT RELEASED YET
* New upstream snapshot fetched from svn, revision 15979. (Closes: #533372)
- * Removed debian/ and map-icons/ dirs from tarball in get-orig-source target.
+ * debian/rules get-orig-source:
+- Remove debian/ dir.
+- Ignore externals in svn export command.
* Removed 10-findresources.dpatch, applied upstream.
* Mentioned ConvertUTF.c in debian/copyright.
* Added a note to the long description that gosmore needs additional
Modified: packages/gosmore/trunk/debian/rules
===
--- packages/gosmore/trunk/debian/rules 2009-06-23 13:48:44 UTC (rev 2305)
+++ packages/gosmore/trunk/debian/rules 2009-06-23 18:28:52 UTC (rev 2306)
@@ -9,18 +9,16 @@
CFLAGS := -DRES_DIR='\/usr/share/gosmore/\'
SVNREPO := http://svn.openstreetmap.org/applications/rendering/gosmore
-SVNREV := 15979
+SVNREV := 16083
DATE := $(shell date +%Y%m%d)
get-orig-source:
dh_testdir
test -d ../tarballs/. || mkdir -p ../tarballs
@echo Downloading gosmore from ${SVNREPO}
- svn -r $(SVNREV) export ${SVNREPO} ../tarballs/gosmore-0.0.0.${DATE}
+ svn -r $(SVNREV) --ignore-externals export ${SVNREPO}
../tarballs/gosmore-0.0.0.${DATE}
@echo Removing debian dir
rm -rf ../tarballs/gosmore-0.0.0.${DATE}/debian
- @echo Removing map-icons
- rm -rf ../tarballs/gosmore-0.0.0.${DATE}/map-icons
@echo Building snapshot tarball
tar czf ../tarballs/gosmore_0.0.0.${DATE}.orig.tar.gz -C ../tarballs
gosmore-0.0.0.${DATE}
@echo Cleaning up
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2301 - in packages/gosmore/trunk/debian: . patches
Author: nd-guest
Date: 2009-06-22 21:02:53 + (Mon, 22 Jun 2009)
New Revision: 2301
Removed:
packages/gosmore/trunk/debian/patches/10-findresources.dpatch
Modified:
packages/gosmore/trunk/debian/changelog
packages/gosmore/trunk/debian/patches/00list
packages/gosmore/trunk/debian/rules
Log:
new svn snapshot, api0.6 compatible
Modified: packages/gosmore/trunk/debian/changelog
===
--- packages/gosmore/trunk/debian/changelog 2009-06-22 13:20:36 UTC (rev
2300)
+++ packages/gosmore/trunk/debian/changelog 2009-06-22 21:02:53 UTC (rev
2301)
@@ -1,3 +1,12 @@
+gosmore (0.0.0.20090618-1) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+ * New upstream snapshot fetched from svn, revision 15979. (Closes: #533372)
+ * Removed debian/ and map-icons/ dirs from tarball in get-orig-source target.
+ * Removed 10-findresources.dpatch, applied upstream.
+
+ -- Andreas Putzo andr...@putzo.net Thu, 18 Jun 2009 09:50:26 +
+
gosmore (0.0.0.20080704-1) unstable; urgency=low
[ Andreas Putzo ]
Modified: packages/gosmore/trunk/debian/patches/00list
===
--- packages/gosmore/trunk/debian/patches/00list2009-06-22 13:20:36 UTC
(rev 2300)
+++ packages/gosmore/trunk/debian/patches/00list2009-06-22 21:02:53 UTC
(rev 2301)
@@ -1 +1 @@
-10-findresources
+#10-findresources
Deleted: packages/gosmore/trunk/debian/patches/10-findresources.dpatch
===
--- packages/gosmore/trunk/debian/patches/10-findresources.dpatch
2009-06-22 13:20:36 UTC (rev 2300)
+++ packages/gosmore/trunk/debian/patches/10-findresources.dpatch
2009-06-22 21:02:53 UTC (rev 2301)
@@ -1,66 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-findresources.dpatch by Andreas Putzo andr...@putzo.net
-##
-## DP: Search for files first in current directory, then in ~/.gosmre/, then
-## DP: in $(prefix)/share/gosmore/.
-## DP: Backported from upstream svn revision 8642.
-
-...@dpatch@
-diff -urNad gosmore-0.0.0.20080704~/gosmore.cpp
gosmore-0.0.0.20080704/gosmore.cpp
gosmore-0.0.0.20080704~/gosmore.cpp2008-07-04 16:41:19.0
+
-+++ gosmore-0.0.0.20080704/gosmore.cpp 2008-07-04 16:42:16.0 +
-@@ -4,7 +4,9 @@
- #define WIN32_LEAN_AND_MEAN
- #include stdio.h
- #include stdlib.h
-+#include sys/stat.h
- #include string.h
-+#include string
- #include math.h
- #include ctype.h
- #include assert.h
-@@ -57,6 +59,7 @@
- #endif
- #ifdef _WIN32_WCE
- #define gtk_widget_queue_clear(x) // After Click() returns we Invalidate
-+
- struct GtkWidget {
- struct {
- int width, height;
-@@ -67,6 +70,16 @@
- struct GdkEventButton {
- int x, y, button;
- };
-+#else
-+const char *FindResource (char *fname)
-+{
-+ static std::string s;
-+ struct stat dummy;
-+ if (stat (fname, dummy) == 0) return fname;
-+ s = (std::string) getenv (HOME) + /.gosmore/ + fname;
-+ if (stat (s.c_str (), dummy) != 0) s = (std::string) RES_DIR + fname;
-+ return s.c_str ();
-+}
- #endif
-
- #define TILEBITS (18)
-@@ -857,7 +870,7 @@
- routeColour, FALSE, TRUE);
- gdk_gc_set_fill (mygc, GDK_SOLID);
- icons = gdk_pixmap_create_from_xpm (draw-window, NULL, NULL,
-- icons.xpm);
-+ FindResource (icons.xpm));
- }
-
- GdkRectangle clip;
-@@ -1544,7 +1557,9 @@
- int defaultRestrict[2 STYLE_BITS];
- memset (defaultRestrict, 0, sizeof (defaultRestrict));
- FILE *icons_csv = fopen (icons.csv, r);
--xmlTextReaderPtr sXml = xmlNewTextReaderFilename (elemstyles.xml);
-+if (!icons_csv) icons_csv = fopen (FindResource (icons.csv), r);
-+xmlTextReaderPtr sXml = xmlNewTextReaderFilename (
-+ FindResource (elemstyles.xml));
- if (!sXml || !icons_csv) {
- fprintf (stderr, Either icons.csv or elemstyles.xml not found\n);
- return 3;
Modified: packages/gosmore/trunk/debian/rules
===
--- packages/gosmore/trunk/debian/rules 2009-06-22 13:20:36 UTC (rev 2300)
+++ packages/gosmore/trunk/debian/rules 2009-06-22 21:02:53 UTC (rev 2301)
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
-
+
include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/dpatch.mk
@@ -9,7 +9,7 @@
CFLAGS := -DRES_DIR='\/usr/share/gosmore/\'
SVNREPO := http://svn.openstreetmap.org/applications/rendering/gosmore
-SVNREV := 8034
+SVNREV := 15979
DATE := $(shell date +%Y%m%d)
get-orig-source:
@@ -17,6 +17,10 @@
test -d ../tarballs/. || mkdir -p ../tarballs
@echo Downloading gosmore from ${SVNREPO}
svn -r $(SVNREV) export ${SVNREPO} ../tarballs/gosmore-0.0.0.${DATE}
+ @echo Removing debian dir
+ rm -rf ../tarballs/gosmore-0.0.0.${DATE}/debian
+ @echo Removing map-icons
+ rm -rf ../tarballs/gosmore-0.0.0.${DATE}/map-icons
[DebianGIS-dev] r2302 - packages/gosmore/trunk/debian
Author: nd-guest Date: 2009-06-22 21:26:51 + (Mon, 22 Jun 2009) New Revision: 2302 Modified: packages/gosmore/trunk/debian/changelog packages/gosmore/trunk/debian/copyright Log: add copyright of ConvertUTF.* See http://lists.debian.org/debian-legal/2006/01/msg00543.html Modified: packages/gosmore/trunk/debian/changelog === --- packages/gosmore/trunk/debian/changelog 2009-06-22 21:02:53 UTC (rev 2301) +++ packages/gosmore/trunk/debian/changelog 2009-06-22 21:26:51 UTC (rev 2302) @@ -4,8 +4,9 @@ * New upstream snapshot fetched from svn, revision 15979. (Closes: #533372) * Removed debian/ and map-icons/ dirs from tarball in get-orig-source target. * Removed 10-findresources.dpatch, applied upstream. + * Mention ConvertUTF.c in debian/copyright. - -- Andreas Putzo andr...@putzo.net Thu, 18 Jun 2009 09:50:26 + + -- Andreas Putzo andr...@putzo.net Mon, 22 Jun 2009 21:25:03 + gosmore (0.0.0.20080704-1) unstable; urgency=low Modified: packages/gosmore/trunk/debian/copyright === --- packages/gosmore/trunk/debian/copyright 2009-06-22 21:02:53 UTC (rev 2301) +++ packages/gosmore/trunk/debian/copyright 2009-06-22 21:26:51 UTC (rev 2302) @@ -9,3 +9,29 @@ Copyright: This software is placed by in the public domain by its authors. + + +The files +ConvertUTF.c +ConvertUTF.h +are Copyright (C) 2001-2004 Unicode, Inc. + +License: + + Disclaimer + + This source code is provided as is by Unicode, Inc. No claims are + made as to fitness for any particular purpose. No warranties of any + kind are expressed or implied. The recipient agrees to determine + applicability of information provided. If this file has been + purchased on magnetic or optical media from Unicode, Inc., the + sole remedy for any claim will be exchange of defective media + within 90 days of receipt. + + Limitations on Rights to Redistribute This Code + + Unicode, Inc. hereby grants the right to freely use the information + supplied in this file in the creation of products supporting the + Unicode Standard, and to make copies of this file in any form + for internal or external distribution as long as this notice + remains attached. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2304 - packages/gosmore/trunk/debian
Author: nd-guest Date: 2009-06-22 21:49:40 + (Mon, 22 Jun 2009) New Revision: 2304 Modified: packages/gosmore/trunk/debian/changelog packages/gosmore/trunk/debian/control Log: close #524042 Modified: packages/gosmore/trunk/debian/changelog === --- packages/gosmore/trunk/debian/changelog 2009-06-22 21:32:15 UTC (rev 2303) +++ packages/gosmore/trunk/debian/changelog 2009-06-22 21:49:40 UTC (rev 2304) @@ -7,8 +7,10 @@ * Mentioned ConvertUTF.c in debian/copyright. * Added a note to the long description that gosmore needs additional data files. (Closes: #491842) + * Dropped dependency on libgps-dev, gosmore tries to parse NMEA sentences +on its own. (Closes: #524042) - -- Andreas Putzo andr...@putzo.net Mon, 22 Jun 2009 21:31:07 + + -- Andreas Putzo andr...@putzo.net Mon, 22 Jun 2009 21:35:00 + gosmore (0.0.0.20080704-1) unstable; urgency=low Modified: packages/gosmore/trunk/debian/control === --- packages/gosmore/trunk/debian/control 2009-06-22 21:32:15 UTC (rev 2303) +++ packages/gosmore/trunk/debian/control 2009-06-22 21:49:40 UTC (rev 2304) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org, Petter Reinholdtsen p...@debian.org, Andreas Putzo andr...@putzo.net -Build-Depends: debhelper ( 5.0.0), cdbs, libgtk2.0-dev, flite-dev, libgps-dev (= 2.34.dfsg-5) | gpsd ( 2.34.dfsg-1), dpatch, libxml2-dev +Build-Depends: debhelper ( 5.0.0), cdbs, libgtk2.0-dev, flite-dev, dpatch, libxml2-dev Standards-Version: 3.8.0 Homepage: http://wiki.openstreetmap.org/index.php/Gosmore Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gosmore/trunk ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2276 - in packages/gpsdrive/trunk/debian: . patches
Author: nd-guest Date: 2009-06-11 19:43:07 + (Thu, 11 Jun 2009) New Revision: 2276 Modified: packages/gpsdrive/trunk/debian/changelog packages/gpsdrive/trunk/debian/control packages/gpsdrive/trunk/debian/patches/96-mapnik-plugins-dir.dpatch packages/gpsdrive/trunk/debian/rules Log: fix #527956 Modified: packages/gpsdrive/trunk/debian/changelog === --- packages/gpsdrive/trunk/debian/changelog2009-06-11 09:08:21 UTC (rev 2275) +++ packages/gpsdrive/trunk/debian/changelog2009-06-11 19:43:07 UTC (rev 2276) @@ -1,3 +1,13 @@ +gpsdrive (2.10~pre4-6.dfsg-3) unstable; urgency=low + + * Regenerate aclocal.m4 with libtoolize in debian/rules. +Thanks to Adam D. Barratt (Closes: #527956) + * Updated build-dep to libmapnik-dev = 0.6. + * Updated 96-mapnik-plugins-dir.dpatch to define the correct +MAPNIK_PATH. + + -- Andreas Putzo andr...@putzo.net Thu, 11 Jun 2009 19:26:06 + + gpsdrive (2.10~pre4-6.dfsg-2) unstable; urgency=low * Remove example script gpssmswatch. Prone to symlink attacks Modified: packages/gpsdrive/trunk/debian/control === --- packages/gpsdrive/trunk/debian/control 2009-06-11 09:08:21 UTC (rev 2275) +++ packages/gpsdrive/trunk/debian/control 2009-06-11 19:43:07 UTC (rev 2276) @@ -4,7 +4,7 @@ Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Andreas Putzo andr...@putzo.net DM-Upload-Allowed: yes -Build-Depends: debhelper (= 5), automake1.9, libtool, pkg-config, libpcre3-dev, libgtk2.0-dev,libart-2.0-dev, libxml2-dev, libmysqlclient15-dev, autotools-dev, dpatch, libmapnik-dev (= 0.5~svn638), libboost-dev, libboost-filesystem-dev, libboost-serialization-dev, libdbus-glib-1-dev +Build-Depends: debhelper (= 5), automake1.9, libtool, pkg-config, libpcre3-dev, libgtk2.0-dev,libart-2.0-dev, libxml2-dev, libmysqlclient15-dev, autotools-dev, dpatch, libmapnik-dev (= 0.6), libboost-dev, libboost-filesystem-dev, libboost-serialization-dev, libdbus-glib-1-dev Standards-Version: 3.8.0 Homepage: http://gpsdrive.de Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gpsdrive/ Modified: packages/gpsdrive/trunk/debian/patches/96-mapnik-plugins-dir.dpatch === --- packages/gpsdrive/trunk/debian/patches/96-mapnik-plugins-dir.dpatch 2009-06-11 09:08:21 UTC (rev 2275) +++ packages/gpsdrive/trunk/debian/patches/96-mapnik-plugins-dir.dpatch 2009-06-11 19:43:07 UTC (rev 2276) @@ -4,15 +4,15 @@ ## DP: Use correct mapnik path on debian systems. @DPATCH@ -diff -urNad gpsdrive-2.10~pre4~/src/mapnik.cpp gpsdrive-2.10~pre4/src/mapnik.cpp gpsdrive-2.10~pre4~/src/mapnik.cpp 2008-02-20 14:49:36.0 +0100 -+++ gpsdrive-2.10~pre4/src/mapnik.cpp 2008-02-20 14:51:30.0 +0100 +diff -urNad gpsdrive-2.10~pre4-6.dfsg~/src/mapnik.cpp gpsdrive-2.10~pre4-6.dfsg/src/mapnik.cpp +--- gpsdrive-2.10~pre4-6.dfsg~/src/mapnik.cpp 2009-06-11 19:23:32.0 + gpsdrive-2.10~pre4-6.dfsg/src/mapnik.cpp 2009-06-11 19:23:32.0 + @@ -108,6 +108,10 @@ return StringToReplace; } +#if !defined(MAPNIK_PATH) -+#define MAPNIK_PATH /usr/lib/mapnik/0.5 ++#define MAPNIK_PATH /usr/lib/mapnik/0.6 +#endif + /* Modified: packages/gpsdrive/trunk/debian/rules === --- packages/gpsdrive/trunk/debian/rules2009-06-11 09:08:21 UTC (rev 2275) +++ packages/gpsdrive/trunk/debian/rules2009-06-11 19:43:07 UTC (rev 2276) @@ -48,6 +48,7 @@ aclocal -I m4 --force automake --add-missing autoconf + libtoolize -i -f ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ --enable-mapnik \ ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2277 - packages/osm2pgsql/tags
Author: nd-guest Date: 2009-06-11 19:48:00 + (Thu, 11 Jun 2009) New Revision: 2277 Added: packages/osm2pgsql/tags/0.66.20090526-1/ Log: [svn-buildpackage] Tagging osm2pgsql (0.66.20090526-1) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2278 - packages/gpsdrive/tags
Author: nd-guest Date: 2009-06-11 20:20:16 + (Thu, 11 Jun 2009) New Revision: 2278 Added: packages/gpsdrive/tags/2.10~pre4-6.dfsg-3/ Log: [svn-buildpackage] Tagging gpsdrive (2.10~pre4-6.dfsg-3) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2270 - packages/osm2pgsql/tarballs
Author: nd-guest Date: 2009-06-09 10:54:08 + (Tue, 09 Jun 2009) New Revision: 2270 Added: packages/osm2pgsql/tarballs/osm2pgsql-0.66.20090526.orig.tar.gz Log: add orig.tar.gz to svn Added: packages/osm2pgsql/tarballs/osm2pgsql-0.66.20090526.orig.tar.gz === (Binary files differ) Property changes on: packages/osm2pgsql/tarballs/osm2pgsql-0.66.20090526.orig.tar.gz ___ Added: svn:mime-type + application/octet-stream ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2269 - packages/osm2pgsql/trunk/debian
Author: nd-guest Date: 2009-06-08 21:45:34 + (Mon, 08 Jun 2009) New Revision: 2269 Modified: packages/osm2pgsql/trunk/debian/changelog Log: close #532145 Modified: packages/osm2pgsql/trunk/debian/changelog === --- packages/osm2pgsql/trunk/debian/changelog 2009-06-07 13:40:30 UTC (rev 2268) +++ packages/osm2pgsql/trunk/debian/changelog 2009-06-08 21:45:34 UTC (rev 2269) @@ -1,6 +1,6 @@ osm2pgsql (0.66.20090526-1) unstable; urgency=low - * New upstream svn snapshot. + * New upstream svn snapshot. (Closes: #532145) * Removed 10-missing-includes patch, fixed upstream. * Updated long description, mostly taken from osm2pgsql.spec.in. * Updated copyright year of debian packaging. @@ -10,7 +10,7 @@ * Use dh_prep instead of dh_clean -k to fix a lintian warning. * Updated manpage. - -- Andreas Putzo andr...@putzo.net Tue, 26 May 2009 19:40:51 + + -- Andreas Putzo andr...@putzo.net Mon, 08 Jun 2009 21:44:57 + osm2pgsql (0.52.20080408-3) unstable; urgency=high ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2239 - in packages/osm2pgsql/trunk/debian: . patches
Author: nd-guest
Date: 2009-05-26 17:57:31 + (Tue, 26 May 2009)
New Revision: 2239
Removed:
packages/osm2pgsql/trunk/debian/patches/10-missing-includes.dpatch
Modified:
packages/osm2pgsql/trunk/debian/changelog
packages/osm2pgsql/trunk/debian/patches/00list
packages/osm2pgsql/trunk/debian/rules
Log:
preparing new upstream svn release
Modified: packages/osm2pgsql/trunk/debian/changelog
===
--- packages/osm2pgsql/trunk/debian/changelog 2009-05-26 14:01:17 UTC (rev
2238)
+++ packages/osm2pgsql/trunk/debian/changelog 2009-05-26 17:57:31 UTC (rev
2239)
@@ -1,8 +1,10 @@
-osm2pgsql (0.52.20080408-4) UNRELEASED; urgency=low
+osm2pgsql (0.66.20090526-1) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * New upstream svn snapshot.
+ * Removed 10-missing-includes patch, fixed upstream.
- -- Francesco Paolo Lovergine fran...@debian.org Tue, 26 May 2009 16:01:09
+0200
+ -- Andreas Putzo andr...@putzo.net Tue, 26 May 2009 17:55:44 +
osm2pgsql (0.52.20080408-3) unstable; urgency=high
Modified: packages/osm2pgsql/trunk/debian/patches/00list
===
--- packages/osm2pgsql/trunk/debian/patches/00list 2009-05-26 14:01:17 UTC
(rev 2238)
+++ packages/osm2pgsql/trunk/debian/patches/00list 2009-05-26 17:57:31 UTC
(rev 2239)
@@ -1 +1 @@
-10-missing-includes
+#10-missing-includes
Deleted: packages/osm2pgsql/trunk/debian/patches/10-missing-includes.dpatch
===
--- packages/osm2pgsql/trunk/debian/patches/10-missing-includes.dpatch
2009-05-26 14:01:17 UTC (rev 2238)
+++ packages/osm2pgsql/trunk/debian/patches/10-missing-includes.dpatch
2009-05-26 17:57:31 UTC (rev 2239)
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-missing-includes.dpatch by Andreas Putzo andr...@putzo.net
-##
-## DP: Add missing includes to compile with gcc-4.3. Patch by Chris Lamb
ch...@chris-lamb.co.uk.
-
-...@dpatch@
-diff -urNad osm2pgsql-0.52.20080408~/build_geometry.cpp
osm2pgsql-0.52.20080408/build_geometry.cpp
osm2pgsql-0.52.20080408~/build_geometry.cpp2007-12-10
22:02:04.0 +
-+++ osm2pgsql-0.52.20080408/build_geometry.cpp 2008-04-12 20:31:38.0
+
-@@ -22,6 +22,7 @@
-
- #include iostream
- #include cstring
-+#include cstdlib
-
- #include geos_c.h
-
Modified: packages/osm2pgsql/trunk/debian/rules
===
--- packages/osm2pgsql/trunk/debian/rules 2009-05-26 14:01:17 UTC (rev
2238)
+++ packages/osm2pgsql/trunk/debian/rules 2009-05-26 17:57:31 UTC (rev
2239)
@@ -7,8 +7,8 @@
include /usr/share/dpatch/dpatch.make
SVNREPO := http://svn.openstreetmap.org/applications/utils/export/osm2pgsql
-SVNREV := 7141
-VERSION := 0.52
+SVNREV := 15176
+VERSION := 0.66
DATE := $(shell date +%Y%m%d)
CFLAGS = -Wall -g
@@ -24,8 +24,10 @@
test -d ../tarballs/. || mkdir -p ../tarballs
@echo Downloading osm2pgsql from ${SVNREPO}
svn export -r ${SVNREV} ${SVNREPO}
../tarballs/osm2pgsql-${VERSION}.${DATE}/
+ @echo Removing debian dir
+ rm -rf ../tarballs/osm2pgsql-${VERSION}-${DATE}/debian/
@echo Building snapshot tarball.
- tar czvf ../tarballs/osm2pgsql-${VERSION}.${DATE}.orig.tar.gz -C
../tarballs osm2pgsql-${VERSION}.${DATE}
+ tar czvf ../tarballs/osm2pgsql_${VERSION}.${DATE}.orig.tar.gz -C
../tarballs osm2pgsql-${VERSION}.${DATE}
@echo Cleaning up
rm -rf ../tarballs/osm2pgsql-${VERSION}.${DATE}
@echo .
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2240 - in packages/osm2pgsql/trunk/debian: . patches
Author: nd-guest Date: 2009-05-26 18:13:27 + (Tue, 26 May 2009) New Revision: 2240 Added: packages/osm2pgsql/trunk/debian/patches/01_style_location Modified: packages/osm2pgsql/trunk/debian/install packages/osm2pgsql/trunk/debian/patches/00list Log: added patch from Frederik Ramm to install styles system-wide. Modified: packages/osm2pgsql/trunk/debian/install === --- packages/osm2pgsql/trunk/debian/install 2009-05-26 17:57:31 UTC (rev 2239) +++ packages/osm2pgsql/trunk/debian/install 2009-05-26 18:13:27 UTC (rev 2240) @@ -1 +1,2 @@ osm2pgsql /usr/bin/ +default.style /usr/share/osm2pgsql Modified: packages/osm2pgsql/trunk/debian/patches/00list === --- packages/osm2pgsql/trunk/debian/patches/00list 2009-05-26 17:57:31 UTC (rev 2239) +++ packages/osm2pgsql/trunk/debian/patches/00list 2009-05-26 18:13:27 UTC (rev 2240) @@ -1 +1 @@ -#10-missing-includes +01_style_location Added: packages/osm2pgsql/trunk/debian/patches/01_style_location === --- packages/osm2pgsql/trunk/debian/patches/01_style_location (rev 0) +++ packages/osm2pgsql/trunk/debian/patches/01_style_location 2009-05-26 18:13:27 UTC (rev 2240) @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_style_location.dpatch by f...@lochewe +## +## DP: Change default location of style file + +...@dpatch@ +diff -urNad old/osm2pgsql.c new/osm2pgsql.c +--- old/osm2pgsql.c(revision 14063) new/osm2pgsql.c(working copy) +@@ -483,7 +483,7 @@ + fprintf(stderr,-p|--prefix\t\tPrefix for table names (default planet_osm)\n); + fprintf(stderr,-s|--slim\t\tStore temporary data in the database. This greatly\n); + fprintf(stderr, \t\treduces the RAM usage but is much slower.\n); +-fprintf(stderr,-S|--style\t\tLocation of the style file. Defaults to ./default.style\n); ++fprintf(stderr,-S|--style\t\tLocation of the style file. Defaults to /usr/share/osm2pgsql/default.style\n); + fprintf(stderr,-C|--cache\t\tOnly for slim mode: Use upto this many MB for caching nodes\n); + fprintf(stderr, \t\tDefault is 800\n); + fprintf(stderr,-U|--username\tPostgresql user name.\n); +@@ -592,7 +592,7 @@ + const char *port = 5432; + const char *conninfo = NULL; + const char *prefix = planet_osm; +-const char *style = ./default.style; ++const char *style = /usr/share/osm2pgsql/default.style; + const char *temparg; + int cache = 800; + struct output_options options; Property changes on: packages/osm2pgsql/trunk/debian/patches/01_style_location ___ Added: svn:executable + * ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2241 - packages/osm2pgsql/trunk/debian
Author: nd-guest Date: 2009-05-26 18:29:22 + (Tue, 26 May 2009) New Revision: 2241 Modified: packages/osm2pgsql/trunk/debian/osm2pgsql.1 Log: update manpage Modified: packages/osm2pgsql/trunk/debian/osm2pgsql.1 === --- packages/osm2pgsql/trunk/debian/osm2pgsql.1 2009-05-26 18:13:27 UTC (rev 2240) +++ packages/osm2pgsql/trunk/debian/osm2pgsql.1 2009-05-26 18:29:22 UTC (rev 2241) @@ -1,4 +1,4 @@ -.TH OSM2PGSQL 1 April 12, 2008 +.TH OSM2PGSQL 1 May 26, 2009 .\ Please adjust this date whenever revising the manpage. .SH NAME osm2pgsql \- Openstreetmap data to PostgreSQL converter. @@ -49,8 +49,11 @@ Store data in degrees of latitude longitude. .TP \fB\-m\fR|\-\-merc -Store data in proper spherical mercator, not OSM merc +Store data in proper spherical mercator (default) .TP +\fB\-M\fR|\-\-oldmerc +Store data in the legay OSM mercator format +.TP \fB\-E\fR|\-\-proj num Use projection EPSG:num .TP @@ -61,6 +64,15 @@ \fB\-p\fR|\-\-prefix Prefix for table names (default planet_osm) .TP +\fB\-s\fR|\-\-slim +Store temorary data in the database. This greatly reduces the RAM usage but is much slower. +.TP +\fB\-S\fR|\-\-style +Location of the style file. Default to /usr/share/osm2pgsql/default.style +.TP +\fB\-C\fR|\-\-cache +Only for slim mode: Use up to this this many MB for caching nodes. Default is 800MB. +.TP \fB\-U\fR|\-\-username Postgresql user name. .TP @@ -73,10 +85,21 @@ \fB\-P\fR|\-\-port Database server port. .TP +\fB\-e\fR|\-\-expire-tiles [min_zoom-]max_zoom +Create a tile expiry list. +.TP +\fB\-o\fR|\-\-expire-output filename +Output filename for expired tiles list. +.TP +\fB\-O\fR|\-\-output +Output backend. +pgsql - Output to a PostGIS database. (default) +null - No output. Useful for testing. +.TP \fB\-h\fR|\-\-help Help information. .br -Add \fB\-v\fR to display supported projections. +Add \fB\-vh\fR to display supported projections. .br Use \fB\-E\fR to access any espg projections (usually in /usr/share/proj/epsg) .TP @@ -86,7 +109,7 @@ .SH SUPPORTED PROJECTIONS Latlong (-l) SRS: 4326 (none) .br -WGS84 Mercator ( ) SRS: 3395 +proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs +WGS84 Mercator (-M) SRS: 3395 +proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs .br Spherical Mercator (-m) SRS:900913 +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgri...@null +no_defs +over .PP ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2242 - in packages/osm2pgsql: . tarballs
Author: nd-guest Date: 2009-05-26 19:09:31 + (Tue, 26 May 2009) New Revision: 2242 Added: packages/osm2pgsql/tarballs/ packages/osm2pgsql/tarballs/osm2pgsql_0.66.20090526.orig.tar.gz Log: add orig tarballs Added: packages/osm2pgsql/tarballs/osm2pgsql_0.66.20090526.orig.tar.gz === (Binary files differ) Property changes on: packages/osm2pgsql/tarballs/osm2pgsql_0.66.20090526.orig.tar.gz ___ Added: svn:mime-type + application/octet-stream ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2243 - packages/osm2pgsql/trunk/debian
Author: nd-guest Date: 2009-05-26 19:34:09 + (Tue, 26 May 2009) New Revision: 2243 Modified: packages/osm2pgsql/trunk/debian/changelog packages/osm2pgsql/trunk/debian/control packages/osm2pgsql/trunk/debian/copyright packages/osm2pgsql/trunk/debian/rules Log: fixating changelog added dm-upload-allowed some minor changes Modified: packages/osm2pgsql/trunk/debian/changelog === --- packages/osm2pgsql/trunk/debian/changelog 2009-05-26 19:09:31 UTC (rev 2242) +++ packages/osm2pgsql/trunk/debian/changelog 2009-05-26 19:34:09 UTC (rev 2243) @@ -3,8 +3,15 @@ * NOT RELEASED YET * New upstream svn snapshot. * Removed 10-missing-includes patch, fixed upstream. + * Updated long description, mostly taken from osm2pgsql.spec.in. + * Updated copyright year of debian packaging. + * Added DM-Upload-Allowed to debian/control. + * Added 01_style_location patch from Frederik Ramm to reflect +path of style files on debian systems. + * Use dh_prep instead of dh_clean -k to fix a lintian warning. + * Updated manpage. - -- Andreas Putzo andr...@putzo.net Tue, 26 May 2009 17:55:44 + + -- Andreas Putzo andr...@putzo.net Tue, 26 May 2009 18:28:59 + osm2pgsql (0.52.20080408-3) unstable; urgency=high Modified: packages/osm2pgsql/trunk/debian/control === --- packages/osm2pgsql/trunk/debian/control 2009-05-26 19:09:31 UTC (rev 2242) +++ packages/osm2pgsql/trunk/debian/control 2009-05-26 19:34:09 UTC (rev 2243) @@ -3,6 +3,7 @@ Priority: optional Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Andreas Putzo andr...@putzo.net, Francesco Paolo Lovergine fran...@debian.org +DM-Upload-Allowed: yes Build-Depends: debhelper (= 7), dpatch, libbz2-dev, libgeos-dev, libpq-dev, libxml2-dev, libproj-dev Standards-Version: 3.8.1 Homepage: http://wiki.openstreetmap.org/wiki/Osm2pgsql @@ -14,5 +15,6 @@ Suggests: josm, gosmore Description: Openstreetmap data to PostgreSQL converter Convert OSM planet snapshot data to SQL suitable for loading - into a PostgreSQL database which can then be used by Mapnik to - render map tiles. + into a PostgreSQL database with PostGIS geospatial extensions. This + database may then be used to render maps with Mapnik or for other + geospatial analysis. Modified: packages/osm2pgsql/trunk/debian/copyright === --- packages/osm2pgsql/trunk/debian/copyright 2009-05-26 19:09:31 UTC (rev 2242) +++ packages/osm2pgsql/trunk/debian/copyright 2009-05-26 19:34:09 UTC (rev 2243) @@ -62,5 +62,5 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. -The Debian packaging is (C) 2007, Andreas Putzo andr...@putzo.net and +The Debian packaging is (C) 2007-2009 Andreas Putzo andr...@putzo.net and is licensed under the GPL, see above. Modified: packages/osm2pgsql/trunk/debian/rules === --- packages/osm2pgsql/trunk/debian/rules 2009-05-26 19:09:31 UTC (rev 2242) +++ packages/osm2pgsql/trunk/debian/rules 2009-05-26 19:34:09 UTC (rev 2243) @@ -58,7 +58,7 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs binary-indep: build install ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2244 - packages/osm2pgsql/trunk/debian
Author: nd-guest Date: 2009-05-26 19:38:18 + (Tue, 26 May 2009) New Revision: 2244 Modified: packages/osm2pgsql/trunk/debian/changelog packages/osm2pgsql/trunk/debian/copyright packages/osm2pgsql/trunk/debian/rules Log: remove cruft Modified: packages/osm2pgsql/trunk/debian/changelog === --- packages/osm2pgsql/trunk/debian/changelog 2009-05-26 19:34:09 UTC (rev 2243) +++ packages/osm2pgsql/trunk/debian/changelog 2009-05-26 19:38:18 UTC (rev 2244) @@ -1,15 +1,15 @@ osm2pgsql (0.66.20090526-1) UNRELEASED; urgency=low * NOT RELEASED YET - * New upstream svn snapshot. - * Removed 10-missing-includes patch, fixed upstream. - * Updated long description, mostly taken from osm2pgsql.spec.in. + * New upstream svn snapshot. + * Removed 10-missing-includes patch, fixed upstream. + * Updated long description, mostly taken from osm2pgsql.spec.in. * Updated copyright year of debian packaging. * Added DM-Upload-Allowed to debian/control. * Added 01_style_location patch from Frederik Ramm to reflect path of style files on debian systems. - * Use dh_prep instead of dh_clean -k to fix a lintian warning. - * Updated manpage. + * Use dh_prep instead of dh_clean -k to fix a lintian warning. + * Updated manpage. -- Andreas Putzo andr...@putzo.net Tue, 26 May 2009 18:28:59 + Modified: packages/osm2pgsql/trunk/debian/copyright === --- packages/osm2pgsql/trunk/debian/copyright 2009-05-26 19:34:09 UTC (rev 2243) +++ packages/osm2pgsql/trunk/debian/copyright 2009-05-26 19:38:18 UTC (rev 2244) @@ -1,15 +1,15 @@ This package was debianized by Andreas Putzo andr...@putzo.net on Sun, 30 Sep 2007 10:57:29 +. -It was downloaded using svn from +It was downloaded using svn from http://svn.openstreetmap.org/applications/utils/export/osm2pgsql/. -Upstream Authors: +Upstream Authors: Jon Burgess jburgess...@googlemail.com Artem Pavlenko ar...@mapnik.org -Copyright: +Copyright: Copyright (C) 2006,2007,2008 Jon Burgess Copyright (C) 2007,2007 Artem Pavlenko @@ -20,12 +20,12 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA @@ -48,19 +48,19 @@ documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies. - + IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN AS IS BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - - + + The Debian packaging is (C) 2007-2009 Andreas Putzo andr...@putzo.net and is licensed under the GPL, see above. Modified: packages/osm2pgsql/trunk/debian/rules === --- packages/osm2pgsql/trunk/debian/rules 2009-05-26 19:34:09 UTC (rev 2243) +++ packages/osm2pgsql/trunk/debian/rules 2009-05-26 19:38:18 UTC (rev 2244) @@ -53,7 +53,7 @@ dh_testroot rm -f build-stamp configure-stamp [ ! -f Makefile ] || $(MAKE) clean - dh_clean + dh_clean install: build dh_testdir @@ -66,7 +66,7 @@ binary-arch: build install dh_testdir dh_testroot - dh_installchangelogs + dh_installchangelogs dh_installdocs dh_install dh_installman ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2245 - packages/osm2pgsql/trunk/debian
Author: nd-guest Date: 2009-05-26 19:42:30 + (Tue, 26 May 2009) New Revision: 2245 Modified: packages/osm2pgsql/trunk/debian/changelog Log: preparing for release Modified: packages/osm2pgsql/trunk/debian/changelog === --- packages/osm2pgsql/trunk/debian/changelog 2009-05-26 19:38:18 UTC (rev 2244) +++ packages/osm2pgsql/trunk/debian/changelog 2009-05-26 19:42:30 UTC (rev 2245) @@ -1,6 +1,5 @@ -osm2pgsql (0.66.20090526-1) UNRELEASED; urgency=low +osm2pgsql (0.66.20090526-1) unstable; urgency=low - * NOT RELEASED YET * New upstream svn snapshot. * Removed 10-missing-includes patch, fixed upstream. * Updated long description, mostly taken from osm2pgsql.spec.in. @@ -11,7 +10,7 @@ * Use dh_prep instead of dh_clean -k to fix a lintian warning. * Updated manpage. - -- Andreas Putzo andr...@putzo.net Tue, 26 May 2009 18:28:59 + + -- Andreas Putzo andr...@putzo.net Tue, 26 May 2009 19:40:51 + osm2pgsql (0.52.20080408-3) unstable; urgency=high ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2182 - packages/josm/trunk/debian
Author: nd-guest Date: 2009-04-20 11:43:42 + (Mon, 20 Apr 2009) New Revision: 2182 Modified: packages/josm/trunk/debian/changelog packages/josm/trunk/debian/control Log: bump policy Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2009-04-20 10:53:13 UTC (rev 2181) +++ packages/josm/trunk/debian/changelog2009-04-20 11:43:42 UTC (rev 2182) @@ -1,11 +1,15 @@ josm (0.0.svn1529-1) unstable; urgency=low + [ Giovanni Mascellani ] * New upstream release + Fix bug in uploading with 0.6 API (closes: #524628). Thanks to Damien Raude-Morvan for the report. - -- Giovanni Mascellani g.mascell...@gmail.com Sun, 19 Apr 2009 10:46:12 +0200 + [ Andreas Putzo ] + * Bumped policy to 3.8.1, without changes. + -- Andreas Putzo andr...@putzo.net Mon, 20 Apr 2009 10:46:57 + + josm (0.0.svn1515-1) unstable; urgency=low [ Giovanni Mascellani ] Modified: packages/josm/trunk/debian/control === --- packages/josm/trunk/debian/control 2009-04-20 10:53:13 UTC (rev 2181) +++ packages/josm/trunk/debian/control 2009-04-20 11:43:42 UTC (rev 2182) @@ -5,7 +5,7 @@ Uploaders: Andreas Putzo andr...@putzo.net, Giovanni Mascellani g.mascell...@gmail.com, Petter Reinholdtsen p...@debian.org DM-Upload-Allowed: yes Build-Depends: ant, cdbs, dpatch, debhelper (= 5), gettext, openjdk-6-jdk, libgettext-commons-java, libmetadata-extractor-java -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 Homepage: http://josm.openstreetmap.de Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/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] r2183 - packages/josm/tags
Author: nd-guest Date: 2009-04-20 11:52:17 + (Mon, 20 Apr 2009) New Revision: 2183 Added: packages/josm/tags/0.0.svn1529-1/ Log: [svn-buildpackage] Tagging josm (0.0.svn1529-1) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2163 - packages/josm/trunk/debian
Author: nd-guest
Date: 2009-04-16 19:54:50 + (Thu, 16 Apr 2009)
New Revision: 2163
Modified:
packages/josm/trunk/debian/rules
Log:
remove binary content right before creating the tar.gz.
the i18n stuff has another lib dir.
Modified: packages/josm/trunk/debian/rules
===
--- packages/josm/trunk/debian/rules2009-04-16 10:16:09 UTC (rev 2162)
+++ packages/josm/trunk/debian/rules2009-04-16 19:54:50 UTC (rev 2163)
@@ -41,15 +41,15 @@
test -d ../tarballs/. || mkdir -p ../tarballs
@echo Downloading josm from ${SVNREPO}
svn export -r ${SVNREV} ${SVNREPO} ${DESTDIR}
- @echo Removing jar files and test data
- find ${DESTDIR} -name *.jar -exec rm -v {} \;
- rm -f ${DESTDIR}/data/*
@echo Removing icons directory
rm -rf ${DESTDIR}/images/styles/standard
@echo Fetching revision metadata
svn info --xml -r ${SVNREV} ${SVNREPO} ${DESTDIR}/REVISION
@echo Fetching internalization data...
svn export ${SVNI18NREPO} ${DESTDIR}/i18n
+ @echo Removing jar files and test data
+ find ${DESTDIR} -name *.jar -exec rm -v {} \;
+ rm -f ${DESTDIR}/data/*
@echo Building snapshot tarball
tar czf ${DESTTGZ} -C `dirname ${DESTDIR}` `basename ${DESTDIR}`
@echo Cleaning up
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2164 - packages/josm/trunk/debian
Author: nd-guest
Date: 2009-04-16 20:08:14 + (Thu, 16 Apr 2009)
New Revision: 2164
Modified:
packages/josm/trunk/debian/changelog
packages/josm/trunk/debian/copyright
Log:
add copyright of po files
Modified: packages/josm/trunk/debian/changelog
===
--- packages/josm/trunk/debian/changelog2009-04-16 19:54:50 UTC (rev
2163)
+++ packages/josm/trunk/debian/changelog2009-04-16 20:08:14 UTC (rev
2164)
@@ -12,12 +12,12 @@
(Closes: #497559)
[ Andreas Putzo ]
- * Add copyright holders of NmeaReader.java, Changeset.java, TigerUtils.java
-to debian/copyright.
+ * Add copyright holders of NmeaReader.java, Changeset.java, TigerUtils.java,
+i18n/po/* to debian/copyright.
* Add README.source file to comply with policy.
* Add command line arguments and environment section to manpage.
- -- Giovanni Mascellani g.mascell...@gmail.com Wed, 01 Apr 2009 15:05:30
+0200
+ -- Andreas Putzo andr...@putzo.net Thu, 16 Apr 2009 20:07:09 +
josm (0.0.0.20080713-1) unstable; urgency=low
Modified: packages/josm/trunk/debian/copyright
===
--- packages/josm/trunk/debian/copyright2009-04-16 19:54:50 UTC (rev
2163)
+++ packages/josm/trunk/debian/copyright2009-04-16 20:08:14 UTC (rev
2164)
@@ -131,3 +131,36 @@
Files: src/org/openstreetmap/gui/jmapviewer/OsmMercator.java
Copyright: Copyright (c) 2007 Tim Haussmann
License: GPL-2
+
+Files: i18n/po/{ar,bg,cs,da,el,es,fi,he,is,ja,nl,ru,sk,sl,sv}.po
+Copyright: Copyright (c) 2009 Rosetta Contributers and Canonical Ltd 2009
+License: GPL-2
+
+Files: i18n/po/de.po
+Copyright: Copyright (c) 2006,2007 Sven Anders s...@anders-hamburg.de
+ Copyright (c) 2008 Matthias Merz openstreet...@merz.inka.de
+ Copyright (c) 2008, 2009 Dirk St�cker openstreet...@dstoecker.de
+License: GPL-2
+
+Files: i18n/po/en_GB.po
+Copyright: Copyright (c) 2006 Immanuel Scholz
+License: GPL-2
+
+Files: i18n/po/fr.po
+Copyright: Copyright (c) 2006 Frederic Bonifas fredericboni...@gmail.com
+License: GPL-2
+
+Files: i18n/po/it.po
+Copyright: Copyright (c) 2009 Davide Prade dav...@alice.it and others
+License: GPL-2
+
+Files: i18n/po/pl.po
+Copyright: Copyright (c) 2008 PAWE� MADEJ nysan...@quanteam.pl
+ Copyright (c) 2008 Nabuchodonozor nabuchodonozor@gmail.com
+ Copyright (c) 2008 MARCIN FLORYAN mflor...@mmsqaure.com
+License: GPL-2
+
+Files: i18n/po/tr.po
+Copyright: Copyright (c) 2009 ikinokta
+ Copyright (c) 2009 Cezmi Topalo�lu cezmi.topalo...@ikinokta.com
+License: GPL-2
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2165 - packages/josm/tarballs
Author: nd-guest Date: 2009-04-16 20:14:02 + (Thu, 16 Apr 2009) New Revision: 2165 Modified: packages/josm/tarballs/josm_0.0.svn1515.orig.tar.gz Log: update orig.tgz without jar file Modified: packages/josm/tarballs/josm_0.0.svn1515.orig.tar.gz === (Binary files differ) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2167 - packages/josm/tags
Author: nd-guest Date: 2009-04-16 21:12:35 + (Thu, 16 Apr 2009) New Revision: 2167 Added: packages/josm/tags/0.0.svn1515-1/ Log: [svn-buildpackage] Tagging josm (0.0.svn1515-1) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1943 - packages/josm-plugins/trunk/debian
Author: nd-guest Date: 2009-02-25 21:47:03 + (Wed, 25 Feb 2009) New Revision: 1943 Modified: packages/josm-plugins/trunk/debian/changelog packages/josm-plugins/trunk/debian/control packages/josm-plugins/trunk/debian/copyright packages/josm-plugins/trunk/debian/rules Log: update long description use openjdk instead of gcj Modified: packages/josm-plugins/trunk/debian/changelog === --- packages/josm-plugins/trunk/debian/changelog2009-02-25 19:01:13 UTC (rev 1942) +++ packages/josm-plugins/trunk/debian/changelog2009-02-25 21:47:03 UTC (rev 1943) @@ -1,9 +1,15 @@ josm-plugins (0.0.svn13741-1) UNRELEASED; urgency=low + [ Giovanni Mascellani ] * New upstream revision - -- Giovanni Mascellani g.mascell...@gmail.com Sun, 15 Feb 2009 19:34:54 +0100 + [ Andreas Putzo ] + * Update packaging copyright year. + * Mention added plugins in long description. + * Use openjdk in debian/rules to be consistent with build dependency. + -- Andreas Putzo andr...@putzo.net Wed, 25 Feb 2009 21:43:30 + + josm-plugins (0.0.0.20080518-1) unstable; urgency=low * Upstream SVN revision number again available for plugins ywms and Modified: packages/josm-plugins/trunk/debian/control === --- packages/josm-plugins/trunk/debian/control 2009-02-25 19:01:13 UTC (rev 1942) +++ packages/josm-plugins/trunk/debian/control 2009-02-25 21:47:03 UTC (rev 1943) @@ -18,9 +18,16 @@ JOSM (Java OpenStreetMap) plugin collection. . This package contains the following plugins: + * agpifoj- Creates a new layer with geotagged pictures. * colorscheme- Allows to create different color schemes. * livegps- Supports live GPS input together with gpsd. + * measurement- Adds a dialog and a layer to measure length and angle of + segments and create measurement paths.. + * openvisible- Allows opening gpx and osm files that intersect the currently + visible screen area. * slippymap - Displays a slippy map grid in JOSM. + * surveyor - Allows adding markers/nodes on current gps positions. + * usertools - Tools to help work with other authors/users. * utilsplugin- Several helper utilities. * validator - Data validator. * wmsplugin - Displays background images from any WMS source. Modified: packages/josm-plugins/trunk/debian/copyright === --- packages/josm-plugins/trunk/debian/copyright2009-02-25 19:01:13 UTC (rev 1942) +++ packages/josm-plugins/trunk/debian/copyright2009-02-25 21:47:03 UTC (rev 1943) @@ -8,7 +8,7 @@ Files: debian/* Copyright: © 2008-2009 Giovanni Mascellani g.mascell...@gmail.com - © 2008 Andreas Putzo andr...@putzo.net + © 2008-2009 Andreas Putzo andr...@putzo.net License: GPL-2+ The Debian packaging information is under the GPL, version 2 or later. Modified: packages/josm-plugins/trunk/debian/rules === --- packages/josm-plugins/trunk/debian/rules2009-02-25 19:01:13 UTC (rev 1942) +++ packages/josm-plugins/trunk/debian/rules2009-02-25 21:47:03 UTC (rev 1943) @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/dpatch.mk -JAVA_HOME := /usr/lib/jvm/java-gcj/ +JAVA_HOME := /usr/lib/jvm/java-6-openjdk ANT_HOME := /usr/share/ant DEB_JARS := /usr/share/josm/josm.jar DEB_ANT_BUILDFILE := $(CURDIR)/debian/master.xml ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1944 - packages/josm-plugins/trunk/debian
Author: nd-guest Date: 2009-02-25 21:52:05 + (Wed, 25 Feb 2009) New Revision: 1944 Modified: packages/josm-plugins/trunk/debian/control Log: add newlines to make lintian happy Modified: packages/josm-plugins/trunk/debian/control === --- packages/josm-plugins/trunk/debian/control 2009-02-25 21:47:03 UTC (rev 1943) +++ packages/josm-plugins/trunk/debian/control 2009-02-25 21:52:05 UTC (rev 1944) @@ -21,10 +21,10 @@ * agpifoj- Creates a new layer with geotagged pictures. * colorscheme- Allows to create different color schemes. * livegps- Supports live GPS input together with gpsd. - * measurement- Adds a dialog and a layer to measure length and angle of - segments and create measurement paths.. - * openvisible- Allows opening gpx and osm files that intersect the currently - visible screen area. + * measurement- Adds a dialog and a layer to measure length + and angle of segments and create measurement paths. + * openvisible- Allows opening gpx and osm files that intersect + the currently visible screen area. * slippymap - Displays a slippy map grid in JOSM. * surveyor - Allows adding markers/nodes on current gps positions. * usertools - Tools to help work with other authors/users. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1933 - packages/josm/trunk/debian
Author: nd-guest Date: 2009-02-23 22:14:21 + (Mon, 23 Feb 2009) New Revision: 1933 Added: packages/josm/trunk/debian/README.source Log: Add a README.source file Added: packages/josm/trunk/debian/README.source === --- packages/josm/trunk/debian/README.source(rev 0) +++ packages/josm/trunk/debian/README.source2009-02-23 22:14:21 UTC (rev 1933) @@ -0,0 +1,5 @@ +This package uses the dpatch system to apply patches to the upstream +source code of the software that is packaged. For details about how to +use dpatch read + /usr/share/doc/dpatch/README.source.gz +from the dpatch package. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1850 - packages/josm/trunk/debian
Author: nd-guest
Date: 2009-02-02 20:55:49 + (Mon, 02 Feb 2009)
New Revision: 1850
Modified:
packages/josm/trunk/debian/changelog
packages/josm/trunk/debian/copyright
Log:
be more specific in d/copyright
Modified: packages/josm/trunk/debian/changelog
===
--- packages/josm/trunk/debian/changelog2009-01-30 11:25:54 UTC (rev
1849)
+++ packages/josm/trunk/debian/changelog2009-02-02 20:55:49 UTC (rev
1850)
@@ -1,5 +1,6 @@
josm (0.0.svn1137-1) UNRELEASED; urgency=low
+ [ Giovanni Mascellani ]
* New upstream SVN release. (Closes: #509239)
- dpatch/*: fixed to comply with new upstream code.
* Added ${misc:Depends} into dependencies.
@@ -10,8 +11,12 @@
* Shell wrapper now recognizes JAVA_OPTS environment variable.
(Closes: #497559)
- -- Giovanni Mascellani g.mascell...@gmail.com Tue, 23 Dec 2008 15:08:59
+0100
+ [ Andreas Putzo ]
+ * Add copyright holders of NmeaReader.java, Changeset.java, TigerUtils.java
+to debian/copyright.
+ -- Andreas Putzo andr...@putzo.net Mon, 02 Feb 2009 20:47:19 +
+
josm (0.0.svn1137-0.4) unstable; urgency=low
* Fixed icons issue?
Modified: packages/josm/trunk/debian/copyright
===
--- packages/josm/trunk/debian/copyright2009-01-30 11:25:54 UTC (rev
1849)
+++ packages/josm/trunk/debian/copyright2009-02-02 20:55:49 UTC (rev
1850)
@@ -17,17 +17,13 @@
Copyright (c) 2007-2008 David Earl da...@frankieandshadow.com
Copyright (c) 2007-2008 Ulf Lamping ulf.lamp...@web.de
Copyright (c) 2007-2008 Raphael Mack ram...@raphael-mack.de
- Copyright (c) 2008 Christian Gallioz
- Copyright (c) 2008 Christoph Brill
- Copyright (c) 2007 Martijn van Oosterhout
- Copyright (c) 2007 Dave Hansen
License: GPL-2+
Josm is distributed under the GPL, version 2 or later. On Debian GNU/Linux
systems, the complete text of the GNU General Public License Version 2 can be
found in `/usr/share/common-licenses/GPL-2'.
Files: debian/*
-Copyright: Copyright (c) 2007-2008 Andreas Putzo
+Copyright: Copyright (c) 2007-2009 Andreas Putzo
Copyright (c) 2008 Petter Reinholdtsen
Copyright (c) 2008 Giovanni Mascellani
License: GPL-2+
@@ -78,25 +74,37 @@
permission, subject to the special cases noted below. Publishers who wish to
have authorization may print this page and retain it for their records; JPL
does not issue image permissions on an image by image basis.
- .
+ .
By electing to download the material from this web site the user agrees:
- .
+ .
1. that Caltech makes no representations or warranties with respect to
ownership of copyrights in the images, and does not represent others who may
claim to be authors or owners of copyright of any of the images, and makes no
warranties as to the quality of the images. Caltech shall not be responsible
for any loss or expenses resulting from the use of the images, and you release
and hold Caltech harmless from all liability arising from such use.
- .
+ .
2. to use a credit line in connection with images. Unless otherwise noted in
the caption information for an image, the credit line should be Courtesy
NASA/JPL-Caltech.
- .
+ .
3. that the endorsement of any product or service by Caltech, JPL or NASA must
- not be claimed or implied.
+ not be claimed or implied.
Files: src/org/openstreetmap/josm/data/projection/Ellipsoid.java
src/org/openstreetmap/josm/data/projection/LambertEST.java
src/org/openstreetmap/josm/data/projection/Lambert.java
Copyright: Copyright (c) 2002 Johan Montagnat jo...@creatis.insa-lyon.fr
License: GPL-2
+
+Files: src/org/openstreetmap/josm/io/NmeaReader.java
+Copyright: Copyright (c) 2008 Christoph Brill
+License: GPL-2
+
+Files: src/org/openstreetmap/josm/data/osm/Changeset.java
+Copyright: Copyright (c) 2007 Martijn van Oosterhout
+License: GPL-2
+
+Files: src/org/openstreetmap/josm/data/osm/TigerUtils.java
+Copyright: Copyright (c) 2007 David Hansen
+License: GPL-2
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1851 - packages/gpsdrive/branches
Author: nd-guest Date: 2009-02-02 21:14:50 + (Mon, 02 Feb 2009) New Revision: 1851 Added: packages/gpsdrive/branches/lenny/ Log: Create lenny branch Copied: packages/gpsdrive/branches/lenny (from rev 1850, packages/gpsdrive/trunk) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1852 - packages/gpsdrive/branches/lenny/debian
Author: nd-guest Date: 2009-02-02 21:25:23 + (Mon, 02 Feb 2009) New Revision: 1852 Modified: packages/gpsdrive/branches/lenny/debian/changelog Log: Upload to t-p-a beacuse of pcre3 as discussed with luk Modified: packages/gpsdrive/branches/lenny/debian/changelog === --- packages/gpsdrive/branches/lenny/debian/changelog 2009-02-02 21:14:50 UTC (rev 1851) +++ packages/gpsdrive/branches/lenny/debian/changelog 2009-02-02 21:25:23 UTC (rev 1852) @@ -1,4 +1,4 @@ -gpsdrive (2.10~pre4-6.dfsg-2) unstable; urgency=low +gpsdrive (2.10~pre4-6.dfsg-1+lenny1) testing-proposed-updates; urgency=low * Remove example script gpssmswatch. Prone to symlink attacks and removed upstream. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1847 - packages/josm/trunk/debian
Author: nd-guest Date: 2009-01-19 19:01:29 + (Mon, 19 Jan 2009) New Revision: 1847 Modified: packages/josm/trunk/debian/josm.desktop Log: it's openstreetmap.org, not .com :) Modified: packages/josm/trunk/debian/josm.desktop === --- packages/josm/trunk/debian/josm.desktop 2009-01-19 18:59:07 UTC (rev 1846) +++ packages/josm/trunk/debian/josm.desktop 2009-01-19 19:01:29 UTC (rev 1847) @@ -2,7 +2,7 @@ Version=1.0 Name=Josm GenericName=Java OpenStreetMap Editor -Comment=Editor for OpenStreetMap.com +Comment=Editor for OpenStreetMap.org Exec=josm Icon=josm-32 StartupNotify=false ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1848 - packages/gpsdrive/tags
Author: nd-guest Date: 2009-01-19 21:39:38 + (Mon, 19 Jan 2009) New Revision: 1848 Added: packages/gpsdrive/tags/2.10~pre4-6.dfsg-2/ Log: [svn-buildpackage] Tagging gpsdrive (2.10~pre4-6.dfsg-2) Copied: packages/gpsdrive/tags/2.10~pre4-6.dfsg-2 (from rev 1847, packages/gpsdrive/trunk) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1835 - packages/gpsdrive/trunk/debian/patches
Author: nd-guest
Date: 2008-12-29 16:12:01 + (Mon, 29 Dec 2008)
New Revision: 1835
Added:
packages/gpsdrive/trunk/debian/patches/101-signalposreq.dpatch
packages/gpsdrive/trunk/debian/patches/102-unittest.dpatch
Modified:
packages/gpsdrive/trunk/debian/patches/00list
Log:
add patches to fix several symlink vulnerabilites.
Modified: packages/gpsdrive/trunk/debian/patches/00list
===
--- packages/gpsdrive/trunk/debian/patches/00list 2008-12-27 15:33:32 UTC
(rev 1834)
+++ packages/gpsdrive/trunk/debian/patches/00list 2008-12-29 16:12:01 UTC
(rev 1835)
@@ -16,3 +16,5 @@
98-mapnik-exception
99-autobestmap
100-fix-insecure-tempfiles
+101-signalposreq
+102-unittest
Added: packages/gpsdrive/trunk/debian/patches/101-signalposreq.dpatch
===
--- packages/gpsdrive/trunk/debian/patches/101-signalposreq.dpatch
(rev 0)
+++ packages/gpsdrive/trunk/debian/patches/101-signalposreq.dpatch
2008-12-29 16:12:01 UTC (rev 1835)
@@ -0,0 +1,70 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 101-signalposreq.dpatch by Andreas Putzo andr...@putzo.net
+##
+## DP: Remove signalposreq() from gpsdrive, vulnerable to symlink attacks.
+## DP: Remove weird deletion of temporary files.
+
+...@dpatch@
+diff -urNad gpsdrive-2.10~pre4-6.dfsg~/src/gpsdrive.c
gpsdrive-2.10~pre4-6.dfsg/src/gpsdrive.c
+--- gpsdrive-2.10~pre4-6.dfsg~/src/gpsdrive.c 2008-12-28 18:10:54.0
+
gpsdrive-2.10~pre4-6.dfsg/src/gpsdrive.c 2008-12-28 18:11:27.0
+
+@@ -3087,9 +3087,6 @@
+ /* all default values must be set BEFORE readconfig! */
+ g_strlcpy (setpositionname, , sizeof (setpositionname));
+
+-/* setup signal handler */
+-signal (SIGUSR1, signalposreq);
+-
+ sql_load_lib();
+ /* I18l */
+
+@@ -3419,9 +3416,6 @@
+ gdk_pixbuf_unref (friendspixbuf);
+
+
+-unlink (/tmp/cammain.pid);
+-unlink (/tmp/gpsdrivetext.out);
+-unlink (/tmp/gpsdrivepos);
+ if (local_config.savetrack)
+ savetrackfile (2);
+ sqlend ();
+diff -urNad gpsdrive-2.10~pre4-6.dfsg~/src/gpsproto.h
gpsdrive-2.10~pre4-6.dfsg/src/gpsproto.h
+--- gpsdrive-2.10~pre4-6.dfsg~/src/gpsproto.h 2007-09-14 21:47:13.0
+
gpsdrive-2.10~pre4-6.dfsg/src/gpsproto.h 2008-12-28 18:11:32.0
+
+@@ -75,7 +75,6 @@
+ gint settings_main_cb (GtkWidget *widget, guint datum);
+ gint sel_message_cb (GtkWidget * widget, guint datum);
+ gint setmessage_cb (GtkWidget * widget, guint datum);
+-void signalposreq ();
+ gint reinsertwp_cb (GtkWidget * widget, guint datum);
+ GdkPixbuf *create_pixbuf (const gchar * filename);
+ gint simulated_pos (GtkWidget * widget, guint * datum);
+diff -urNad gpsdrive-2.10~pre4-6.dfsg~/src/splash.c
gpsdrive-2.10~pre4-6.dfsg/src/splash.c
+--- gpsdrive-2.10~pre4-6.dfsg~/src/splash.c2007-09-14 21:47:13.0
+
gpsdrive-2.10~pre4-6.dfsg/src/splash.c 2008-12-28 18:11:18.0
+
+@@ -630,25 +630,3 @@
+ (gtk_widget_destroy), NULL);
+ return TRUE;
+ }
+-
+-
+-/* writes time and position to /tmp/gpsdrivepos */
+-void
+-signalposreq ()
+-{
+- FILE *f;
+- time_t t;
+- struct tm *ts;
+-
+- f = fopen (/tmp/gpsdrivepos, w);
+- if (f == NULL)
+- {
+- perror (/tmp/gpsdrivepos);
+- return;
+- }
+- time (t);
+- ts = localtime (t);
+- fprintf (f, asctime (ts));
+- fprintf (f, POS %f %f\n, coords.current_lat, coords.current_lon);
+- fclose (f);
+-}
Property changes on:
packages/gpsdrive/trunk/debian/patches/101-signalposreq.dpatch
___
Name: svn:executable
+ *
Added: packages/gpsdrive/trunk/debian/patches/102-unittest.dpatch
===
--- packages/gpsdrive/trunk/debian/patches/102-unittest.dpatch
(rev 0)
+++ packages/gpsdrive/trunk/debian/patches/102-unittest.dpatch 2008-12-29
16:12:01 UTC (rev 1835)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 102-unittest.dpatch by Andreas Putzo andr...@putzo.net
+##
+## DP: Use mkdtemp to avoid a potential symlink attack.
+
+...@dpatch@
+diff -urNad gpsdrive-2.10~pre4-6.dfsg~/src/unit_test.c
gpsdrive-2.10~pre4-6.dfsg/src/unit_test.c
+--- gpsdrive-2.10~pre4-6.dfsg~/src/unit_test.c 2007-09-15 15:12:03.0
+
gpsdrive-2.10~pre4-6.dfsg/src/unit_test.c 2008-12-29 15:33:26.0
+
+@@ -649,10 +649,12 @@
+ gchar fn[500];
+ gint response;
+
+-
+-g_snprintf (dir_proc, sizeof (dir_proc), /tmp/gpsdrive-unit-test);
+-mkdir (dir_proc, 0777);
+-g_snprintf (dir_proc, sizeof (dir_proc), /tmp/gpsdrive-unit-test/proc);
++strncpy(dir_proc, /tmp/gpsdrive-unit-test.XX, sizeof(dir_proc));
++if (mkdtemp(dir_proc
[DebianGIS-dev] r1836 - packages/gpsdrive/trunk/debian/patches
Author: nd-guest
Date: 2008-12-29 16:12:45 + (Mon, 29 Dec 2008)
New Revision: 1836
Modified:
packages/gpsdrive/trunk/debian/patches/100-fix-insecure-tempfiles.dpatch
Log:
update patch for geo-code to fix a potential race condition
Modified:
packages/gpsdrive/trunk/debian/patches/100-fix-insecure-tempfiles.dpatch
===
--- packages/gpsdrive/trunk/debian/patches/100-fix-insecure-tempfiles.dpatch
2008-12-29 16:12:01 UTC (rev 1835)
+++ packages/gpsdrive/trunk/debian/patches/100-fix-insecure-tempfiles.dpatch
2008-12-29 16:12:45 UTC (rev 1836)
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad gpsdrive-2.10~pre4-6.dfsg~/scripts/geo-code
gpsdrive-2.10~pre4-6.dfsg/scripts/geo-code
--- gpsdrive-2.10~pre4-6.dfsg~/scripts/geo-code2007-09-14
21:47:07.0 +
-+++ gpsdrive-2.10~pre4-6.dfsg/scripts/geo-code 2008-08-31 21:51:50.0
+
gpsdrive-2.10~pre4-6.dfsg/scripts/geo-code 2008-12-28 17:47:39.0
+
@@ -83,6 +83,7 @@
#
error() {
@@ -37,15 +37,23 @@
do
[ -f $i ] rm -f $i
done
-@@ -248,7 +250,7 @@
+@@ -248,11 +250,11 @@
#
# Main Program
#
-TMP=/tmp/geo$$
-+TMP=`mktemp`
- STYLE=${TMP}.style
- COORDS=${TMP}.coords
- OUTWAY=${TMP}.way
+-STYLE=${TMP}.style
+-COORDS=${TMP}.coords
+-OUTWAY=${TMP}.way
+-MAP=${TMP}.gif
++TMP=`mktemp -d`
++STYLE=${TMP}/style
++COORDS=${TMP}/coords
++OUTWAY=${TMP}/way
++MAP=${TMP}/gif
+ UA=Mozilla/5.0
+
+ if [ $GURL != ]; then
@@ -269,7 +271,6 @@
| head -n1 \
`
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1837 - packages/gpsdrive/trunk/debian
Author: nd-guest Date: 2008-12-29 19:36:48 + (Mon, 29 Dec 2008) New Revision: 1837 Modified: packages/gpsdrive/trunk/debian/examples Log: remove gpssmswatch from examples Modified: packages/gpsdrive/trunk/debian/examples === --- packages/gpsdrive/trunk/debian/examples 2008-12-29 16:12:45 UTC (rev 1836) +++ packages/gpsdrive/trunk/debian/examples 2008-12-29 19:36:48 UTC (rev 1837) @@ -1,6 +1,5 @@ scripts/gpssql_backup.sh scripts/gpssql_restore.sh -scripts/gpssmswatch scripts/nasaconv.sh scripts/wp2sql scripts/wpcvt ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1838 - packages/gpsdrive/trunk/debian
Author: nd-guest Date: 2008-12-29 19:42:07 + (Mon, 29 Dec 2008) New Revision: 1838 Modified: packages/gpsdrive/trunk/debian/changelog Log: add changelog Modified: packages/gpsdrive/trunk/debian/changelog === --- packages/gpsdrive/trunk/debian/changelog2008-12-29 19:36:48 UTC (rev 1837) +++ packages/gpsdrive/trunk/debian/changelog2008-12-29 19:42:07 UTC (rev 1838) @@ -1,3 +1,17 @@ +gpsdrive (2.10~pre4-6.dfsg-2) unstable; urgency=low + + * Remove example script gpssmswatch. Prone to symlink attacks +and removed upstream. + * Added 101-signalposreq.dpatch to remove signalposreq() from +gpsdrive to fix a potential symlink vulnerability. Removed +unused unlinks of temporary files (Closes: #508597,#508596). + * Added 102-unittest.dpatch to use mkdtemp in src/unit_test.c to +fix a symlink vulnerability. + * Updated patch for geo-code to avoid a potential race condition +(CVE-2008-5380). + + -- Andreas Putzo andr...@putzo.net Mon, 29 Dec 2008 16:08:22 + + gpsdrive (2.10~pre4-6.dfsg-1) unstable; urgency=low * Added .dfsg to version to allow a sourceful upload ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1832 - packages/gpsdrive/branches/etch/src
Author: nd-guest
Date: 2008-12-27 15:26:24 + (Sat, 27 Dec 2008)
New Revision: 1832
Modified:
packages/gpsdrive/branches/etch/src/gpsdrive.c
packages/gpsdrive/branches/etch/src/gpsproto.h
packages/gpsdrive/branches/etch/src/splash.c
Log:
Remove signalposreq() (#508597)
Modified: packages/gpsdrive/branches/etch/src/gpsdrive.c
===
--- packages/gpsdrive/branches/etch/src/gpsdrive.c 2008-12-26 22:05:14 UTC
(rev 1831)
+++ packages/gpsdrive/branches/etch/src/gpsdrive.c 2008-12-27 15:26:24 UTC
(rev 1832)
@@ -10482,8 +10482,6 @@
g_strlcpy (setpositionname, , sizeof (setpositionname));
g_strlcpy (serialdev, /dev/ttyS3, sizeof (serialdev));
-/* setup signal handler */
- signal (SIGUSR1, signalposreq);
usesql = TRUE;
// It seems like this doesnt work on cygwin unless the dlopen comes first..-jc
Modified: packages/gpsdrive/branches/etch/src/gpsproto.h
===
--- packages/gpsdrive/branches/etch/src/gpsproto.h 2008-12-26 22:05:14 UTC
(rev 1831)
+++ packages/gpsdrive/branches/etch/src/gpsproto.h 2008-12-27 15:26:24 UTC
(rev 1832)
@@ -78,7 +78,6 @@
gint about_cb (GtkWidget * widget, guint datum);
gint sel_message_cb (GtkWidget * widget, guint datum);
gint setmessage_cb (GtkWidget * widget, guint datum);
-void signalposreq ();
gint reinsertwp_cb (GtkWidget * widget, guint datum);
GdkPixbuf *create_pixbuf (const gchar * filename);
int gpsserialinit (void);
Modified: packages/gpsdrive/branches/etch/src/splash.c
===
--- packages/gpsdrive/branches/etch/src/splash.c2008-12-26 22:05:14 UTC
(rev 1831)
+++ packages/gpsdrive/branches/etch/src/splash.c2008-12-27 15:26:24 UTC
(rev 1832)
@@ -1625,24 +1625,4 @@
}
-/* writes time and position to /tmp/gpsdrivepos */
-void
-signalposreq ()
-{
- FILE *f;
- time_t t;
- struct tm *ts;
-
- f = fopen (/tmp/gpsdrivepos, w);
- if (f == NULL)
-{
- perror (/tmp/gpsdrivepos);
- return;
-}
- time (t);
- ts = localtime (t);
- fprintf (f, asctime (ts));
- fprintf (f, POS %f %f\n, current_lat, current_long);
- fclose (f);
-}
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1834 - packages/gpsdrive/branches/etch/debian
Author: nd-guest Date: 2008-12-27 15:33:32 + (Sat, 27 Dec 2008) New Revision: 1834 Modified: packages/gpsdrive/branches/etch/debian/changelog packages/gpsdrive/branches/etch/debian/rules Log: remove gpssmswatch, add changelog entries. Modified: packages/gpsdrive/branches/etch/debian/changelog === --- packages/gpsdrive/branches/etch/debian/changelog2008-12-27 15:31:12 UTC (rev 1833) +++ packages/gpsdrive/branches/etch/debian/changelog2008-12-27 15:33:32 UTC (rev 1834) @@ -4,6 +4,9 @@ attack (CVE-2008-5380). (Closes: #508595) * Remove /usr/bin/geo-nearest. Script no longer works with geocaching.com and uses insecure temporary files. + * Remove /usr/bin/gpssmwatch. Script is vulnerable to symlink attacks +and would require additional dependencies on gnokii and gpsd. + * Remove signalposreq() from src/splash.c to fix a symlink vulnerability. -- Andreas Putzo andr...@putzo.net Fri, 26 Dec 2008 18:26:11 + Modified: packages/gpsdrive/branches/etch/debian/rules === --- packages/gpsdrive/branches/etch/debian/rules2008-12-27 15:31:12 UTC (rev 1833) +++ packages/gpsdrive/branches/etch/debian/rules2008-12-27 15:33:32 UTC (rev 1834) @@ -53,7 +53,9 @@ # Remove gpsd, since debian has an own gpsd package rm $(destdir)/bin/gpsd # Remove geo-nearest (#508595) - rm $(destdir)/bin/geo-nearest + rm -f $(destdir)/bin/geo-nearest + # Remove gpssmswatch (#508597) + rm -f $(destdir)/bin/gpssmswatch # add old manpages #cp -r $(CURDIR)/debian/man/ $(destdir)/share/ ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1830 - in packages/gpsdrive/branches/etch: . man src src/mysql
Author: nd-guest
Date: 2008-12-26 22:03:56 + (Fri, 26 Dec 2008)
New Revision: 1830
Modified:
packages/gpsdrive/branches/etch/README.SQL
packages/gpsdrive/branches/etch/configure
packages/gpsdrive/branches/etch/man/gpsdrive.1
packages/gpsdrive/branches/etch/src/friendsd.c
packages/gpsdrive/branches/etch/src/gpsdrive.c
packages/gpsdrive/branches/etch/src/gpsdrive.h
packages/gpsdrive/branches/etch/src/mysql/mysql.h
Log:
forgot to apply diff.gz
Modified: packages/gpsdrive/branches/etch/README.SQL
===
--- packages/gpsdrive/branches/etch/README.SQL 2008-12-26 14:30:20 UTC (rev
1829)
+++ packages/gpsdrive/branches/etch/README.SQL 2008-12-26 22:03:56 UTC (rev
1830)
@@ -7,7 +7,7 @@
Compiling:
--
There is no MySQL needed for compiling, the needed library
-libmysqlclient.so.10 will be loaded at runtime, if found.
+libmysqlclient.so.15 will be loaded at runtime, if found.
Running and first initialization:
-
Modified: packages/gpsdrive/branches/etch/configure
===
--- packages/gpsdrive/branches/etch/configure 2008-12-26 14:30:20 UTC (rev
1829)
+++ packages/gpsdrive/branches/etch/configure 2008-12-26 22:03:56 UTC (rev
1830)
@@ -9511,20 +9511,6 @@
echo Using $CC compiler
-if test $CC = gcc ; then
-
-if $CC -dumpversion|egrep -q ^3\.*; then
-echo GCC ok
-else
-echo *
-echo You need a gcc = 3.x to compile GpsDrive
-echo *
-exit
-fi
-
-fi
-
-
UNAMEP=`uname -p`
ARCHP=`arch`
CFLAGS=$CFLAGS
Modified: packages/gpsdrive/branches/etch/man/gpsdrive.1
===
--- packages/gpsdrive/branches/etch/man/gpsdrive.1 2008-12-26 14:30:20 UTC
(rev 1829)
+++ packages/gpsdrive/branches/etch/man/gpsdrive.1 2008-12-26 22:03:56 UTC
(rev 1830)
@@ -633,7 +633,7 @@
menu.
GpsDrive use MySQL automatically if it finds the shared library
-.I libmysqlclient.so.10
+.I libmysqlclient.so.15
and the MySQL Server is running and a connection to the database is possible.
For first use you have to run
.B create.sql
once.
Modified: packages/gpsdrive/branches/etch/src/friendsd.c
===
--- packages/gpsdrive/branches/etch/src/friendsd.c 2008-12-26 14:30:20 UTC
(rev 1829)
+++ packages/gpsdrive/branches/etch/src/friendsd.c 2008-12-26 22:03:56 UTC
(rev 1830)
@@ -364,7 +364,7 @@
fprintf (stderr, %d clients, last: %s[%s]:\n,
listnum, hname, fromaddr);
- fprintf (stderr, txt);
+ fprintf (stderr, %s, txt);
/* printf (sende\n%s, L�nge %d, clilen %d, txt, l,clilen); */
if ((nosent = sendto (sockfd, txt, l, 0, pcli_addr, clilen)) != l)
{
Modified: packages/gpsdrive/branches/etch/src/gpsdrive.c
===
--- packages/gpsdrive/branches/etch/src/gpsdrive.c 2008-12-26 14:30:20 UTC
(rev 1829)
+++ packages/gpsdrive/branches/etch/src/gpsdrive.c 2008-12-26 22:03:56 UTC
(rev 1830)
@@ -10496,22 +10496,22 @@
if (!handle)
handle = dlopen (libmysqlclient.so, RTLD_LAZY);
if (!handle)
- handle = dlopen (libmysqlclient.so.10, RTLD_LAZY);
+ handle = dlopen (libmysqlclient.so.15, RTLD_LAZY);
if (!handle)
- handle = dlopen (/opt/lib/mysql/libmysqlclient.so.10, RTLD_LAZY);
+ handle = dlopen (/opt/lib/mysql/libmysqlclient.so.15, RTLD_LAZY);
if (!handle)
- handle = dlopen (/opt/mysql/lib/libmysqlclient.so.10, RTLD_LAZY);
+ handle = dlopen (/opt/mysql/lib/libmysqlclient.so.15, RTLD_LAZY);
if (!handle)
- handle = dlopen (/usr/lib/mysql/libmysqlclient.so.10, RTLD_LAZY);
+ handle = dlopen (/usr/lib/mysql/libmysqlclient.so.15, RTLD_LAZY);
if (!handle)
- handle = dlopen (/usr/lib/libmysqlclient.so.10, RTLD_LAZY);
+ handle = dlopen (/usr/lib/libmysqlclient.so.15, RTLD_LAZY);
if (!handle)
handle =
- dlopen (/usr/local/lib/mysql/libmysqlclient.so.10, RTLD_LAZY);
+ dlopen (/usr/local/lib/mysql/libmysqlclient.so.15, RTLD_LAZY);
if (!handle)
- handle = dlopen (/usr/local/mysql/libmysqlclient.so.10, RTLD_LAZY);
+ handle = dlopen (/usr/local/mysql/libmysqlclient.so.15, RTLD_LAZY);
if (!handle)
- handle = dlopen (/usr/local/lib/libmysqlclient.so.10, RTLD_LAZY);
+ handle = dlopen (/usr/local/lib/libmysqlclient.so.15, RTLD_LAZY);
if (!handle)
handle = dlopen (/sw/lib/libmysqlclient.dylib, RTLD_LAZY);
Modified: packages/gpsdrive/branches/etch/src/gpsdrive.h
===
--- packages/gpsdrive/branches/etch/src/gpsdrive.h 2008-12-26 14:30:20 UTC
(rev 1829
[DebianGIS-dev] r1831 - packages/gpsdrive/branches/etch/debian
Author: nd-guest Date: 2008-12-26 22:05:14 + (Fri, 26 Dec 2008) New Revision: 1831 Modified: packages/gpsdrive/branches/etch/debian/changelog packages/gpsdrive/branches/etch/debian/rules Log: use mktemp in ge-code, remove geo-nearest, base changelog on correct etch version Modified: packages/gpsdrive/branches/etch/debian/changelog === --- packages/gpsdrive/branches/etch/debian/changelog2008-12-26 22:03:56 UTC (rev 1830) +++ packages/gpsdrive/branches/etch/debian/changelog2008-12-26 22:05:14 UTC (rev 1831) @@ -1,10 +1,11 @@ -gpsdrive (2.09-2.2) unstable; urgency=low +gpsdrive (2.09-2.1+etch1) unstable; urgency=high - * Porter NMU. - * Update config.guess/config.sub. Closes: #317323. - * Update po/de.po. Closes: #314065. + * Patch geo-code to use mktemp to fix a potential symlink +attack (CVE-2008-5380). (Closes: #508595) + * Remove /usr/bin/geo-nearest. Script no longer works with +geocaching.com and uses insecure temporary files. - -- Aurelien Jarno aure...@debian.org Sun, 10 Dec 2006 23:24:43 +0100 + -- Andreas Putzo andr...@putzo.net Fri, 26 Dec 2008 18:26:11 + gpsdrive (2.09-2.1) unstable; urgency=low Modified: packages/gpsdrive/branches/etch/debian/rules === --- packages/gpsdrive/branches/etch/debian/rules2008-12-26 22:03:56 UTC (rev 1830) +++ packages/gpsdrive/branches/etch/debian/rules2008-12-26 22:05:14 UTC (rev 1831) @@ -52,6 +52,8 @@ # Remove gpsd, since debian has an own gpsd package rm $(destdir)/bin/gpsd + # Remove geo-nearest (#508595) + rm $(destdir)/bin/geo-nearest # add old manpages #cp -r $(CURDIR)/debian/man/ $(destdir)/share/ ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1807 - packages/gpsdrive/branches/etch/src
Author: nd-guest
Date: 2008-12-22 20:15:53 + (Mon, 22 Dec 2008)
New Revision: 1807
Modified:
packages/gpsdrive/branches/etch/src/geo-code
Log:
Applied patch from 2.10~pre4-6.dfsg-1 to geo-nearest but
use mktemp -d to avoid race condition.
Modified: packages/gpsdrive/branches/etch/src/geo-code
===
--- packages/gpsdrive/branches/etch/src/geo-code2008-12-22 19:33:23 UTC
(rev 1806)
+++ packages/gpsdrive/branches/etch/src/geo-code2008-12-22 20:15:53 UTC
(rev 1807)
@@ -83,6 +83,7 @@
#
error() {
echo `basename $PROGNAME`: $1 2
+remove_cruft
exit 1
}
@@ -130,8 +131,9 @@
a) SQLMATCH=all;;
D) DEBUG=$OPTARG;;
U) echo Getting latest version of this script...
- curl -o$UPDATEcodeFILE $UPDATEcodeURL
- echo Latest version is in $UPDATEcodeFILE
+ destdir=`mktemp -d`
+ curl -o$destdir/$UPDATEcodeFILE $UPDATEcodeURL
+ echo Latest version is in $destdir/$UPDATEcodeFILE
exit
;;
h|\?) usage;;
@@ -243,16 +245,17 @@
do
[ -f $i ] rm -f $i
done
+rmdir $TMP
}
#
# Main Program
#
-TMP=/tmp/geo$$
-STYLE=${TMP}.style
-COORDS=${TMP}.coords
-OUTWAY=${TMP}.way
-MAP=${TMP}.gif
+TMP=`mktemp -d`
+STYLE=${TMP}/style
+COORDS=${TMP}/coords
+OUTWAY=${TMP}/way
+MAP=${TMP}/gif
UA=Mozilla/5.0
if [ $GURL != ]; then
@@ -269,7 +272,6 @@
| head -n1 \
`
if [ $URL = ]; then
- cp $COORDS /tmp/geo.google
error Unable to lookup telephone number or name with Google
else
URL=http://maps.yahoo.com/$URL;
@@ -295,7 +297,7 @@
fi
if [ $DEBUG -gt 0 ]; then
-filter=tee /tmp/geo.yahoo
+filter=tee `mktemp`
else
filter=cat
fi
@@ -306,9 +308,9 @@
-e 's/.*slt=\([^%]*\).*sln=\([^%]*\).*Create.*/\1 \2/p' \
$COORDS
-if [ $DEBUG -gt 0 ]; then
- cp $COORDS /tmp/geo.coords
-fi
+#if [ $DEBUG -gt 0 ]; then
+# cp -d $COORDS /tmp/geo.coords
+#fi
#
# Convert the coords, address, and type to the desired
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1768 - packages/debian-gis/hooks
Author: nd-guest Date: 2008-09-10 20:34:20 + (Wed, 10 Sep 2008) New Revision: 1768 Modified: packages/debian-gis/hooks/10-default packages/debian-gis/hooks/20-osm Log: always return true in hook scripts Modified: packages/debian-gis/hooks/10-default === --- packages/debian-gis/hooks/10-default2008-09-10 20:31:28 UTC (rev 1767) +++ packages/debian-gis/hooks/10-default2008-09-10 20:34:20 UTC (rev 1768) @@ -7,4 +7,6 @@ aptitude remove --purge $(deborphan) # run updatedb -updatedb +updatedb + +exit 0 Modified: packages/debian-gis/hooks/20-osm === --- packages/debian-gis/hooks/20-osm2008-09-10 20:31:28 UTC (rev 1767) +++ packages/debian-gis/hooks/20-osm2008-09-10 20:34:20 UTC (rev 1768) @@ -7,23 +7,22 @@ if [ ! -f $planet ]; then echo No planet file found! -exit 1 +exit 0 fi if [ ! -x /usr/bin/osm2pgsql ]; then echo osm2pgsql not installed! -exit 1 +exit 0 fi -/etc/init.d/postgresql-8.2 start +/etc/init.d/postgresql-8.3 start sudo -u postgres createuser -Upostgres -S -D -R gis sudo -u postgres createdb -Upostgres -EUNICODE gis echo GRANT ALL ON SCHEMA PUBLIC TO gis | sudo -u postgres psql -Upostgres gis sudo -u postgres createlang -Upostgres plpgsql gis -sudo -u postgres psql gis /usr/share/postgresql-8.2-postgis/lwpostgis.sql +sudo -u postgres psql gis /usr/share/postgresql-8.3-postgis/lwpostgis.sql echo GRANT ALL ON geometry_columns TO gis | sudo -u postgres psql -Upostgres gis echo GRANT ALL ON spatial_ref_sys TO gis | sudo -u postgres psql -Upostgres gis sudo -u postgres /usr/bin/osm2pgsql $planet -/etc/init.d/postgresql-8.2 stop +/etc/init.d/postgresql-8.3 stop rm -f $planet - - +exit 0 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1769 - packages/debian-gis/packages
Author: nd-guest Date: 2008-09-10 20:37:58 + (Wed, 10 Sep 2008) New Revision: 1769 Removed: packages/debian-gis/packages/kde Modified: packages/debian-gis/packages/base packages/debian-gis/packages/debian-gis Log: update packages-lists Modified: packages/debian-gis/packages/base === --- packages/debian-gis/packages/base 2008-09-10 20:34:20 UTC (rev 1768) +++ packages/debian-gis/packages/base 2008-09-10 20:37:58 UTC (rev 1769) @@ -13,3 +13,4 @@ bzr-tools sl openssh-client +locate Modified: packages/debian-gis/packages/debian-gis === --- packages/debian-gis/packages/debian-gis 2008-09-10 20:34:20 UTC (rev 1768) +++ packages/debian-gis/packages/debian-gis 2008-09-10 20:37:58 UTC (rev 1769) @@ -24,7 +24,7 @@ php5-mapscript phppgadmin postgis -postgresql-8.2-postgis +postgresql-8.3-postgis proj python-mapnik qgis Deleted: packages/debian-gis/packages/kde === --- packages/debian-gis/packages/kde2008-09-10 20:34:20 UTC (rev 1768) +++ packages/debian-gis/packages/kde2008-09-10 20:37:58 UTC (rev 1769) @@ -1,6 +0,0 @@ -xorg -xserver-xorg -kde-core -kdm -menu -menu-xdg ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1770 - packages/debian-gis
Author: nd-guest
Date: 2008-09-10 21:19:05 + (Wed, 10 Sep 2008)
New Revision: 1770
Modified:
packages/debian-gis/build-gis-live
Log:
remove --keyring-packages from lh_config because this fails with aptitude.
do the other things right.
Modified: packages/debian-gis/build-gis-live
===
--- packages/debian-gis/build-gis-live 2008-09-10 20:37:58 UTC (rev 1769)
+++ packages/debian-gis/build-gis-live 2008-09-10 21:19:05 UTC (rev 1770)
@@ -39,7 +39,7 @@
# CD boot image
#splashpng=foo.png
-LH_PACKAGES_LISTS=kde debian-gis
+export LH_PACKAGES_LISTS=kde debian-gis base base2
# helper functions
msg_info() {
@@ -97,11 +97,10 @@
fi
# configure live-helper
-LH_BOOTAPPEND_LIVE=quiet splash
+export LH_BOOTAPPEND_LIVE=quiet splash
if /usr/bin/lh_config \
--apt aptitude \
--bootappend quiet splash \
---keyring-packages debian-archive-keyring \
--mirror-bootstrap $mirror \
--mirror-binary $mirror \
--distribution $dist \
@@ -113,6 +112,8 @@
--username $live_username \
--hostname $live_hostname \
--verbose
+
+#--keyring-packages debian-archive-keyring \
then
msg_info generating configuration succeeded
else
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1764 - packages/gpsdrive/trunk/debian
Author: nd-guest Date: 2008-08-31 22:13:01 + (Sun, 31 Aug 2008) New Revision: 1764 Modified: packages/gpsdrive/trunk/debian/changelog packages/gpsdrive/trunk/debian/control Log: prepare for a sourceful upload to finally remove gpsfetchmap.pl, map-icons/japan, map-icons/nickw. Modified: packages/gpsdrive/trunk/debian/changelog === --- packages/gpsdrive/trunk/debian/changelog2008-08-31 22:12:00 UTC (rev 1763) +++ packages/gpsdrive/trunk/debian/changelog2008-08-31 22:13:01 UTC (rev 1764) @@ -1,3 +1,18 @@ +gpsdrive (2.10~pre4-6.dfsg-1) unstable; urgency=low + + * Added .dfsg to version to allow a sourceful upload +that really removes files with unknown or incompatible +licenses (gpsfetchmap.pl, map-icons/japan, map-icons/nickw) +from the upstream tarball, generated using the get-orig-source +target in debian/rules. (Closes: #497115) + * Fixed spelling error in short description of the gpsdrive-data package. +(Closes: #494657) + * Added patch 100-fix-insecure-tempfiles.dpatch that uses mktemp +in geo-code to avoid symlink attacks. Thanks Moritz Muehlenhoff for +the patch. (Closes: #496436) + + -- Andreas Putzo [EMAIL PROTECTED] Sun, 31 Aug 2008 17:40:05 + + gpsdrive (2.10~pre4-6) unstable; urgency=low * gpsdrive-data: Remove dependency on gpsdrive and put it Modified: packages/gpsdrive/trunk/debian/control === --- packages/gpsdrive/trunk/debian/control 2008-08-31 22:12:00 UTC (rev 1763) +++ packages/gpsdrive/trunk/debian/control 2008-08-31 22:13:01 UTC (rev 1764) @@ -28,7 +28,7 @@ Architecture: all Recommends: gpsdrive Replaces: gpsdrive (= 2.10~pre4-4) -Description: Car naviagion system +Description: Car navigation system Map-based navigation system that displays the current position provided by a GPS receiver on a zoomable map. Maps can be downloaded from different map providers or ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1756 - packages/gpsdrive/trunk/debian
Author: nd-guest Date: 2008-08-10 21:06:27 + (Sun, 10 Aug 2008) New Revision: 1756 Modified: packages/gpsdrive/trunk/debian/changelog packages/gpsdrive/trunk/debian/control Log: put gpsdrive back to recommends in the gpsdrive-data package Modified: packages/gpsdrive/trunk/debian/changelog === --- packages/gpsdrive/trunk/debian/changelog2008-08-08 09:51:13 UTC (rev 1755) +++ packages/gpsdrive/trunk/debian/changelog2008-08-10 21:06:27 UTC (rev 1756) @@ -1,3 +1,10 @@ +gpsdrive (2.10~pre4-6) unstable; urgency=low + + * gpsdrive-data: Remove dependency on gpsdrive and put it +back to Recommends which is sufficient. + + -- Andreas Putzo [EMAIL PROTECTED] Sun, 10 Aug 2008 20:35:58 + + gpsdrive (2.10~pre4-5) unstable; urgency=low * Add missing Replaces to the gpsdrive-data package Modified: packages/gpsdrive/trunk/debian/control === --- packages/gpsdrive/trunk/debian/control 2008-08-08 09:51:13 UTC (rev 1755) +++ packages/gpsdrive/trunk/debian/control 2008-08-10 21:06:27 UTC (rev 1756) @@ -26,7 +26,7 @@ Package: gpsdrive-data Architecture: all -Depends: gpsdrive (= 2.10~pre4-5) +Recommends: gpsdrive Replaces: gpsdrive (= 2.10~pre4-4) Description: Car naviagion system Map-based navigation system that displays the current ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1747 - packages/gpsdrive/trunk/debian
Author: nd-guest Date: 2008-08-06 22:42:50 + (Wed, 06 Aug 2008) New Revision: 1747 Modified: packages/gpsdrive/trunk/debian/changelog packages/gpsdrive/trunk/debian/control packages/gpsdrive/trunk/debian/rules Log: * Add Vcs-* fields. * Remove superfluous make install map-icons in debian/rules. Modified: packages/gpsdrive/trunk/debian/changelog === --- packages/gpsdrive/trunk/debian/changelog2008-08-06 22:04:54 UTC (rev 1746) +++ packages/gpsdrive/trunk/debian/changelog2008-08-06 22:42:50 UTC (rev 1747) @@ -3,8 +3,10 @@ * Add missing Conflicts/Replaces to the gpsdrive-data package and add a dependency on gpsdrive. (Closes: #493892) * Update Suggests and README.Debian to postgresql-8.3-postgis. + * Remove make install for map-icons in debian/rules. + * Added Vcs-* fields to debian/control. - -- Andreas Putzo [EMAIL PROTECTED] Wed, 06 Aug 2008 22:01:11 + + -- Andreas Putzo [EMAIL PROTECTED] Wed, 06 Aug 2008 22:39:36 + gpsdrive (2.10~pre4-4) unstable; urgency=low Modified: packages/gpsdrive/trunk/debian/control === --- packages/gpsdrive/trunk/debian/control 2008-08-06 22:04:54 UTC (rev 1746) +++ packages/gpsdrive/trunk/debian/control 2008-08-06 22:42:50 UTC (rev 1747) @@ -7,6 +7,8 @@ Build-Depends: debhelper (= 5), automake1.9, libtool, pkg-config, libpcre3-dev, libgtk2.0-dev,libart-2.0-dev, libxml2-dev, libmysqlclient15-dev, autotools-dev, dpatch, libmapnik-dev (= 0.5~svn638), libboost-dev, libboost-filesystem-dev, libboost-serialization-dev, libdbus-glib-1-dev Standards-Version: 3.8.0 Homepage: http://gpsdrive.de +Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gpsdrive/ +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gpsdrive/ Package: gpsdrive Architecture: any Modified: packages/gpsdrive/trunk/debian/rules === --- packages/gpsdrive/trunk/debian/rules2008-08-06 22:04:54 UTC (rev 1746) +++ packages/gpsdrive/trunk/debian/rules2008-08-06 22:42:50 UTC (rev 1747) @@ -107,7 +107,6 @@ dh_testroot dh_installdirs -i $(MAKE) -C scripts/ install DESTDIR=$(DESTDIR) - $(MAKE) -C data/map-icons/ install DESTDIR=$(DESTDIR) binary-indep: build-indep install-indep dh_testdir ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1745 - packages/gpsdrive/tags
Author: nd-guest Date: 2008-08-01 10:21:14 + (Fri, 01 Aug 2008) New Revision: 1745 Added: packages/gpsdrive/tags/2.10~pre4-4/ Log: [svn-buildpackage] Tagging gpsdrive (2.10~pre4-4) Copied: packages/gpsdrive/tags/2.10~pre4-4 (from rev 1744, packages/gpsdrive/trunk) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1732 - packages/gpsdrive/trunk/debian
Author: nd-guest
Date: 2008-07-19 16:17:18 + (Sat, 19 Jul 2008)
New Revision: 1732
Modified:
packages/gpsdrive/trunk/debian/changelog
packages/gpsdrive/trunk/debian/rules
Log:
remove cruft, prepare for release
Modified: packages/gpsdrive/trunk/debian/changelog
===
--- packages/gpsdrive/trunk/debian/changelog2008-07-19 16:08:21 UTC (rev
1731)
+++ packages/gpsdrive/trunk/debian/changelog2008-07-19 16:17:18 UTC (rev
1732)
@@ -1,4 +1,4 @@
-gpsdrive (2.10~pre4-4) UNRELEASED; urgency=low
+gpsdrive (2.10~pre4-4) unstable; urgency=low
* No longer create openstreetmap-map-icons-* binary packages.
They are build from the openstreetmap-map-icons source package
@@ -15,7 +15,7 @@
in gpsdrive works again. Already fixed upstream.
(Closes: #480234).
- -- Andreas Putzo [EMAIL PROTECTED] Tue, 15 Jul 2008 19:49:07 +
+ -- Andreas Putzo [EMAIL PROTECTED] Sat, 19 Jul 2008 16:16:51 +
gpsdrive (2.10~pre4-3) unstable; urgency=low
Modified: packages/gpsdrive/trunk/debian/rules
===
--- packages/gpsdrive/trunk/debian/rules2008-07-19 16:08:21 UTC (rev
1731)
+++ packages/gpsdrive/trunk/debian/rules2008-07-19 16:17:18 UTC (rev
1732)
@@ -18,7 +18,7 @@
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
-else
+else
CFLAGS += -O2
endif
@@ -32,7 +32,7 @@
tar xzf ../tarballs/gpsdrive-${UPSTREAM_VERSION}.tar.gz -C ../tarballs/
@echo Removing upstream debian/ dir
rm -rf ../tarballs/gpsdrive-${UPSTREAM_VERSION}/debian/
- @echo Remove gpsfetchmap.pl script.
+ @echo Remove gpsfetchmap.pl script.
rm -f ../tarballs/gpsdrive-${UPSTREAM_VERSION}/scripts/gpsfetchmap.pl
@echo Removing icons.
rm -rf ../tarballs/gpsdrive-${UPSTREAM_VERSION}/data/map-icons/japan/
@@ -54,7 +54,6 @@
--enable-dbus \
CFLAGS=$(CFLAGS)
-
build: build-arch build-indep
build-arch: config.status build-arch-stamp
@@ -67,7 +66,7 @@
build-indep-stamp:
touch $@
-clean: clean-patched unpatch
+clean: clean-patched unpatch
clean-patched:
dh_testdir
@@ -83,11 +82,11 @@
dh_clean
install: install-arch install-indep
+ dh_clean -k
install-arch: build-arch
dh_testdir
dh_testroot
- dh_clean -k
dh_installdirs -a
$(MAKE) -C data/ \
install-appsDATA \
@@ -96,17 +95,16 @@
install-poiDATA \
install-mapsDATA \
DESTDIR=$(DESTDIR)
- install -d $(CURDIR)/debian/tmp/usr/share/gpsdrive/mapnik
+ install -d $(CURDIR)/debian/tmp/usr/share/gpsdrive/mapnik
install -m 644 $(CURDIR)/scripts/mapnik/osm.xml
$(CURDIR)/debian/tmp/usr/share/gpsdrive/mapnik/osm.xml
install -d $(CURDIR)/debian/tmp/usr/share/map-icons
install -m 644 $(CURDIR)/data/map-icons/icons.xml
$(CURDIR)/debian/tmp/usr/share/map-icons/icons.xml
$(MAKE) -C scripts/mapnik/ install DESTDIR=$(DESTDIR)
- $(MAKE) -C src/ install DESTDIR=$(DESTDIR)
+ $(MAKE) -C src/ install DESTDIR=$(DESTDIR)
install-indep: build-indep
dh_testdir
dh_testroot
- dh_clean -k
dh_installdirs -i
$(MAKE) -C scripts/ install DESTDIR=$(DESTDIR)
$(MAKE) -C data/map-icons/ install DESTDIR=$(DESTDIR)
@@ -147,9 +145,9 @@
dh_testroot
dh_installchangelogs -a ChangeLog
dh_installdocs -a -Xdebian/TODO
- dh_installman -a --language=C
- dh_installman -a --language=de -pgpsdrive man/de/gpsdrive.1
- dh_installman -a --language=es -pgpsdrive man/es/gpsdrive.1
+ dh_installman -a --language=C
+ dh_installman -a --language=de -pgpsdrive man/de/gpsdrive.1
+ dh_installman -a --language=es -pgpsdrive man/es/gpsdrive.1
dh_installexamples -a
dh_install -a --sourcedir=$(DESTDIR)
dh_strip -a
@@ -158,7 +156,7 @@
dh_makeshlibs -a
dh_installdeb -a
dh_shlibdeps -a
- dh_gencontrol -a
+ dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1734 - packages/josm/trunk/debian
Author: nd-guest Date: 2008-07-19 19:53:35 + (Sat, 19 Jul 2008) New Revision: 1734 Modified: packages/josm/trunk/debian/changelog packages/josm/trunk/debian/copyright Log: wrap debian/copyright at 80 characters. Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2008-07-19 16:47:43 UTC (rev 1733) +++ packages/josm/trunk/debian/changelog2008-07-19 19:53:35 UTC (rev 1734) @@ -17,8 +17,9 @@ * Added patch description to 40_elemstyles.dpatch. * Mentioned Ellipsoid.java in copyright file. * Added DM-Upload-Allowed field to debian/control. + * Wrap lines at 80 characters in copyright file. - -- Andreas Putzo [EMAIL PROTECTED] Sat, 19 Jul 2008 16:47:09 + + -- Andreas Putzo [EMAIL PROTECTED] Sat, 19 Jul 2008 19:51:57 + josm (0.0.0.20080510-1) unstable; urgency=low Modified: packages/josm/trunk/debian/copyright === --- packages/josm/trunk/debian/copyright2008-07-19 16:47:43 UTC (rev 1733) +++ packages/josm/trunk/debian/copyright2008-07-19 19:53:35 UTC (rev 1734) @@ -1,13 +1,13 @@ This package was debianized by Andreas Putzo [EMAIL PROTECTED] on Mon, 04 Sep 2007 12:16:50 +0200. -It was downloaded using the command svn export http://josm.openstreetmap.de/svn/trunk. -All .jar files have been removed. -All files in the data/ directory have been removed because they contain (large) test data that -is not used by the program. -The directory styles/standard/icons has been removed. It contains icons that are already provided -by the openstreetmap-map-icons-classic package. -All other downloaded files have been packaged as GNU zip'ed tarball without any further modifications. +It was downloaded using the command svn export +http://josm.openstreetmap.de/svn/trunk. All .jar files have been removed. All +files in the data/ directory have been removed because they contain (large) test +data that is not used by the program. The directory styles/standard/icons has +been removed. It contains icons that are already provided by the +openstreetmap-map-icons-classic package. All other downloaded files have been +packaged as GNU zip'ed tarball without any further modifications. Files: * @@ -18,74 +18,78 @@ Copyright (c) 2007-2008 Ulf Lamping [EMAIL PROTECTED] Copyright (c) 2007-2008 Raphael Mack [EMAIL PROTECTED] License: GPL-2+ - Josm is distributed under the GPL, version 2 or later. - On Debian GNU/Linux systems, the complete text of the GNU General Public License - Version 2 can be found in `/usr/share/common-licenses/GPL-2'. + Josm is distributed under the GPL, version 2 or later. On Debian GNU/Linux + systems, the complete text of the GNU General Public License Version 2 can be + found in `/usr/share/common-licenses/GPL-2'. Files: debian/* Copyright: Copyright (c) 2007-2008 Andreas Putzo Copyright (c) 2008 Petter Reinholdtsen Copyright (c) 2008 Giovanni Mascellani License: GPL-2+ - The Debian packaging information is under the GPL, version 2 or later. - On Debian GNU/Linux systems, the complete text of the GNU General Public License + The Debian packaging information is under the GPL, version 2 or later. On + Debian GNU/Linux systems, the complete text of the GNU General Public License Version 2 can be found in `/usr/share/common-licenses/GPL-2'. Files: src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java Copyright: Copyright (c) 1994-2007 Sun Microsystems, Inc. License: other - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: . - * Redistribution of source code must retain the above copyright notice, this list -of conditions and the following disclaimer. + * Redistribution of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. . - * Redistribution in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or other -materials provided with the distribution. + * Redistribution in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. . - Neither the name of Sun Microsystems, Inc. or the names of contributors may be used to - endorse or promote products derived from this software without specific prior written - permission. + Neither the name of Sun Microsystems, Inc. or the names of contributors may be + used to endorse or promote products derived from
[DebianGIS-dev] r1737 - packages/gpsdrive/trunk/debian
Author: nd-guest
Date: 2008-07-19 20:10:29 + (Sat, 19 Jul 2008)
New Revision: 1737
Modified:
packages/gpsdrive/trunk/debian/changelog
packages/gpsdrive/trunk/debian/copyright
Log:
wrap lines in d/copyright at 80 characters.
Modified: packages/gpsdrive/trunk/debian/changelog
===
--- packages/gpsdrive/trunk/debian/changelog2008-07-19 20:10:06 UTC (rev
1736)
+++ packages/gpsdrive/trunk/debian/changelog2008-07-19 20:10:29 UTC (rev
1737)
@@ -14,8 +14,9 @@
* Added 99-autobestmap.dpatch so that the toggle button
in gpsdrive works again. Already fixed upstream.
(Closes: #480234).
+ * Wrap lines in copyright file at 80 characters.
- -- Andreas Putzo [EMAIL PROTECTED] Sat, 19 Jul 2008 16:16:51 +
+ -- Andreas Putzo [EMAIL PROTECTED] Sat, 19 Jul 2008 20:01:39 +
gpsdrive (2.10~pre4-3) unstable; urgency=low
Modified: packages/gpsdrive/trunk/debian/copyright
===
--- packages/gpsdrive/trunk/debian/copyright2008-07-19 20:10:06 UTC (rev
1736)
+++ packages/gpsdrive/trunk/debian/copyright2008-07-19 20:10:29 UTC (rev
1737)
@@ -1,15 +1,15 @@
This package was debianized by Frank Kirschner [EMAIL PROTECTED] on
Wed Apr 17 18:35:19 CEST 2002.
-The current Debian Maintainer is the Debian GIS Team
pkg-grass-devel@lists.alioth.debian.org.
+The current Debian Maintainer is the Debian GIS Team
+pkg-grass-devel@lists.alioth.debian.org.
-It was downloaded from http://gpsdrive.de/packages/gpsdrive-2.10pre4.tar.gz
-The debian/ dir has been removed from the tarball.
-The file scripts/gpsfetchmap.pl has been removed from the tarball because of a
-non-free license. The license has been changed upstream to GPL. This version
will be
-installed instead.
-The directories data/map-icons/{japan,nickw} have been removed due to unclear
license
-issues. They are not used by gpsdrive anyway.
+It was downloaded from http://gpsdrive.de/packages/gpsdrive-2.10pre4.tar.gz The
+debian/ dir has been removed from the tarball. The file scripts/gpsfetchmap.pl
+has been removed from the tarball because of a non-free license. The license
has
+been changed upstream to GPL. This version will be installed instead. The
+directories data/map-icons/{japan,nickw} have been removed due to unclear
+license issues. They are not used by gpsdrive anyway.
Upstream Authors:
@@ -27,19 +27,19 @@
License:
-This package is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+This package is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
-This package is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+This package is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+more details.
-You should have received a copy of the GNU General Public License
-along with this package; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+You should have received a copy of the GNU General Public License along
with
+this package; if not, write to the Free Software Foundation, Inc., 51
+Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'
@@ -73,7 +73,8 @@
scripts/osm/perl_lib/OsmChangeReader*.pm
are Copyright (C) 2006 Oliver Whilte
2007 Martijn van Oosterhout [EMAIL PROTECTED]
-and are licensed under the GNU General Public License version 2 or later (see
above).
+and are licensed under the GNU General Public License version 2 or later
+(see above).
The file
@@ -85,25 +86,29 @@
The file
scripts/gpsreplay
is Copyright (C) 2002,2003 Tim Witham [EMAIL PROTECTED]
-and is licensed under the GNU General Public License version 2 or later (see
above).
+and is licensed under the GNU General Public License version 2 or later
+(see above).
The file
scripts/gpspoint2gpsdrive.pl
is Copyright (C) 2002 Stephen Merrony [EMAIL PROTECTED]
-and is licensed under the GNU General Public License version 2 or later (see
above).
+and is licensed under the GNU General Public License version 2 or later
+(see above).
The file
[DebianGIS-dev] r1738 - packages/gpsdrive/trunk/debian
Author: nd-guest Date: 2008-07-19 20:12:42 + (Sat, 19 Jul 2008) New Revision: 1738 Modified: packages/gpsdrive/trunk/debian/changelog Log: add sponsored by line Modified: packages/gpsdrive/trunk/debian/changelog === --- packages/gpsdrive/trunk/debian/changelog2008-07-19 20:10:29 UTC (rev 1737) +++ packages/gpsdrive/trunk/debian/changelog2008-07-19 20:12:42 UTC (rev 1738) @@ -15,6 +15,8 @@ in gpsdrive works again. Already fixed upstream. (Closes: #480234). * Wrap lines in copyright file at 80 characters. + + * Upload sponsored by Petter Reinholdtsen. -- Andreas Putzo [EMAIL PROTECTED] Sat, 19 Jul 2008 20:01:39 + ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1726 - packages/gpsdrive/trunk/debian/patches
Author: nd-guest
Date: 2008-07-15 20:43:42 + (Tue, 15 Jul 2008)
New Revision: 1726
Added:
packages/gpsdrive/trunk/debian/patches/99-autobestmap.dpatch
Modified:
packages/gpsdrive/trunk/debian/patches/00list
packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch
Log:
fix bashism
fix autobestmap button bug.
Modified: packages/gpsdrive/trunk/debian/patches/00list
===
--- packages/gpsdrive/trunk/debian/patches/00list 2008-07-14 14:36:04 UTC
(rev 1725)
+++ packages/gpsdrive/trunk/debian/patches/00list 2008-07-15 20:43:42 UTC
(rev 1726)
@@ -14,3 +14,4 @@
96-mapnik-plugins-dir
97-osmxml
98-mapnik-exception
+99-autobestmap
Modified: packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch
===
--- packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch2008-07-14
14:36:04 UTC (rev 1725)
+++ packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch2008-07-15
20:43:42 UTC (rev 1726)
@@ -3,11 +3,12 @@
##
## DP: Update shebang line of gpsdrive_mapnik_gentiles.py to use python 2.5
(needed by mapnik).
## DP: Fix path to osm.xml (Thanks Giovanni Mascellani)
+## DP: Fix bashism in examples/wpget.
@DPATCH@
diff -urNad gpsdrive-2.10~pre4~/scripts/mapnik/gpsdrive_mapnik_gentiles-in.py
gpsdrive-2.10~pre4/scripts/mapnik/gpsdrive_mapnik_gentiles-in.py
--- gpsdrive-2.10~pre4~/scripts/mapnik/gpsdrive_mapnik_gentiles-in.py
2007-09-15 15:11:59.0 +
-+++ gpsdrive-2.10~pre4/scripts/mapnik/gpsdrive_mapnik_gentiles-in.py
2008-02-28 23:16:15.0 +
gpsdrive-2.10~pre4/scripts/mapnik/gpsdrive_mapnik_gentiles-in.py
2008-07-15 17:37:07.0 +
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.5
@@ -23,3 +24,15 @@
tile_dir = home + /.gpsdrive/maps/mapnik/
mapkoordfile = home + /.gpsdrive/maps/map_koord.txt
+diff -urNad gpsdrive-2.10~pre4~/scripts/wpget gpsdrive-2.10~pre4/scripts/wpget
+--- gpsdrive-2.10~pre4~/scripts/wpget 2007-09-14 21:47:07.0 +
gpsdrive-2.10~pre4/scripts/wpget 2008-07-15 17:38:12.0 +
+@@ -32,7 +32,7 @@
+ done
+
+ opt=${opt:= -w}
+-if [[ ${#opt} != 3 ${#opt} != 12 ]]; then
++if [ ${#opt} -ne 3 -a ${#opt} -ne 12 ]; then
+ echo Usage: $0 [-r|--get-routes]|[-w|--get-waypts]|[-t|--get-tracks]
[-d device|--device device] 2 ;
+ echo defaults are: --get-waypts and --device /dev/gps 2 ;
+ exit 1 ;
Added: packages/gpsdrive/trunk/debian/patches/99-autobestmap.dpatch
===
--- packages/gpsdrive/trunk/debian/patches/99-autobestmap.dpatch
(rev 0)
+++ packages/gpsdrive/trunk/debian/patches/99-autobestmap.dpatch
2008-07-15 20:43:42 UTC (rev 1726)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99-autobestmap.dpatch by Andreas Putzo [EMAIL PROTECTED]
+##
+## DP: The autobestmap config option is not updated when using the toggle
button
+## DP: in gpsdrive. Patch backported from 2.10pre5.
+
[EMAIL PROTECTED]@
+diff -urNad gpsdrive-2.10~pre4~/src/main_gui.c
gpsdrive-2.10~pre4/src/main_gui.c
+--- gpsdrive-2.10~pre4~/src/main_gui.c 2007-09-15 15:12:03.0 +
gpsdrive-2.10~pre4/src/main_gui.c 2008-07-15 19:48:34.0 +
+@@ -229,6 +229,7 @@
+ gtk_label_set_text (GTK_LABEL (statusprefscale_lb), _(Auto));
+ if (mapscaler_scaler)
+ gtk_widget_set_sensitive (mapscaler_scaler, FALSE);
++local_config.autobestmap = TRUE;
+ }
+ else
+ {
+@@ -238,6 +239,7 @@
+ gtk_label_set_text (GTK_LABEL (statusprefscale_lb), sc);
+ if (mapscaler_scaler)
+ gtk_widget_set_sensitive (mapscaler_scaler, TRUE);
++local_config.autobestmap = FALSE;
+ }
+
+ current.needtosave = TRUE;
Property changes on:
packages/gpsdrive/trunk/debian/patches/99-autobestmap.dpatch
___
Name: svn:executable
+ *
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1729 - packages/gpsdrive/trunk/debian
Author: nd-guest Date: 2008-07-15 20:49:47 + (Tue, 15 Jul 2008) New Revision: 1729 Modified: packages/gpsdrive/trunk/debian/changelog Log: commit changelog. Modified: packages/gpsdrive/trunk/debian/changelog === --- packages/gpsdrive/trunk/debian/changelog2008-07-15 20:48:27 UTC (rev 1728) +++ packages/gpsdrive/trunk/debian/changelog2008-07-15 20:49:47 UTC (rev 1729) @@ -3,8 +3,19 @@ * No longer create openstreetmap-map-icons-* binary packages. They are build from the openstreetmap-map-icons source package now. (Closes: #482866). + * Build a gpsdrive-data packages that contains architecture independent +files. + * Added DM-Upload-Allowed field to debian/control. + * Bumped Policy to 3.8.0, without changes. + * Updated 50-scripts.dpatch to fix bashism in wpget. +(Closes: #489603). + * Removed debian revison from mapnik dependency to +fix a lintian warning. + * Added 99-autobestmap.dpatch so that the toggle button +in gpsdrive works again. Already fixed upstream. +(Closes: #480234). - -- Andreas Putzo [EMAIL PROTECTED] Mon, 07 Jul 2008 19:24:03 + + -- Andreas Putzo [EMAIL PROTECTED] Tue, 15 Jul 2008 19:49:07 + gpsdrive (2.10~pre4-3) unstable; urgency=low ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1730 - packages/gpsdrive/trunk/debian
Author: nd-guest Date: 2008-07-15 20:57:21 + (Tue, 15 Jul 2008) New Revision: 1730 Modified: packages/gpsdrive/trunk/debian/TODO Log: update patch status Modified: packages/gpsdrive/trunk/debian/TODO === --- packages/gpsdrive/trunk/debian/TODO 2008-07-15 20:49:47 UTC (rev 1729) +++ packages/gpsdrive/trunk/debian/TODO 2008-07-15 20:57:21 UTC (rev 1730) @@ -3,9 +3,16 @@ * Help upstream to get the perl module namespace organized. * Remove the following patches on next release as they are fixed upstream +- 01-make (upstream switched to cmake) - 03-manpage -- 40-backported -- 60-sql -* Create a bpo package +- 20-homedir (~/.gpsdrive/osm.xml no longer overwritten) +- 40-backported (bugfixes backported from upstream vcs) +- 60-sql (uses sqlite now) +- 90-usage (fixed upstream) +- 95-newapi (should be fixed) +- 96-mapnik-plugins-dir (should be fixed) +- 98-mapnik-exception (fixed upstream) +- 99-autobestmap (fixed upstream) +* Create a bpo package for 2.4.10pre5 --- Andreas Putzo [EMAIL PROTECTED] at Mon Oct 15 10:04:42 UTC 2007 +-- Andreas Putzo [EMAIL PROTECTED] at Tue Jul 15 20:56:13 UTC 2008 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1721 - packages/mkgmap/trunk/debian
Author: nd-guest Date: 2008-07-14 13:52:33 + (Mon, 14 Jul 2008) New Revision: 1721 Removed: packages/mkgmap/trunk/debian/mkgmap.1 Modified: packages/mkgmap/trunk/debian/manpages Log: manpage included upstream. Modified: packages/mkgmap/trunk/debian/manpages === --- packages/mkgmap/trunk/debian/manpages 2008-07-13 20:26:04 UTC (rev 1720) +++ packages/mkgmap/trunk/debian/manpages 2008-07-14 13:52:33 UTC (rev 1721) @@ -1 +1 @@ -debian/mkgmap.1 +doc/mkgmap.1 Deleted: packages/mkgmap/trunk/debian/mkgmap.1 === --- packages/mkgmap/trunk/debian/mkgmap.1 2008-07-13 20:26:04 UTC (rev 1720) +++ packages/mkgmap/trunk/debian/mkgmap.1 2008-07-14 13:52:33 UTC (rev 1721) @@ -1,138 +0,0 @@ -.TH MKGMAP 1 April 13, 2008 -.\ Please adjust this date whenever revising the manpage. -.SH NAME -mkgmap \- Generate Garmin maps from OpenStreetMap data -.SH SYNOPSIS -.B mkgmap -.RI [ options ] files.osm ... -.SH DESCRIPTION -This manual page documents briefly the -.B mkgmap -command. -.PP -\fBmkgmap\fP is a program that converts OpenStreetMap (OSM) data into a map that can be loaded onto -a Garmin GPS device. -.br -The mapping between OSM features and the features in the map can be customized with a file. -.SH OPTIONS -.TP -.B \-c filename -The given file is opened and each line is an option setting of the form -option=value, just like on the command line except that there is no leading '--'. -.TP -.B \-n, \-\-mapname=name -Change the name of the map. Garmin maps are named by 8 digit numbers. -The default ist 63240001. It is best to change the name if you are going -to be making a map for others to use so that it is unique and does not -clash with others. -.TP -.B \-\-description=text -Sets the descriptive text for the map. This may be displayed in -QLandkarte, MapSource or on a GPS etc. -.TP -.B \-\-map-features=file -Use your own map features file. You can totally change which features -are shown and at what levels. See -.SM -.B CUSTOMISING THE MAP -below. -.TP -.B \-\-levels=levels code -Change the way that the levels on the map correspond to the zoom levels -in the device. See -.SM -.B CUSTOMISING THE MAP -below. The default is the equivalent of: 0=24, 1=22, 2=21, 3=19, 4=18, 5=16 although this may change. -.TP -.B \-\-latin1 -This option allows the use of non-ascii characters in street names. It -is hardware dependant what is actually supported on a particular -device. Some devices can only do ascii characters for example. -.br -Mkgmap goes to some length to convert un-displayable characters however. It -will convert accented characters that cannot be displayed in the chosen -character set into unaccented characters. -.SH CUSTOMISING THE MAP -You can completely change which features are displayed and at what zoom levels. -.PP -There are two concepts 'resolution' and 'level'. -.PP -.SS Resolution -is a number between 1 and 24 with 24 being the most detailed resolution and each number -less is half as detailed. -.br -So for example if a road was 12 units long at resolution 24 it would be only 6 at resolution -23 and just 3 at resolution 22. -.br -On a Garmin Legend Cx the resolution corresponds to these scales on the device: -.RS -16 30km-12km -.br -18 8km-3km -.br -20 2km-800m -.br -22 500m-200m -.br -23 300m-80m -.br -24 120m-50m -.RE -.br -It may be slightly different on different devices. -.SS Level -.br -is a number between 0 and 16 (although perhaps numbers above 10 are not usable), with -0 corresponding to the most detailed view. The map consists of a number of levels starting -(usually) with 0. For example 0, 1, 2, 3 and a different amount of detail is added -at each level. -.br -The map also contains a table to link the level to the resolution. So you can say -that level 0 corresponds to resolution 24. -.br -You can specify this mapping on the command line, for example: -.RS -\-\-levels=0:24,1:22,2:20 -.RE -This means that the map will have three levels. Level 0 in the map will -correspond to resolution 24 (the most detailed), level 1 will show at -resolution 22 (between scales of 500m and 200m) and so on. -.SS Map features -Custom map features can be applied using a delimeted file among with -the -.IR --map-features -command line option. -.br -A typical line may look like this: -.RS -.PP -point|amenity|grave_yard|0x64|0x03|23 -.RE -.PP -Column 1 is point, polyline or polygon, depending on whether the feature is a point of interest, -a line feature such as a road or an area such as a park. -.br -Column 2 and 3 are taken exactly from the key and value columns from the OSM map features. -.br -Column 4 is the garmin code that you want to use. -.br -Column 5 only applies to points and also determines the type of the object. -.br -Column 6 is the minimum resolution at which this feature will appear. -.PP -The file -.IR /usr/share/doc
[DebianGIS-dev] r1723 - packages/mkgmap/trunk/debian
Author: nd-guest Date: 2008-07-14 13:54:53 + (Mon, 14 Jul 2008) New Revision: 1723 Modified: packages/mkgmap/trunk/debian/control Log: add vcs fields, bump standards version fix depends Modified: packages/mkgmap/trunk/debian/control === --- packages/mkgmap/trunk/debian/control2008-07-14 13:53:06 UTC (rev 1722) +++ packages/mkgmap/trunk/debian/control2008-07-14 13:54:53 UTC (rev 1723) @@ -4,13 +4,15 @@ Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Andreas Putzo [EMAIL PROTECTED] Build-Depends: ant, cdbs, debhelper (= 5), java-gcj-compat-dev -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Homepage: http://www.parabola.me.uk/mkgmap +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/mkgmap/trunk +Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/mkgmap/trunk Package: mkgmap Architecture: all -Depends: java-gcj-compat | java2-runtime +Depends: openjdk-6-jre-headless | java5-runtime-headless Suggests: josm, qlandkarte Description: Generate Garmin maps from OpenStreetMap data - This program converts OpenStreetMap data into a map that + This program converts OpenStreetMap data into a map that can be loaded onto a Garmin GPS device. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1725 - in packages/mkgmap/trunk/debian: . scripts
Author: nd-guest
Date: 2008-07-14 14:36:04 + (Mon, 14 Jul 2008)
New Revision: 1725
Modified:
packages/mkgmap/trunk/debian/changelog
packages/mkgmap/trunk/debian/scripts/mkgmap
Log:
search for best working jvm in wrapper script
Modified: packages/mkgmap/trunk/debian/changelog
===
--- packages/mkgmap/trunk/debian/changelog 2008-07-14 13:57:16 UTC (rev
1724)
+++ packages/mkgmap/trunk/debian/changelog 2008-07-14 14:36:04 UTC (rev
1725)
@@ -1,5 +1,5 @@
-mkgmap (0.0.0+svn569-1) unstable; urgency=low
+mkgmap (0.0.0+svn630-1) unstable; urgency=low
- * Initial release (Closes: #475773)
+ * Initial release (Closes: #475773)
- -- Andreas Putzo [EMAIL PROTECTED] Sun, 13 Apr 2008 19:29:58 +
+ -- Andreas Putzo [EMAIL PROTECTED] Mon, 14 Jul 2008 13:38:36 +
Modified: packages/mkgmap/trunk/debian/scripts/mkgmap
===
--- packages/mkgmap/trunk/debian/scripts/mkgmap 2008-07-14 13:57:16 UTC (rev
1724)
+++ packages/mkgmap/trunk/debian/scripts/mkgmap 2008-07-14 14:36:04 UTC (rev
1725)
@@ -2,4 +2,22 @@
# Simple wrapper script to execute mkgmap in Debian
set -e
-exec /usr/bin/java -jar /usr/share/mkgmap/mkgmap.jar $@
+# First, the users preference as defined by $JAVA_HOME. Next, the
+# other JVMs known to work with mkgmap, with the one working best
+# fist, and the less functional onces after that. Last, use /usr/bin/java.
+# Override to a specific one using JAVACMD
+JAVA_CMDS=$JAVA_HOME/bin/java /usr/lib/jvm/java-6-openjdk/bin/java
/usr/lib/jvm/java-6-sun/jre/bin/java /usr/lib/jvm/java-1.5.0-sun/jre/bin/java
/usr/bin/java
+
+for jcmd in $JAVA_CMDS; do
+if [ -x $jcmd -a -z ${JAVACMD} ]; then
+JAVACMD=$jcmd
+fi
+done
+
+if [ $JAVACMD ]; then
+echo Using $JAVACMD to execute mkgmap.
+exec $JAVACMD -jar /usr/share/mkgmap/mkgmap.jar $@
+else
+echo No valid JVM found to run mkgmap.
+exit 1
+fi
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1713 - packages/openstreetmap-map-icons/trunk/debian
Author: nd-guest Date: 2008-07-13 16:29:21 + (Sun, 13 Jul 2008) New Revision: 1713 Modified: packages/openstreetmap-map-icons/trunk/debian/changelog packages/openstreetmap-map-icons/trunk/debian/rules Log: fetched new snapshot from svn with the cmake modules removed. Modified: packages/openstreetmap-map-icons/trunk/debian/changelog === --- packages/openstreetmap-map-icons/trunk/debian/changelog 2008-07-10 11:09:42 UTC (rev 1712) +++ packages/openstreetmap-map-icons/trunk/debian/changelog 2008-07-13 16:29:21 UTC (rev 1713) @@ -1,9 +1,13 @@ -openstreetmap-map-icons (1:0.0.0.20080706-1) unstable; urgency=low +openstreetmap-map-icons (1:0.0.0.20080713-1) unstable; urgency=low * Initial Release. (Closes: #439676) The openstreetmap-map-icons-* packages were originally provided -by the gpdsrive source package up to version 2.10~pre4-3. -Gpsdrive upstream no longer distributes the icon set. - * Added epoch to version to provide a greater version then gpsdrive. +by the gpdsrive source package up to version 2.10~pre4-3. +Gpsdrive upstream no longer distributes the icon set. + * Added epoch to version to provide a greater version then gpsdrive. + * Cmake modules got removed upstream, no longer needed to mention +them in the copyright file. + + * Upload sponsored by Petter Reinholdtsen. - -- Andreas Putzo [EMAIL PROTECTED] Mon, 07 Jul 2008 15:32:48 + + -- Andreas Putzo [EMAIL PROTECTED] Sun, 13 Jul 2008 16:26:14 + Modified: packages/openstreetmap-map-icons/trunk/debian/rules === --- packages/openstreetmap-map-icons/trunk/debian/rules 2008-07-10 11:09:42 UTC (rev 1712) +++ packages/openstreetmap-map-icons/trunk/debian/rules 2008-07-13 16:29:21 UTC (rev 1713) @@ -9,7 +9,7 @@ export DH_OPTIONS SVNREPO := http://svn.openstreetmap.org/applications/share/map-icons -SVNREV := 8426 +SVNREV := 8974 DATE := $(shell date +%Y%m%d) build: build-arch build-indep ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1714 - packages/josm/trunk/debian
Author: nd-guest Date: 2008-07-13 19:44:43 + (Sun, 13 Jul 2008) New Revision: 1714 Modified: packages/josm/trunk/debian/control packages/josm/trunk/debian/rules Log: switch to openjdk, drop support for classpath based jvm's, which is currently only jamvm that works with josm. Modified: packages/josm/trunk/debian/control === --- packages/josm/trunk/debian/control 2008-07-13 16:29:21 UTC (rev 1713) +++ packages/josm/trunk/debian/control 2008-07-13 19:44:43 UTC (rev 1714) @@ -3,7 +3,7 @@ Priority: extra Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Andreas Putzo [EMAIL PROTECTED], Giovanni Mascellani [EMAIL PROTECTED], Petter Reinholdtsen [EMAIL PROTECTED] -Build-Depends: ant, cdbs, dpatch, debhelper (= 5), java-gcj-compat-dev, libgettext-commons-java, libmetadata-extractor-java +Build-Depends: ant, cdbs, dpatch, debhelper (= 5), openjdk-6-jdk, libgettext-commons-java, libmetadata-extractor-java Standards-Version: 3.8.0 Homepage: http://josm.openstreetmap.de Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm/ @@ -11,8 +11,8 @@ Package: josm Architecture: all -Depends: jamvm | gij-4.1 | java2-runtime, libgettext-commons-java, libmetadata-extractor-java, openstreetmap-map-icons-classic -Recommends: jamvm | gij-4.1, josm-plugins +Depends: openjdk-6-jre, libgettext-commons-java, libmetadata-extractor-java, openstreetmap-map-icons-classic +Recommends: josm-plugins Description: Editor for OpenStreetMap JOSM is an editor for OpenStreetMap (OSM) written in Java. The current version supports stand alone GPX tracks, GPX track data Modified: packages/josm/trunk/debian/rules === --- packages/josm/trunk/debian/rules2008-07-13 16:29:21 UTC (rev 1713) +++ packages/josm/trunk/debian/rules2008-07-13 19:44:43 UTC (rev 1714) @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/dpatch.mk -JAVA_HOME := /usr/lib/jvm/java-gcj/ +JAVA_HOME := /usr/lib/jvm/java-6-openjdk/ ANT_HOME := /usr/share/ant DEB_ANT_BUILD_TARGET := dist ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1715 - packages/josm/trunk/debian
Author: nd-guest
Date: 2008-07-13 19:45:10 + (Sun, 13 Jul 2008)
New Revision: 1715
Modified:
packages/josm/trunk/debian/README.Debian
packages/josm/trunk/debian/josm.sh
Log:
Update readme and wrapper script for openjdk
Modified: packages/josm/trunk/debian/README.Debian
===
--- packages/josm/trunk/debian/README.Debian2008-07-13 19:44:43 UTC (rev
1714)
+++ packages/josm/trunk/debian/README.Debian2008-07-13 19:45:10 UTC (rev
1715)
@@ -1,15 +1,10 @@
Josm for Debian
---
-Josm should work using one of the following as /usr/bin/java:
-
-* /usr/bin/gij-4.1
-* /usr/bin/jamvm
-* any of SUN's java (non-free)
-
-This can be setup by exporting the JAVACMD or JAVA_HOME environment
-variable before running josm.
+By default josm is launched using OpenJDK-6. This can be overridden
+by exporting the JAVACMD or JAVA_HOME environment variables before
+running josm.
Note that JOSM doesn't follow the alternative system
in /etc/alternatives/ that is usually used on Debian systems.
- -- Andreas Putzo [EMAIL PROTECTED] Tue, 25 Mar 2008 22:40:12 +
+ -- Andreas Putzo [EMAIL PROTECTED] Sun, 13 Jul 2008 19:16:59 +
Modified: packages/josm/trunk/debian/josm.sh
===
--- packages/josm/trunk/debian/josm.sh 2008-07-13 19:44:43 UTC (rev 1714)
+++ packages/josm/trunk/debian/josm.sh 2008-07-13 19:45:10 UTC (rev 1715)
@@ -2,11 +2,9 @@
# Simple wrapper script used to start JOSM in Debian
set -e
-# First, the users preference as defined by $JAVA_HOME. Next, the
-# other JVMs known to work with josm, with the one working best
-# first, and the less functional ones after that. Override to a
-# specific one using $JAVACMD
-JAVA_CMDS=$JAVA_HOME/bin/java /usr/lib/jvm/java-6-sun/jre/bin/java
/usr/lib/jvm/java-1.5.0-sun/jre/bin/java /usr/bin/jamvm /usr/bin/gij-4.1
+# First, the users preference as defined by $JAVA_HOME. Next, use OpenJDK.
+# Override to a specific one using $JAVACMD
+JAVA_CMDS=$JAVA_HOME/bin/java /usr/lib/jvm/java-6-openjdk/bin/java
for jcmd in $JAVA_CMDS; do
if [ -x $jcmd -a -z ${JAVACMD} ]; then
@@ -19,7 +17,5 @@
exec $JAVACMD -jar /usr/share/josm/josm.jar $@
else
echo No valid JVM found to run JOSM.
-echo Please install one of those mentioned in README.Debian
-echo or set the JAVACMD environment variable prior running josm.
exit 1
fi
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1716 - packages/josm/trunk/debian/patches
Author: nd-guest Date: 2008-07-13 19:46:03 + (Sun, 13 Jul 2008) New Revision: 1716 Modified: packages/josm/trunk/debian/patches/00list packages/josm/trunk/debian/patches/10_build.dpatch packages/josm/trunk/debian/patches/40_elemstyles.dpatch Log: update patches. Modified: packages/josm/trunk/debian/patches/00list === --- packages/josm/trunk/debian/patches/00list 2008-07-13 19:45:10 UTC (rev 1715) +++ packages/josm/trunk/debian/patches/00list 2008-07-13 19:46:03 UTC (rev 1716) @@ -1,5 +1,5 @@ 10_build 20_bts -30_graphics +#30_graphics 40_elemstyles -50_sun +#50_sun Modified: packages/josm/trunk/debian/patches/10_build.dpatch === --- packages/josm/trunk/debian/patches/10_build.dpatch 2008-07-13 19:45:10 UTC (rev 1715) +++ packages/josm/trunk/debian/patches/10_build.dpatch 2008-07-13 19:46:03 UTC (rev 1716) @@ -59,11 +59,3 @@ /manifest /jar /target -@@ -46,6 +45,7 @@ - target name=compile depends=init - javac srcdir=src classpathref=classpath destdir=build target=1.5 debug=on - compilerarg value=-Xlint:deprecation/ -+compilerarg value=-warn:-serial,unusedImport/ - /javac - /target - Modified: packages/josm/trunk/debian/patches/40_elemstyles.dpatch === --- packages/josm/trunk/debian/patches/40_elemstyles.dpatch 2008-07-13 19:45:10 UTC (rev 1715) +++ packages/josm/trunk/debian/patches/40_elemstyles.dpatch 2008-07-13 19:46:03 UTC (rev 1716) @@ -1,8 +1,9 @@ #! /bin/sh /usr/share/dpatch/dpatch-run ## 40_elemstyles.dpatch by Andreas Putzo [EMAIL PROTECTED] ## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: The icons have been removed from the JAR file because they are +## DP: already provided by the openstreetmap-map-icons-* packages. +## DP: Point josm to the correct directory so that the icons are found. @DPATCH@ diff -urNad josm-0.0.0.20080518~/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java josm-0.0.0.20080518/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1717 - packages/josm/trunk/debian
Author: nd-guest Date: 2008-07-13 19:46:46 + (Sun, 13 Jul 2008) New Revision: 1717 Modified: packages/josm/trunk/debian/changelog Log: update changelog Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2008-07-13 19:46:03 UTC (rev 1716) +++ packages/josm/trunk/debian/changelog2008-07-13 19:46:46 UTC (rev 1717) @@ -1,13 +1,25 @@ -josm (0.0.0.20080629-1) unstable; urgency=low +josm (0.0.0.20080713-1) UNRELEASED; urgency=low - * New upstream SVN checkout + [ Giovanni Mascellani ] * patches/50_sun: fix 0.6 API specific code (not yet used) which doesn't compile with gcj * Bumped Standards-Version to 3.8.0 (no changes needed) * Added Vcs-* fields in debian/control - -- Giovanni Mascellani [EMAIL PROTECTED] Mon, 07 Jul 2008 09:08:18 +0200 + [ Andreas Putzo ] + * New upstream snapshot fetched from svn, revision 716. + * Switched to OpenJDK, dropping support for other JVM's. +- Updated build-deps and dependencies accordingly. +- Removed gcj specific compiler flags from 10_build.dpatch. +- Removed 30_graphics.dpatch. +- Updated README.Debian. +- Updated the wrapper script to choose OpenJDK if no other + JVM is given by the user. +(Closes: #486293, #474626) + * Added patch description to 40_elemstyles.dpatch. + -- Andreas Putzo [EMAIL PROTECTED] Sun, 13 Jul 2008 18:47:23 + + josm (0.0.0.20080510-1) unstable; urgency=low [ Giovanni Mascellani ] ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1718 - packages/josm/trunk/debian
Author: nd-guest Date: 2008-07-13 20:15:45 + (Sun, 13 Jul 2008) New Revision: 1718 Modified: packages/josm/trunk/debian/changelog packages/josm/trunk/debian/copyright Log: Add Ellipsoid.java to copyright file. Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2008-07-13 19:46:46 UTC (rev 1717) +++ packages/josm/trunk/debian/changelog2008-07-13 20:15:45 UTC (rev 1718) @@ -17,8 +17,9 @@ JVM is given by the user. (Closes: #486293, #474626) * Added patch description to 40_elemstyles.dpatch. + * Mentioned Ellipsoid.java in copyright file. - -- Andreas Putzo [EMAIL PROTECTED] Sun, 13 Jul 2008 18:47:23 + + -- Andreas Putzo [EMAIL PROTECTED] Sun, 13 Jul 2008 20:15:04 + josm (0.0.0.20080510-1) unstable; urgency=low Modified: packages/josm/trunk/debian/copyright === --- packages/josm/trunk/debian/copyright2008-07-13 19:46:46 UTC (rev 1717) +++ packages/josm/trunk/debian/copyright2008-07-13 20:15:45 UTC (rev 1718) @@ -86,3 +86,7 @@ . 3. that the endorsement of any product or service by Caltech, JPL or NASA must not be claimed or implied. + +Files: src/org/openstreetmap/josm/data/projection/Ellipsoid.java +Copyright: Copyright (c) 2002 Johan Montagnat [EMAIL PROTECTED] +License: GPL-2 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1719 - in packages/josm/trunk/debian: . patches
Author: nd-guest
Date: 2008-07-13 20:20:54 + (Sun, 13 Jul 2008)
New Revision: 1719
Removed:
packages/josm/trunk/debian/patches/30_graphics.dpatch
packages/josm/trunk/debian/patches/50_sun.dpatch
Modified:
packages/josm/trunk/debian/changelog
packages/josm/trunk/debian/patches/00list
Log:
fixate patches.
Modified: packages/josm/trunk/debian/changelog
===
--- packages/josm/trunk/debian/changelog2008-07-13 20:15:45 UTC (rev
1718)
+++ packages/josm/trunk/debian/changelog2008-07-13 20:20:54 UTC (rev
1719)
@@ -1,8 +1,6 @@
josm (0.0.0.20080713-1) UNRELEASED; urgency=low
[ Giovanni Mascellani ]
- * patches/50_sun: fix 0.6 API specific code (not yet used) which
-doesn't compile with gcj
* Bumped Standards-Version to 3.8.0 (no changes needed)
* Added Vcs-* fields in debian/control
@@ -19,7 +17,7 @@
* Added patch description to 40_elemstyles.dpatch.
* Mentioned Ellipsoid.java in copyright file.
- -- Andreas Putzo [EMAIL PROTECTED] Sun, 13 Jul 2008 20:15:04 +
+ -- Andreas Putzo [EMAIL PROTECTED] Sun, 13 Jul 2008 20:18:31 +
josm (0.0.0.20080510-1) unstable; urgency=low
Modified: packages/josm/trunk/debian/patches/00list
===
--- packages/josm/trunk/debian/patches/00list 2008-07-13 20:15:45 UTC (rev
1718)
+++ packages/josm/trunk/debian/patches/00list 2008-07-13 20:20:54 UTC (rev
1719)
@@ -1,5 +1,3 @@
10_build
20_bts
-#30_graphics
40_elemstyles
-#50_sun
Deleted: packages/josm/trunk/debian/patches/30_graphics.dpatch
===
--- packages/josm/trunk/debian/patches/30_graphics.dpatch 2008-07-13
20:15:45 UTC (rev 1718)
+++ packages/josm/trunk/debian/patches/30_graphics.dpatch 2008-07-13
20:20:54 UTC (rev 1719)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_graphics.dpatch by Andreas Putzo [EMAIL PROTECTED]
-##
-## DP: Workaround setXORMode
-
[EMAIL PROTECTED]@
-diff -urNad
josm-0.0.0.20071014~/src/org/openstreetmap/josm/gui/SelectionManager.java
josm-0.0.0.20071014/src/org/openstreetmap/josm/gui/SelectionManager.java
josm-0.0.0.20071014~/src/org/openstreetmap/josm/gui/SelectionManager.java
2007-10-09 22:10:27.0 +
-+++ josm-0.0.0.20071014/src/org/openstreetmap/josm/gui/SelectionManager.java
2007-10-14 16:24:24.0 +
-@@ -221,7 +221,7 @@
- if (mousePos == null || mousePosStart == null || mousePos ==
mousePosStart)
- return;
- Graphics g = nc.getGraphics();
-- g.setColor(Color.BLACK);
-+ g.setColor(Color.BLUE);
- g.setXORMode(Color.WHITE);
-
- Rectangle r = getSelectionRectangle();
Deleted: packages/josm/trunk/debian/patches/50_sun.dpatch
===
--- packages/josm/trunk/debian/patches/50_sun.dpatch2008-07-13 20:15:45 UTC
(rev 1718)
+++ packages/josm/trunk/debian/patches/50_sun.dpatch2008-07-13 20:20:54 UTC
(rev 1719)
@@ -1,103 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_sun.dpatch by Giovanni Mascellani [EMAIL PROTECTED]
-##
-## DP: Fix 0.6 API specific code (not yet used) which doesn't compile with gcj
-
[EMAIL PROTECTED]@
-diff -urNad
josm-0.0.0.20080627~/src/org/openstreetmap/josm/gui/MainApplication.java
josm-0.0.0.20080627/src/org/openstreetmap/josm/gui/MainApplication.java
josm-0.0.0.20080627~/src/org/openstreetmap/josm/gui/MainApplication.java
2008-06-29 12:39:39.0 +0200
-+++ josm-0.0.0.20080627/src/org/openstreetmap/josm/gui/MainApplication.java
2008-06-29 12:45:31.0 +0200
-@@ -171,6 +171,16 @@
- Main.loadPlugins(false);
- toolbar.refreshToolbarControl();
-
-+ String version = Main.pref.get(osm-server.version, 0.5);
-+ if (version != 0.5) {
-+ // Debian JOSM is not API 0.6 compatible
-+ JOptionPane.showMessageDialog(null,
-+ This version of JOSM compiled for
Debian cannot be used with 0.6 API.\n +
-+ Please, delete the
\osm-server.version\ line from your configuration file and restart JOSM.,
-+ Not API 0.6 compatible JOSM,
JOptionPane.ERROR_MESSAGE);
-+ System.exit(0);
-+ }
-+
- mainFrame.setVisible(true);
-
- if (!args.containsKey(no-fullscreen)
!args.containsKey(geometry)
Toolkit.getDefaultToolkit().isFrameStateSupported(JFrame.MAXIMIZED_BOTH))
-diff -urNad
josm-0.0.0.20080627~/src/org/openstreetmap/josm/io/MyHttpHandler.java
josm-0.0.0.20080627/src/org/openstreetmap/josm/io/MyHttpHandler.java
josm-0.0.0.20080627~/src/org/openstreetmap/josm/io/MyHttpHandler.java
2008-06-29 12:39
[DebianGIS-dev] r1720 - packages/josm/trunk/debian
Author: nd-guest Date: 2008-07-13 20:26:04 + (Sun, 13 Jul 2008) New Revision: 1720 Modified: packages/josm/trunk/debian/changelog Log: prepare for release Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2008-07-13 20:20:54 UTC (rev 1719) +++ packages/josm/trunk/debian/changelog2008-07-13 20:26:04 UTC (rev 1720) @@ -1,4 +1,4 @@ -josm (0.0.0.20080713-1) UNRELEASED; urgency=low +josm (0.0.0.20080713-1) unstable; urgency=low [ Giovanni Mascellani ] * Bumped Standards-Version to 3.8.0 (no changes needed) @@ -11,13 +11,13 @@ - Removed gcj specific compiler flags from 10_build.dpatch. - Removed 30_graphics.dpatch. - Updated README.Debian. -- Updated the wrapper script to choose OpenJDK if no other +- Updated wrapper script to choose OpenJDK if no other JVM is given by the user. (Closes: #486293, #474626) * Added patch description to 40_elemstyles.dpatch. * Mentioned Ellipsoid.java in copyright file. - -- Andreas Putzo [EMAIL PROTECTED] Sun, 13 Jul 2008 20:18:31 + + -- Andreas Putzo [EMAIL PROTECTED] Sun, 13 Jul 2008 20:23:32 + josm (0.0.0.20080510-1) unstable; urgency=low ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1701 - packages/openstreetmap-map-icons/trunk/debian
Author: nd-guest Date: 2008-07-07 15:31:31 + (Mon, 07 Jul 2008) New Revision: 1701 Added: packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-classic.dirs packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-classic.install packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-common.docs packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-common.examples packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-scalable.dirs packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-scalable.install packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-square.dirs packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-square.install Removed: packages/openstreetmap-map-icons/trunk/debian/osm-map-icons-classic.dirs packages/openstreetmap-map-icons/trunk/debian/osm-map-icons-classic.install packages/openstreetmap-map-icons/trunk/debian/osm-map-icons-scalable.dirs packages/openstreetmap-map-icons/trunk/debian/osm-map-icons-scalable.install packages/openstreetmap-map-icons/trunk/debian/osm-map-icons-square.dirs packages/openstreetmap-map-icons/trunk/debian/osm-map-icons-square.install Modified: packages/openstreetmap-map-icons/trunk/debian/changelog packages/openstreetmap-map-icons/trunk/debian/control packages/openstreetmap-map-icons/trunk/debian/rules Log: Rename back to openstreetmap-map-icons. Modified: packages/openstreetmap-map-icons/trunk/debian/changelog === --- packages/openstreetmap-map-icons/trunk/debian/changelog 2008-07-07 15:13:32 UTC (rev 1700) +++ packages/openstreetmap-map-icons/trunk/debian/changelog 2008-07-07 15:31:31 UTC (rev 1701) @@ -1,4 +1,4 @@ -osm-map-icons (0.0.0.20080706-1) unstable; urgency=low +openstreetmap-map-icons (0.0.0.20080706-1) unstable; urgency=low * Initial Release. (Closes: #439676) Modified: packages/openstreetmap-map-icons/trunk/debian/control === --- packages/openstreetmap-map-icons/trunk/debian/control 2008-07-07 15:13:32 UTC (rev 1700) +++ packages/openstreetmap-map-icons/trunk/debian/control 2008-07-07 15:31:31 UTC (rev 1701) @@ -1,40 +1,27 @@ -Source: osm-map-icons +Source: openstreetmap-map-icons Section: utils Priority: optional Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Andreas Putzo [EMAIL PROTECTED] Build-Depends: debhelper (= 5) Standards-Version: 3.8.0 -Homepage: http://wiki.osm.org/index.php/map-icons -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/osm-map-icons/trunk -Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/osm-map-icons/trunk +Homepage: http://wiki.openstreetmap.org/index.php/Map_Icons +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/openstreetmap-map-icons/trunk +Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/openstreetmap-map-icons/trunk -Package: osm-map-icons-common +Package: openstreetmap-map-icons-classic Architecture: all -Recommends: osm-map-icons-classic, osm-map-icons-square, osm-map-icons-scalable Description: Collection of map icons This package provides a set of icons intended to be used together with maps. Several point-of-interest categories are covered like accommodation, education, food, health, geocache, places, religion, shopping, etc. . - This package contains files that are common for all icon sets. - -Package: osm-map-icons-classic -Architecture: all -Suggests: osm-map-icons-common -Description: Collection of map icons - This package provides a set of icons intended to be used - together with maps. Several point-of-interest categories - are covered like accommodation, education, food, health, - geocache, places, religion, shopping, etc. - . This package contains the classic set from the OpenStreetMap project. -Package: osm-map-icons-square +Package: openstreetmap-map-icons-square Architecture: all -Suggests: osm-map-icons-common Description: Collection of map icons This package provides a set of icons intended to be used together with maps. Several point-of-interest categories @@ -44,9 +31,8 @@ This package contains the square set from the OpenStreetMap project. -Package: osm-map-icons-scalable +Package: openstreetmap-map-icons-scalable Architecture: all -Suggests: osm-map-icons-common Description: Collection of map icons This package provides a set of icons intended to be used together with maps. Several point-of-interest categories Added: packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-classic.dirs === --- packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-classic.dirs (rev 0) +++ packages/openstreetmap-map-icons/trunk
[DebianGIS-dev] r1703 - packages/openstreetmap-map-icons/trunk/debian
Author: nd-guest Date: 2008-07-07 18:26:19 + (Mon, 07 Jul 2008) New Revision: 1703 Modified: packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-classic.dirs packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-classic.install packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-scalable.dirs packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-scalable.install packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-square.dirs packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-square.install packages/openstreetmap-map-icons/trunk/debian/rules Log: adapt install path Modified: packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-classic.dirs === --- packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-classic.dirs 2008-07-07 17:55:01 UTC (rev 1702) +++ packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-classic.dirs 2008-07-07 18:26:19 UTC (rev 1703) @@ -1,2 +1,2 @@ -usr/share/icons/map-icons/classic.small -usr/share/icons/map-icons/classic.big +usr/share/icons/openstreetmap/classic.small +usr/share/icons/openstreetmap/classic.big Modified: packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-classic.install === --- packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-classic.install 2008-07-07 17:55:01 UTC (rev 1702) +++ packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-classic.install 2008-07-07 18:26:19 UTC (rev 1703) @@ -1,2 +1,2 @@ -classic.small/* usr/share/icons/map-icons/classic.small/ -classic.big/* usr/share/icons/map-icons/classic.big/ +classic.small/* usr/share/icons/openstreetmap/classic.small/ +classic.big/* usr/share/icons/openstreetmap/classic.big/ Modified: packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-scalable.dirs === --- packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-scalable.dirs 2008-07-07 17:55:01 UTC (rev 1702) +++ packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-scalable.dirs 2008-07-07 18:26:19 UTC (rev 1703) @@ -1 +1 @@ -usr/share/icons/map-icons/scalable +usr/share/icons/openstreetmap/scalable Modified: packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-scalable.install === --- packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-scalable.install 2008-07-07 17:55:01 UTC (rev 1702) +++ packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-scalable.install 2008-07-07 18:26:19 UTC (rev 1703) @@ -1 +1 @@ -svg/* usr/share/icons/map-icons/scalable/ +svg/* usr/share/icons/openstreetmap/scalable/ Modified: packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-square.dirs === --- packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-square.dirs 2008-07-07 17:55:01 UTC (rev 1702) +++ packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-square.dirs 2008-07-07 18:26:19 UTC (rev 1703) @@ -1,2 +1,2 @@ -usr/share/icons/map-icons/square.small -usr/share/icons/map-icons/square.big +usr/share/icons/openstreetmap/square.small +usr/share/icons/openstreetmap/square.big Modified: packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-square.install === --- packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-square.install 2008-07-07 17:55:01 UTC (rev 1702) +++ packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-square.install 2008-07-07 18:26:19 UTC (rev 1703) @@ -1,2 +1,2 @@ -square.small/* usr/share/icons/map-icons/square.small/ -square.big/* usr/share/icons/map-icons/square.big/ +square.small/* usr/share/icons/openstreetmap/square.small/ +square.big/* usr/share/icons/openstreetmap/square.big/ Modified: packages/openstreetmap-map-icons/trunk/debian/rules === --- packages/openstreetmap-map-icons/trunk/debian/rules 2008-07-07 17:55:01 UTC (rev 1702) +++ packages/openstreetmap-map-icons/trunk/debian/rules 2008-07-07 18:26:19 UTC (rev 1703) @@ -35,13 +35,13 @@ dh_clean -k -i dh_installdirs -i dh_install -i - find $(CURDIR)/debian/openstreetmap-map-icons-classic/usr/share/icons/map-icons/ -type d -empty | xargs rmdir - find $(CURDIR)/debian/openstreetmap-map-icons-scalable/usr/share/icons/map-icons/ -type d -empty |xargs rmdir - find $(CURDIR)/debian/openstreetmap-map-icons-square/usr
[DebianGIS-dev] r1704 - packages/gpsdrive/trunk/debian
Author: nd-guest Date: 2008-07-07 20:39:28 + (Mon, 07 Jul 2008) New Revision: 1704 Removed: packages/gpsdrive/trunk/debian/openstreetmap-map-icons-classic.install packages/gpsdrive/trunk/debian/openstreetmap-map-icons-scalable.install packages/gpsdrive/trunk/debian/openstreetmap-map-icons-square.install Modified: packages/gpsdrive/trunk/debian/changelog packages/gpsdrive/trunk/debian/control Log: remove icons from the gpsdrive package Modified: packages/gpsdrive/trunk/debian/changelog === --- packages/gpsdrive/trunk/debian/changelog2008-07-07 18:26:19 UTC (rev 1703) +++ packages/gpsdrive/trunk/debian/changelog2008-07-07 20:39:28 UTC (rev 1704) @@ -1,3 +1,11 @@ +gpsdrive (2.10~pre4-4) UNRELEASED; urgency=low + + * No longer create openstreetmap-map-icons-* binary packages. +They are build from the openstreetmap-map-icons source package +now. (Closes: #482866). + + -- Andreas Putzo [EMAIL PROTECTED] Mon, 07 Jul 2008 19:24:03 + + gpsdrive (2.10~pre4-3) unstable; urgency=low * Fix regression of last upload in the mapnik handling. Modified: packages/gpsdrive/trunk/debian/control === --- packages/gpsdrive/trunk/debian/control 2008-07-07 18:26:19 UTC (rev 1703) +++ packages/gpsdrive/trunk/debian/control 2008-07-07 20:39:28 UTC (rev 1704) @@ -29,36 +29,3 @@ . This package contains various scripts to download maps from different sources and to manage point-of-interests. - -Package: openstreetmap-map-icons-classic -Architecture: all -Description: Collection of map icons - This package provides a set of icons intended to be used - together with maps. Several point-of-interest categories - are covered like accommodation, education, food, health, - geocache, places, religion, shopping, etc. - . - This package contains the classic set from the OpenStreetMap - project. - -Package: openstreetmap-map-icons-square -Architecture: all -Description: Collection of map icons - This package provides a set of icons intended to be used - together with maps. Several point-of-interest categories - are covered like accommodation, education, food, health, - geocache, places, religion, shopping, etc. - . - This package contains the square set from the OpenStreetMap - project. - -Package: openstreetmap-map-icons-scalable -Architecture: all -Description: Collection of map icons - This package provides a set of icons intended to be used - together with maps. Several point-of-interest categories - are covered like accommodation, education, food, health, - geocache, places, religion, shopping, etc. - . - This package contains the scalable set from the OpenStreetMap - project. Deleted: packages/gpsdrive/trunk/debian/openstreetmap-map-icons-classic.install === --- packages/gpsdrive/trunk/debian/openstreetmap-map-icons-classic.install 2008-07-07 18:26:19 UTC (rev 1703) +++ packages/gpsdrive/trunk/debian/openstreetmap-map-icons-classic.install 2008-07-07 20:39:28 UTC (rev 1704) @@ -1,2 +0,0 @@ -usr/share/map-icons/classic.big/* usr/share/icons/openstreetmap/classic.big -usr/share/map-icons/classic.small/* usr/share/icons/openstreetmap/classic.small Deleted: packages/gpsdrive/trunk/debian/openstreetmap-map-icons-scalable.install === --- packages/gpsdrive/trunk/debian/openstreetmap-map-icons-scalable.install 2008-07-07 18:26:19 UTC (rev 1703) +++ packages/gpsdrive/trunk/debian/openstreetmap-map-icons-scalable.install 2008-07-07 20:39:28 UTC (rev 1704) @@ -1 +0,0 @@ -usr/share/map-icons/svg/* usr/share/icons/openstreetmap/scalable Deleted: packages/gpsdrive/trunk/debian/openstreetmap-map-icons-square.install === --- packages/gpsdrive/trunk/debian/openstreetmap-map-icons-square.install 2008-07-07 18:26:19 UTC (rev 1703) +++ packages/gpsdrive/trunk/debian/openstreetmap-map-icons-square.install 2008-07-07 20:39:28 UTC (rev 1704) @@ -1,2 +0,0 @@ -usr/share/map-icons/square.big/* usr/share/icons/openstreetmap/square.big -usr/share/map-icons/square.small/* usr/share/icons/openstreetmap/square.small ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1696 - in packages: . osm-map-icons
Author: nd-guest Date: 2008-07-06 21:25:35 + (Sun, 06 Jul 2008) New Revision: 1696 Added: packages/osm-map-icons/ packages/osm-map-icons/tags/ Log: Creating osm-map-icons/tags/ directory. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1697 - packages/osm-map-icons
Author: nd-guest Date: 2008-07-06 21:25:48 + (Sun, 06 Jul 2008) New Revision: 1697 Added: packages/osm-map-icons/trunk/ Log: Creating trunk directory ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1698 - in packages/osm-map-icons/trunk: . debian
Author: nd-guest Date: 2008-07-06 21:26:00 + (Sun, 06 Jul 2008) New Revision: 1698 Added: packages/osm-map-icons/trunk/debian/ packages/osm-map-icons/trunk/debian/changelog packages/osm-map-icons/trunk/debian/compat packages/osm-map-icons/trunk/debian/control packages/osm-map-icons/trunk/debian/copyright packages/osm-map-icons/trunk/debian/osm-map-icons-classic.dirs packages/osm-map-icons/trunk/debian/osm-map-icons-classic.install packages/osm-map-icons/trunk/debian/osm-map-icons-common.docs packages/osm-map-icons/trunk/debian/osm-map-icons-common.examples packages/osm-map-icons/trunk/debian/osm-map-icons-scalable.dirs packages/osm-map-icons/trunk/debian/osm-map-icons-scalable.install packages/osm-map-icons/trunk/debian/osm-map-icons-square.dirs packages/osm-map-icons/trunk/debian/osm-map-icons-square.install packages/osm-map-icons/trunk/debian/rules Log: [svn-inject] Applying Debian modifications to trunk Property changes on: packages/osm-map-icons/trunk/debian ___ Name: mergeWithUpstream + 1 Added: packages/osm-map-icons/trunk/debian/changelog === --- packages/osm-map-icons/trunk/debian/changelog (rev 0) +++ packages/osm-map-icons/trunk/debian/changelog 2008-07-06 21:26:00 UTC (rev 1698) @@ -0,0 +1,5 @@ +osm-map-icons (0.0.0.20080705-1) unstable; urgency=low + + * Initial Release. (Closes: #439676) + + -- Andreas Putzo [EMAIL PROTECTED] Sun, 06 Jul 2008 12:48:46 + Added: packages/osm-map-icons/trunk/debian/compat === --- packages/osm-map-icons/trunk/debian/compat (rev 0) +++ packages/osm-map-icons/trunk/debian/compat 2008-07-06 21:26:00 UTC (rev 1698) @@ -0,0 +1 @@ +5 Added: packages/osm-map-icons/trunk/debian/control === --- packages/osm-map-icons/trunk/debian/control (rev 0) +++ packages/osm-map-icons/trunk/debian/control 2008-07-06 21:26:00 UTC (rev 1698) @@ -0,0 +1,57 @@ +Source: osm-map-icons +Section: utils +Priority: optional +Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org +Uploaders: Andreas Putzo [EMAIL PROTECTED] +Build-Depends: debhelper (= 5) +Standards-Version: 3.8.0 +Homepage: http://wiki.osm.org/index.php/map-icons +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/osm-map-icons/trunk +Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/osm-map-icons/trunk + +Package: osm-map-icons-common +Architecture: all +Recommends: osm-map-icons-classic, osm-map-icons-square, osm-map-icons-scalable +Description: Collection of map icons + This package provides a set of icons intended to be used + together with maps. Several point-of-interest categories + are covered like accommodation, education, food, health, + geocache, places, religion, shopping, etc. + . + This package contains files that are common for all icon sets. + +Package: osm-map-icons-classic +Architecture: all +Suggests: osm-map-icons-common +Description: Collection of map icons + This package provides a set of icons intended to be used + together with maps. Several point-of-interest categories + are covered like accommodation, education, food, health, + geocache, places, religion, shopping, etc. + . + This package contains the classic set from the OpenStreetMap + project. + +Package: osm-map-icons-square +Architecture: all +Suggests: osm-map-icons-common +Description: Collection of map icons + This package provides a set of icons intended to be used + together with maps. Several point-of-interest categories + are covered like accommodation, education, food, health, + geocache, places, religion, shopping, etc. + . + This package contains the square set from the OpenStreetMap + project. + +Package: osm-map-icons-scalable +Architecture: all +Suggests: osm-map-icons-common +Description: Collection of map icons + This package provides a set of icons intended to be used + together with maps. Several point-of-interest categories + are covered like accommodation, education, food, health, + geocache, places, religion, shopping, etc. + . + This package contains the scalable set from the OpenStreetMap + project. Added: packages/osm-map-icons/trunk/debian/copyright === --- packages/osm-map-icons/trunk/debian/copyright (rev 0) +++ packages/osm-map-icons/trunk/debian/copyright 2008-07-06 21:26:00 UTC (rev 1698) @@ -0,0 +1,17 @@ +This package was debianized by Andreas Putzo [EMAIL PROTECTED] on +Sun Jul 6 14:04:17 UTC 2008 + +It was downloaded using svn from +URL:http://svn.openstreetmap.org/applications/share/map-icons/. + +The debian/ dir has been removed from the tarball. +The directories japan/ and nickw
[DebianGIS-dev] r1699 - packages/osm-map-icons/trunk/debian
Author: nd-guest Date: 2008-07-06 21:44:18 + (Sun, 06 Jul 2008) New Revision: 1699 Modified: packages/osm-map-icons/trunk/debian/changelog packages/osm-map-icons/trunk/debian/rules Log: Add get-orig-source target. Remove some cruft. Modified: packages/osm-map-icons/trunk/debian/changelog === --- packages/osm-map-icons/trunk/debian/changelog 2008-07-06 21:26:00 UTC (rev 1698) +++ packages/osm-map-icons/trunk/debian/changelog 2008-07-06 21:44:18 UTC (rev 1699) @@ -1,5 +1,5 @@ -osm-map-icons (0.0.0.20080705-1) unstable; urgency=low +osm-map-icons (0.0.0.20080706-1) unstable; urgency=low * Initial Release. (Closes: #439676) - -- Andreas Putzo [EMAIL PROTECTED] Sun, 06 Jul 2008 12:48:46 + + -- Andreas Putzo [EMAIL PROTECTED] Sun, 06 Jul 2008 21:38:32 + Modified: packages/osm-map-icons/trunk/debian/rules === --- packages/osm-map-icons/trunk/debian/rules 2008-07-06 21:26:00 UTC (rev 1698) +++ packages/osm-map-icons/trunk/debian/rules 2008-07-06 21:44:18 UTC (rev 1699) @@ -8,7 +8,9 @@ # This has to be exported to make some magic below work. export DH_OPTIONS -DESTDIR := $(CURDIR)/debian/tmp +SVNREPO := http://svn.openstreetmap.org/applications/share/map-icons +SVNREV := 8426 +DATE := $(shell date +%Y%m%d) build: build-arch build-indep @@ -41,7 +43,6 @@ find $(CURDIR)/debian/osm-map-icons-scalable/usr/share/icons/map-icons/ -type f |xargs chmod 644 find $(CURDIR)/debian/osm-map-icons-square/usr/share/icons/map-icons/ -type f | xargs chmod 644 - install-arch: binary-common: @@ -64,4 +65,23 @@ binary-arch: build-arch install-arch binary: binary-arch binary-indep -.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch #PHONY_CONFIGURE# + +get-orig-source: + dh_testdir + test -d ../tarballs/. || mkdir -p ../tarballs + @echo Downloading osm-map-icons from $(SVNREPO) + svn -r $(SVNREV) export $(SVNREPO) ../tarballs/osm-map-icons-0.0.0.$(DATE) + @echo Removing directories: debian nickw japan + rm -rf ../tarballs/osm-map-icons-0.0.0.$(DATE)/debian + rm -rf ../tarballs/osm-map-icons-0.0.0.$(DATE)/nickw + rm -rf ../tarballs/osm-map-icons-0.0.0.$(DATE)/japan + @echo Building snapshot tarball + tar czf ../tarballs/osm-map-icons_0.0.0.$(DATE).orig.tar.gz -C ../tarballs osm-map-icons-0.0.0.$(DATE) + @echo Cleaning up + rm -rf ../tarballs/osm-map-icons-0.0.0.$(DATE) + @echo . + @echo To update debian/changelog type + @echo dch -v 0.0.0.$(DATE)-1 + @echo . + +.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1694 - packages/gosmore/trunk/debian
Author: nd-guest Date: 2008-07-05 13:37:55 + (Sat, 05 Jul 2008) New Revision: 1694 Modified: packages/gosmore/trunk/debian/changelog Log: forgot to close bug Modified: packages/gosmore/trunk/debian/changelog === --- packages/gosmore/trunk/debian/changelog 2008-07-04 18:38:02 UTC (rev 1693) +++ packages/gosmore/trunk/debian/changelog 2008-07-05 13:37:55 UTC (rev 1694) @@ -2,6 +2,7 @@ [ Andreas Putzo ] * New upstream snapshot fetched from svn, revision 8034. +(Closes: #487711) * Backported patch 10-findresources to search for files. not only in the current directory. * Adapt CFLAGS in debian/rules. @@ -14,7 +15,7 @@ * Add josm as suggests. * Add get-orig-source target to the rules file. - -- Andreas Putzo [EMAIL PROTECTED] Fri, 04 Jul 2008 18:37:21 + + -- Andreas Putzo [EMAIL PROTECTED] Sat, 05 Jul 2008 13:36:39 + gosmore (0.0.0.20070901-3) unstable; urgency=low ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1695 - packages/gosmore/trunk/debian
Author: nd-guest Date: 2008-07-05 13:47:08 + (Sat, 05 Jul 2008) New Revision: 1695 Modified: packages/gosmore/trunk/debian/changelog Log: close the other bug as well.. Modified: packages/gosmore/trunk/debian/changelog === --- packages/gosmore/trunk/debian/changelog 2008-07-05 13:37:55 UTC (rev 1694) +++ packages/gosmore/trunk/debian/changelog 2008-07-05 13:47:08 UTC (rev 1695) @@ -2,7 +2,7 @@ [ Andreas Putzo ] * New upstream snapshot fetched from svn, revision 8034. -(Closes: #487711) +(Closes: #487711, #479985) * Backported patch 10-findresources to search for files. not only in the current directory. * Adapt CFLAGS in debian/rules. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1692 - in packages/gosmore/trunk/debian: . patches
Author: nd-guest Date: 2008-07-04 17:10:21 + (Fri, 04 Jul 2008) New Revision: 1692 Added: packages/gosmore/trunk/debian/gosmore.install packages/gosmore/trunk/debian/patches/10-findresources.dpatch Modified: packages/gosmore/trunk/debian/ packages/gosmore/trunk/debian/changelog packages/gosmore/trunk/debian/control packages/gosmore/trunk/debian/gosmore.dirs packages/gosmore/trunk/debian/patches/00list packages/gosmore/trunk/debian/rules Log: prepare new gosmore snapshot. Property changes on: packages/gosmore/trunk/debian ___ Name: mergeWithUpstream + 1 Modified: packages/gosmore/trunk/debian/changelog === --- packages/gosmore/trunk/debian/changelog 2008-07-02 18:31:02 UTC (rev 1691) +++ packages/gosmore/trunk/debian/changelog 2008-07-04 17:10:21 UTC (rev 1692) @@ -1,9 +1,19 @@ -gosmore (0.0.0.20070901-4) UNRELEASED; urgency=low +gosmore (0.0.0.20080704-1) UNRELEASED; urgency=low + [ Andreas Putzo ] + * New upstream snapshot fetched from svn, revision 8034. + * Backported patch 10-findresources to search for files. +not only in the current directory. + * Adapt CFLAGS in debian/rules. + * Added gosmore.install file. + * Bumped Standards-Version to 3.8.0. + * Added myself to Uploaders. + + [ Petter Reinholdtsen ] * Add josm as suggests. * Add get-orig-source target to the rules file. - -- Petter Reinholdtsen [EMAIL PROTECTED] Sat, 29 Mar 2008 13:50:08 +0100 + -- Andreas Putzo [EMAIL PROTECTED] Fri, 04 Jul 2008 16:55:36 + gosmore (0.0.0.20070901-3) unstable; urgency=low Modified: packages/gosmore/trunk/debian/control === --- packages/gosmore/trunk/debian/control 2008-07-02 18:31:02 UTC (rev 1691) +++ packages/gosmore/trunk/debian/control 2008-07-04 17:10:21 UTC (rev 1692) @@ -2,9 +2,9 @@ Section: utils Priority: optional Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org -Uploaders: Francesco Paolo Lovergine [EMAIL PROTECTED], Petter Reinholdtsen [EMAIL PROTECTED] +Uploaders: Francesco Paolo Lovergine [EMAIL PROTECTED], Petter Reinholdtsen [EMAIL PROTECTED], Andreas Putzo [EMAIL PROTECTED] Build-Depends: debhelper ( 5.0.0), cdbs, libgtk2.0-dev, flite-dev, libgps-dev (= 2.34.dfsg-5) | gpsd ( 2.34.dfsg-1), dpatch -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Homepage: http://wiki.openstreetmap.org/index.php/Gosmore Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gosmore/trunk Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gosmore/trunk @@ -18,4 +18,3 @@ Description: Openstreetmap.org viewer / wayfinder / search client Gosmore is a openstreetmap.org viewer and wayfinder with support for speech syntesis and fetching the current location from gpsd. - Modified: packages/gosmore/trunk/debian/gosmore.dirs === --- packages/gosmore/trunk/debian/gosmore.dirs 2008-07-02 18:31:02 UTC (rev 1691) +++ packages/gosmore/trunk/debian/gosmore.dirs 2008-07-04 17:10:21 UTC (rev 1692) @@ -1 +1,2 @@ usr/bin +usr/share/gosmore Added: packages/gosmore/trunk/debian/gosmore.install === --- packages/gosmore/trunk/debian/gosmore.install (rev 0) +++ packages/gosmore/trunk/debian/gosmore.install 2008-07-04 17:10:21 UTC (rev 1692) @@ -0,0 +1,3 @@ +elemstyles.xml usr/share/gosmore +icons.csv usr/share/gosmore +icons.xpm usr/share/gosmore Modified: packages/gosmore/trunk/debian/patches/00list === --- packages/gosmore/trunk/debian/patches/00list2008-07-02 18:31:02 UTC (rev 1691) +++ packages/gosmore/trunk/debian/patches/00list2008-07-04 17:10:21 UTC (rev 1692) @@ -0,0 +1 @@ +10-findresources Added: packages/gosmore/trunk/debian/patches/10-findresources.dpatch === --- packages/gosmore/trunk/debian/patches/10-findresources.dpatch (rev 0) +++ packages/gosmore/trunk/debian/patches/10-findresources.dpatch 2008-07-04 17:10:21 UTC (rev 1692) @@ -0,0 +1,66 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10-findresources.dpatch by Andreas Putzo [EMAIL PROTECTED] +## +## DP: Search for files first in current directory, then in ~/.gosmre/, then +## DP: in $(prefix)/share/gosmore/. +## DP: Backported from upstream svn revision 8642. + [EMAIL PROTECTED]@ +diff -urNad gosmore-0.0.0.20080704~/gosmore.cpp gosmore-0.0.0.20080704/gosmore.cpp +--- gosmore-0.0.0.20080704~/gosmore.cpp2008-07-04 16:41:19.0 + gosmore-0.0.0.20080704/gosmore.cpp 2008-07-04 16:42:16.0 + +@@ -4,7 +4,9 @@ + #define WIN32_LEAN_AND_MEAN + #include stdio.h
[DebianGIS-dev] r1551 - in packages/mkgmap/trunk: . debian debian/scripts
Author: nd-guest Date: 2008-04-20 20:46:19 + (Sun, 20 Apr 2008) New Revision: 1551 Added: packages/mkgmap/trunk/debian/ packages/mkgmap/trunk/debian/ant.properties packages/mkgmap/trunk/debian/changelog packages/mkgmap/trunk/debian/compat packages/mkgmap/trunk/debian/control packages/mkgmap/trunk/debian/copyright packages/mkgmap/trunk/debian/dirs packages/mkgmap/trunk/debian/docs packages/mkgmap/trunk/debian/install packages/mkgmap/trunk/debian/manpages packages/mkgmap/trunk/debian/mkgmap.1 packages/mkgmap/trunk/debian/rules packages/mkgmap/trunk/debian/scripts/ packages/mkgmap/trunk/debian/scripts/mkgmap packages/mkgmap/trunk/debian/watch Log: [svn-inject] Applying Debian modifications to trunk Property changes on: packages/mkgmap/trunk/debian ___ Name: mergeWithUpstream + 1 Added: packages/mkgmap/trunk/debian/ant.properties === --- packages/mkgmap/trunk/debian/ant.properties (rev 0) +++ packages/mkgmap/trunk/debian/ant.properties 2008-04-20 20:46:19 UTC (rev 1551) @@ -0,0 +1,2 @@ +ant.build.javac.source=1.5 +ant.build.javac.target=1.5 Added: packages/mkgmap/trunk/debian/changelog === --- packages/mkgmap/trunk/debian/changelog (rev 0) +++ packages/mkgmap/trunk/debian/changelog 2008-04-20 20:46:19 UTC (rev 1551) @@ -0,0 +1,5 @@ +mkgmap (0.0.0+svn569-1) unstable; urgency=low + + * Initial release (Closes: #475773) + + -- Andreas Putzo [EMAIL PROTECTED] Sun, 13 Apr 2008 19:29:58 + Added: packages/mkgmap/trunk/debian/compat === --- packages/mkgmap/trunk/debian/compat (rev 0) +++ packages/mkgmap/trunk/debian/compat 2008-04-20 20:46:19 UTC (rev 1551) @@ -0,0 +1 @@ +5 Added: packages/mkgmap/trunk/debian/control === --- packages/mkgmap/trunk/debian/control(rev 0) +++ packages/mkgmap/trunk/debian/control2008-04-20 20:46:19 UTC (rev 1551) @@ -0,0 +1,16 @@ +Source: mkgmap +Section: utils +Priority: extra +Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org +Uploaders: Andreas Putzo [EMAIL PROTECTED] +Build-Depends: ant, cdbs, debhelper (= 5), java-gcj-compat-dev +Standards-Version: 3.7.3 +Homepage: http://www.parabola.me.uk/mkgmap + +Package: mkgmap +Architecture: all +Depends: java-gcj-compat | java2-runtime +Suggests: josm, qlandkarte +Description: Generate Garmin maps from OpenStreetMap data + This program converts OpenStreetMap data into a map that + can be loaded onto a Garmin GPS device. Added: packages/mkgmap/trunk/debian/copyright === --- packages/mkgmap/trunk/debian/copyright (rev 0) +++ packages/mkgmap/trunk/debian/copyright 2008-04-20 20:46:19 UTC (rev 1551) @@ -0,0 +1,33 @@ +This package was debianized by Andreas Putzo [EMAIL PROTECTED] on +Sun, 13 Apr 2008 19:29:58 +. + +It was downloaded from http://www.parabola.me.uk/mkgmap/snapshots/ + +Upstream Author: + +Steve Ratcliffe [EMAIL PROTECTED] + +Copyright: + +Copyright (C) 2007, 2008 Steve Ratcliffe [EMAIL PROTECTED] + +License: + +This package is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License version 2 as +published by the Free Software Foundation. + +This package is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this package; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + +The Debian packaging is (C) 2008, Andreas Putzo [EMAIL PROTECTED] and +is licensed under the GPL version 2, see above. Added: packages/mkgmap/trunk/debian/dirs === --- packages/mkgmap/trunk/debian/dirs (rev 0) +++ packages/mkgmap/trunk/debian/dirs 2008-04-20 20:46:19 UTC (rev 1551) @@ -0,0 +1 @@ +usr/bin Added: packages/mkgmap/trunk/debian/docs === --- packages/mkgmap/trunk/debian/docs (rev 0) +++ packages/mkgmap/trunk/debian/docs 2008-04-20 20:46:19 UTC (rev 1551) @@ -0,0 +1,3 @@ +README +doc/Credits +resources
[DebianGIS-dev] r1543 - packages/josm/trunk/debian
Author: nd-guest Date: 2008-04-19 14:36:20 + (Sat, 19 Apr 2008) New Revision: 1543 Modified: packages/josm/trunk/debian/changelog packages/josm/trunk/debian/control Log: Fix dependencies. Add working jvm's to recommends. Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2008-04-19 09:18:06 UTC (rev 1542) +++ packages/josm/trunk/debian/changelog2008-04-19 14:36:20 UTC (rev 1543) @@ -1,12 +1,18 @@ -josm (0.0.0.20080415-1) unstable; urgency=low +josm (0.0.0.20080415-1) UNRELEASED; urgency=low + [ Giovanni Mascellani ] * New upstream version fetched using debian/rules get-orig-source. + Many little bugfixes. + Clarifications on upstream copyright status. * Switched to machine interpretable debian/copyright. - -- Giovanni Mascellani [EMAIL PROTECTED] Tue, 15 Apr 2008 22:23:34 +0200 + [ Andreas Putzo ] + * Replace dependency on java-gcj-compat with gij-4.1 or jamvm that +work with josm. Add those to recommends to increase the chance +that a working java can be found by the wrapper. (Closes: #475878) + -- Andreas Putzo [EMAIL PROTECTED] Sat, 19 Apr 2008 13:59:47 + + josm (0.0.0.20080330-1) unstable; urgency=low [ Giovanni Mascellani ] Modified: packages/josm/trunk/debian/control === --- packages/josm/trunk/debian/control 2008-04-19 09:18:06 UTC (rev 1542) +++ packages/josm/trunk/debian/control 2008-04-19 14:36:20 UTC (rev 1543) @@ -9,7 +9,8 @@ Package: josm Architecture: all -Depends: java-gcj-compat | java2-runtime, libgettext-commons-java, libmetadata-extractor-java, openstreetmap-map-icons-classic +Depends: jamvm | gij-4.1 | java2-runtime, libgettext-commons-java, libmetadata-extractor-java, openstreetmap-map-icons-classic +Recommends: jamvm | gij-4.1 Description: Editor for OpenStreetMap JOSM is an editor for OpenStreetMap (OSM) written in Java. The current version supports stand alone GPX tracks, GPX track data ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1545 - packages/josm/trunk/debian
Author: nd-guest Date: 2008-04-19 14:42:00 + (Sat, 19 Apr 2008) New Revision: 1545 Modified: packages/josm/trunk/debian/README.Debian Log: Reverted to r1444. Information about the upstream tarball is already present in debian/copyright. Modified: packages/josm/trunk/debian/README.Debian === --- packages/josm/trunk/debian/README.Debian2008-04-19 14:36:48 UTC (rev 1544) +++ packages/josm/trunk/debian/README.Debian2008-04-19 14:42:00 UTC (rev 1545) @@ -13,19 +13,3 @@ in /etc/alternatives/ that is usually used on Debian systems. -- Andreas Putzo [EMAIL PROTECTED] Tue, 25 Mar 2008 22:40:12 + - -Upstream tarball - - -Upstream tarball was downloaded using the command: - - svn export http://josm.openstreetmap.de/svn/trunk - -All .jar files have been removed. -All files in the data/ directory have been removed because they contain -(large) test data that is not used by the program. -The directory styles/standard/icons has been removed. It contains icons -that are already provided by the openstreetmap-map-icons-classic package. -All other downloaded files have been packaged as GNU zip'ed tarball -without any further modifications. - ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1524 - packages/josm-plugins/trunk/debian
Author: nd-guest Date: 2008-04-13 10:13:19 + (Sun, 13 Apr 2008) New Revision: 1524 Modified: packages/josm-plugins/trunk/debian/control packages/josm-plugins/trunk/debian/rules Log: Add plugin description to the long description. Removing build-dep on gettext again, because the lang* plugin is currently not included. Modified: packages/josm-plugins/trunk/debian/control === --- packages/josm-plugins/trunk/debian/control 2008-04-12 23:38:42 UTC (rev 1523) +++ packages/josm-plugins/trunk/debian/control 2008-04-13 10:13:19 UTC (rev 1524) @@ -3,7 +3,7 @@ Priority: extra Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Giovanni Mascellani [EMAIL PROTECTED], Andreas Putzo [EMAIL PROTECTED] -Build-Depends: ant, cdbs, dpatch, debhelper (= 5), gettext, java-gcj-compat-dev, josm, libgettext-commons-java +Build-Depends: ant, cdbs, dpatch, debhelper (= 5), java-gcj-compat-dev, josm Standards-Version: 3.7.3 Homepage: http://josm.openstreetmap.de @@ -14,6 +14,16 @@ Description: JOSM plugins JOSM (Java OpenStreetMap) plugin collection. . + This package contains the following plugins: + * colorscheme - Allows to create different color schemes. + * livegps - Supports live GPS input together with gpsd. + * namefinder - Allows input of place names in JOSM download dialog. + * slippymap - Displays a slippy map grid in JOSM. + * utilsplugin - Several helper utilities. + * validator - Data validator. + * wmsplugin - Displays backround images from any WMS source. + * ywms- WMS server for Yahoo imagery. + . JOSM is an editor for OpenStreetMap (OSM) written in Java. The current version supports stand alone GPX tracks, GPX track data from OSM database and existing nodes, line segments and metadata tags Modified: packages/josm-plugins/trunk/debian/rules === --- packages/josm-plugins/trunk/debian/rules2008-04-12 23:38:42 UTC (rev 1523) +++ packages/josm-plugins/trunk/debian/rules2008-04-13 10:13:19 UTC (rev 1524) @@ -14,7 +14,7 @@ DEB_ANT_CLEAN_TARGET := clean SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/ -PLUGINS = validator colorscheme livegps namefinder slippymap utilsplugin wmsplugin ywms +PLUGINS := colorscheme livegps namefinder slippymap utilsplugin validator wmsplugin ywms DATE := $(shell date +%Y%m%d) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1525 - packages/josm-plugins/trunk/debian
Author: nd-guest Date: 2008-04-13 10:20:15 + (Sun, 13 Apr 2008) New Revision: 1525 Added: packages/josm-plugins/trunk/debian/README.Debian Log: Add a readme explaining how josm handles plugins. Added: packages/josm-plugins/trunk/debian/README.Debian === --- packages/josm-plugins/trunk/debian/README.Debian (rev 0) +++ packages/josm-plugins/trunk/debian/README.Debian2008-04-13 10:20:15 UTC (rev 1525) @@ -0,0 +1,13 @@ +Josm-plugins for Debian +--- + +This package contains various plugins that can be used together with JOSM. +Before using these plugins they need to be enabled individually via the +JOSM preferences dialog. + +Please note, that JOSM is able to download these (and other) plugins by itself +that get stored in your ~/.josm/plugins/ directory. +Plugins that resides in your HOME directory take always precedence and will be +used in favour of the plugins included in this package. + + -- Andreas Putzo [EMAIL PROTECTED] So, 13 Apr 2008 12:10:12 + ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1526 - packages/josm-plugins/trunk/debian/patches
Author: nd-guest
Date: 2008-04-13 10:31:15 + (Sun, 13 Apr 2008)
New Revision: 1526
Modified:
packages/josm-plugins/trunk/debian/patches/30_build.dpatch
Log:
Remove plugin version (svn revision) information for the validator and ywms
plugin
because we don't know them at build time.
Modified: packages/josm-plugins/trunk/debian/patches/30_build.dpatch
===
--- packages/josm-plugins/trunk/debian/patches/30_build.dpatch 2008-04-13
10:20:15 UTC (rev 1525)
+++ packages/josm-plugins/trunk/debian/patches/30_build.dpatch 2008-04-13
10:31:15 UTC (rev 1526)
@@ -4,9 +4,9 @@
## DP: Fix mistage in clean targets of the colorscheme and livegps plugin.
@DPATCH@
-diff -urNad josm-plugins-0.0.0.20080412~/colorscheme/build.xml
josm-plugins-0.0.0.20080412/colorscheme/build.xml
josm-plugins-0.0.0.20080412~/colorscheme/build.xml 2008-04-06
19:10:11.0 +
-+++ josm-plugins-0.0.0.20080412/colorscheme/build.xml 2008-04-12
23:35:00.0 +
+diff -urNad josm-plugins-0.0.0.20080413~/colorscheme/build.xml
josm-plugins-0.0.0.20080413/colorscheme/build.xml
+--- josm-plugins-0.0.0.20080413~/colorscheme/build.xml 2008-04-06
19:10:11.0 +
josm-plugins-0.0.0.20080413/colorscheme/build.xml 2008-04-13
10:27:25.0 +
@@ -69,7 +69,7 @@
/target
@@ -16,9 +16,9 @@
delete dir=${plugin.build.dir} /
delete file=${plugin.jar} /
/target
-diff -urNad josm-plugins-0.0.0.20080412~/livegps/build.xml
josm-plugins-0.0.0.20080412/livegps/build.xml
josm-plugins-0.0.0.20080412~/livegps/build.xml 2008-04-06
19:10:11.0 +
-+++ josm-plugins-0.0.0.20080412/livegps/build.xml 2008-04-12
23:35:19.0 +
+diff -urNad josm-plugins-0.0.0.20080413~/livegps/build.xml
josm-plugins-0.0.0.20080413/livegps/build.xml
+--- josm-plugins-0.0.0.20080413~/livegps/build.xml 2008-04-06
19:10:11.0 +
josm-plugins-0.0.0.20080413/livegps/build.xml 2008-04-13
10:27:25.0 +
@@ -79,7 +79,7 @@
target name=clean
@@ -28,3 +28,27 @@
delete file=${plugin.jar} /
/target
+diff -urNad josm-plugins-0.0.0.20080413~/validator/build.xml
josm-plugins-0.0.0.20080413/validator/build.xml
+--- josm-plugins-0.0.0.20080413~/validator/build.xml 2008-04-13
10:27:23.0 +
josm-plugins-0.0.0.20080413/validator/build.xml2008-04-13
10:28:09.0 +
+@@ -33,8 +33,6 @@
+ manifest
+ attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin/
+ attribute name=Plugin-Description value=A OSM data validator/
+- attribute name=Plugin-Version
value=${version.entry.commit.revision}/
+- attribute name=Plugin-Date value=${version.entry.commit.date}/
+ attribute name=Author value=Francisco R. Santos lt;[EMAIL
PROTECTED]/
+ /manifest
+ /jar
+diff -urNad josm-plugins-0.0.0.20080413~/ywms/build.xml
josm-plugins-0.0.0.20080413/ywms/build.xml
+--- josm-plugins-0.0.0.20080413~/ywms/build.xml2008-04-13
10:27:23.0 +
josm-plugins-0.0.0.20080413/ywms/build.xml 2008-04-13 10:28:16.0
+
+@@ -33,8 +33,6 @@
+ manifest
+ attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.ywms.YWMSPlugin/
+ attribute name=Plugin-Description value=A WMS server for Yahoo
imagery based on Firefox/
+- attribute name=Plugin-Version
value=${version.entry.commit.revision}/
+- attribute name=Plugin-Date value=${version.entry.commit.date}/
+ attribute name=Author value=Francisco R. Santos lt;[EMAIL
PROTECTED]/
+ /manifest
+ /jar
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1528 - in packages/josm-plugins/trunk/debian: . patches
Author: nd-guest
Date: 2008-04-13 10:45:11 + (Sun, 13 Apr 2008)
New Revision: 1528
Modified:
packages/josm-plugins/trunk/debian/changelog
packages/josm-plugins/trunk/debian/patches/20_disable_svn.dpatch
packages/josm-plugins/trunk/debian/patches/30_build.dpatch
Log:
Move plugin version changes to the patch where it belongs to.
Modified: packages/josm-plugins/trunk/debian/changelog
===
--- packages/josm-plugins/trunk/debian/changelog2008-04-13 10:37:51 UTC
(rev 1527)
+++ packages/josm-plugins/trunk/debian/changelog2008-04-13 10:45:11 UTC
(rev 1528)
@@ -1,5 +1,5 @@
-josm-plugins (0.0.0.20080412-1) unstable; urgency=low
+josm-plugins (0.0.0.20080413-1) unstable; urgency=low
* Initial release (Closes: #471846)
- -- Andreas Putzo [EMAIL PROTECTED] Sat, 12 Apr 2008 22:15:24 +
+ -- Andreas Putzo [EMAIL PROTECTED] Sun, 13 Apr 2008 10:02:59 +
Modified: packages/josm-plugins/trunk/debian/patches/20_disable_svn.dpatch
===
--- packages/josm-plugins/trunk/debian/patches/20_disable_svn.dpatch
2008-04-13 10:37:51 UTC (rev 1527)
+++ packages/josm-plugins/trunk/debian/patches/20_disable_svn.dpatch
2008-04-13 10:45:11 UTC (rev 1528)
@@ -5,10 +5,10 @@
## DP: This patch disables this behaviour.
@DPATCH@
-diff -urNad josm-plugins-0.0.0.20080412~/validator/build.xml
josm-plugins-0.0.0.20080412/validator/build.xml
josm-plugins-0.0.0.20080412~/validator/build.xml 2008-04-06
19:10:11.0 +
-+++ josm-plugins-0.0.0.20080412/validator/build.xml2008-04-12
22:22:06.0 +
-@@ -29,14 +29,6 @@
+diff -urNad josm-plugins-0.0.0.20080413~/validator/build.xml
josm-plugins-0.0.0.20080413/validator/build.xml
+--- josm-plugins-0.0.0.20080413~/validator/build.xml 2008-04-06
19:10:11.0 +
josm-plugins-0.0.0.20080413/validator/build.xml2008-04-13
10:42:15.0 +
+@@ -29,20 +29,10 @@
copy todir=build/images
fileset dir=images/
/copy
@@ -23,10 +23,16 @@
jar destfile=${plugin.jar} basedir=build
manifest
attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin/
-diff -urNad josm-plugins-0.0.0.20080412~/ywms/build.xml
josm-plugins-0.0.0.20080412/ywms/build.xml
josm-plugins-0.0.0.20080412~/ywms/build.xml2008-04-06
19:10:11.0 +
-+++ josm-plugins-0.0.0.20080412/ywms/build.xml 2008-04-12 22:22:23.0
+
-@@ -29,14 +29,6 @@
+ attribute name=Plugin-Description value=A OSM data validator/
+- attribute name=Plugin-Version
value=${version.entry.commit.revision}/
+- attribute name=Plugin-Date value=${version.entry.commit.date}/
+ attribute name=Author value=Francisco R. Santos lt;[EMAIL
PROTECTED]/
+ /manifest
+ /jar
+diff -urNad josm-plugins-0.0.0.20080413~/ywms/build.xml
josm-plugins-0.0.0.20080413/ywms/build.xml
+--- josm-plugins-0.0.0.20080413~/ywms/build.xml2008-04-06
19:10:11.0 +
josm-plugins-0.0.0.20080413/ywms/build.xml 2008-04-13 10:42:23.0
+
+@@ -29,20 +29,10 @@
copy todir=${plugin.build.dir}/images
fileset dir=images/
/copy
@@ -41,3 +47,9 @@
jar destfile=${plugin.jar} basedir=${plugin.build.dir}
manifest
attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.ywms.YWMSPlugin/
+ attribute name=Plugin-Description value=A WMS server for Yahoo
imagery based on Firefox/
+- attribute name=Plugin-Version
value=${version.entry.commit.revision}/
+- attribute name=Plugin-Date value=${version.entry.commit.date}/
+ attribute name=Author value=Francisco R. Santos lt;[EMAIL
PROTECTED]/
+ /manifest
+ /jar
Modified: packages/josm-plugins/trunk/debian/patches/30_build.dpatch
===
--- packages/josm-plugins/trunk/debian/patches/30_build.dpatch 2008-04-13
10:37:51 UTC (rev 1527)
+++ packages/josm-plugins/trunk/debian/patches/30_build.dpatch 2008-04-13
10:45:11 UTC (rev 1528)
@@ -27,28 +27,3 @@
+delete file=${plugin.site.file} /
delete file=${plugin.jar} /
/target
-
-diff -urNad josm-plugins-0.0.0.20080413~/validator/build.xml
josm-plugins-0.0.0.20080413/validator/build.xml
josm-plugins-0.0.0.20080413~/validator/build.xml 2008-04-13
10:27:23.0 +
-+++ josm-plugins-0.0.0.20080413/validator/build.xml2008-04-13
10:28:09.0 +
-@@ -33,8 +33,6 @@
- manifest
- attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin/
- attribute name=Plugin-Description value=A OSM data validator/
-- attribute name=Plugin-Version
value=${version.entry.commit.revision}/
-- attribute name=Plugin-Date value=${version.entry.commit.date}/
- attribute name=Author value=Francisco R
[DebianGIS-dev] r1527 - packages/josm-plugins/trunk/debian
Author: nd-guest Date: 2008-04-13 10:37:51 + (Sun, 13 Apr 2008) New Revision: 1527 Modified: packages/josm-plugins/trunk/debian/control Log: fix typo, update short description Modified: packages/josm-plugins/trunk/debian/control === --- packages/josm-plugins/trunk/debian/control 2008-04-13 10:31:15 UTC (rev 1526) +++ packages/josm-plugins/trunk/debian/control 2008-04-13 10:37:51 UTC (rev 1527) @@ -11,7 +11,7 @@ Architecture: all Depends: josm Suggests: gpsd, iceweasel -Description: JOSM plugins +Description: Plugins for JOSM JOSM (Java OpenStreetMap) plugin collection. . This package contains the following plugins: @@ -21,7 +21,7 @@ * slippymap - Displays a slippy map grid in JOSM. * utilsplugin - Several helper utilities. * validator - Data validator. - * wmsplugin - Displays backround images from any WMS source. + * wmsplugin - Displays background images from any WMS source. * ywms- WMS server for Yahoo imagery. . JOSM is an editor for OpenStreetMap (OSM) written in Java. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1529 - packages/josm-plugins/trunk/debian/patches
Author: nd-guest Date: 2008-04-13 12:05:31 + (Sun, 13 Apr 2008) New Revision: 1529 Modified: packages/josm-plugins/trunk/debian/patches/30_build.dpatch Log: fix typo Modified: packages/josm-plugins/trunk/debian/patches/30_build.dpatch === --- packages/josm-plugins/trunk/debian/patches/30_build.dpatch 2008-04-13 10:45:11 UTC (rev 1528) +++ packages/josm-plugins/trunk/debian/patches/30_build.dpatch 2008-04-13 12:05:31 UTC (rev 1529) @@ -1,7 +1,7 @@ #! /bin/sh /usr/share/dpatch/dpatch-run ## 30_build.dpatch by Andreas Putzo [EMAIL PROTECTED] ## -## DP: Fix mistage in clean targets of the colorscheme and livegps plugin. +## DP: Fix mistake in clean targets of the colorscheme and livegps plugin. @DPATCH@ diff -urNad josm-plugins-0.0.0.20080413~/colorscheme/build.xml josm-plugins-0.0.0.20080413/colorscheme/build.xml ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
