[Pkg-osm-commits] [SCM] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino
The following commit has been merged in the debian branch:
commit 021b621d7a60475290fa2755e8b06d03d10ee445
Author: David Paleino da...@debian.org
Date:   Mon Jan 28 19:57:47 2013 +0100

Bump debhelper compatibility to 9.

diff --git a/debian/changelog b/debian/changelog
index a736395..9445989 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ osmpbf (1.3.0-1) UNRELEASED; urgency=low
 
   [ David Paleino ]
   * New upstream version.
+  * Bump debhelper compatibility to 9.
 
- -- David Paleino da...@debian.org  Mon, 28 Jan 2013 19:57:06 +0100
+ -- David Paleino da...@debian.org  Mon, 28 Jan 2013 19:57:37 +0100
 
 osmpbf (1.2.1-3) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 6c4a9dc..aa3a30c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org
 Uploaders:
  David Paleino da...@debian.org
-Build-Depends: debhelper (= 7.0.50~), protobuf-compiler, libprotobuf-java, 
ant,
+Build-Depends: debhelper (= 9~), protobuf-compiler, libprotobuf-java, ant,
  default-jdk
  , libprotobuf-dev
  , maven-repo-helper

-- 
Java library to access OpenStreetMap PDF file format

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


[Pkg-osm-commits] [SCM] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino
The following commit has been merged in the debian branch:
commit 35a98fcfd66f356d47444d27856521558a18bfd1
Author: David Paleino da...@debian.org
Date:   Mon Jan 28 19:58:21 2013 +0100

Re-wrap field

diff --git a/debian/control b/debian/control
index aa3a30c..ebc83d7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,12 @@ Priority: extra
 Maintainer: Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org
 Uploaders:
  David Paleino da...@debian.org
-Build-Depends: debhelper (= 9~), protobuf-compiler, libprotobuf-java, ant,
- default-jdk
+Build-Depends:
+ debhelper (= 9~)
+ , protobuf-compiler
+ , libprotobuf-java
+ , ant
+ , default-jdk
  , libprotobuf-dev
  , maven-repo-helper
 Standards-Version: 3.9.3

-- 
Java library to access OpenStreetMap PDF file format

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


[Pkg-osm-commits] [SCM] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino
The following commit has been merged in the debian branch:
commit e5310f0bb1f031b4f66fd234d181b5a647afbef3
Merge: 8ff7da3c3566297c5da542881cbc907312fdc708 
2e955a6cb8a10f3e38cc8dd78a4a57dc030b33da
Author: David Paleino da...@debian.org
Date:   Mon Jan 28 19:56:36 2013 +0100

Merge tag 'upstream/1.3.0' into debian

Upstream version 1.3.0

# gpg: Signature made lun 28 gen 2013 19:56:35 CET using DSA key ID 1392B174
# gpg: Good signature from David Paleino d.pale...@gmail.com
# gpg: aka [jpeg image of size 6708]
# gpg: aka Hanska aks...@gmail.com
# gpg: aka David Paleino david.pale...@poste.it
# gpg: aka David Paleino da...@debian.org


-- 
Java library to access OpenStreetMap PDF file format

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


[Pkg-osm-commits] [SCM] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino
The following commit has been merged in the debian branch:
commit 752da20f98a6e7d6abc7c2de85c08b7cfe274822
Author: David Paleino da...@debian.org
Date:   Mon Jan 28 19:57:19 2013 +0100

New upstream version.

diff --git a/debian/changelog b/debian/changelog
index a444f4b..a736395 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-osmpbf (1.2.1-4) UNRELEASED; urgency=low
+osmpbf (1.3.0-1) UNRELEASED; urgency=low
 
+  [ Giovanni Mascellani ]
   * Remove myself from the uploaders list, since I have no time
 anymore to look after this package.
 
- -- Giovanni Mascellani g...@debian.org  Tue, 28 Aug 2012 00:04:28 +0200
+  [ David Paleino ]
+  * New upstream version.
+
+ -- David Paleino da...@debian.org  Mon, 28 Jan 2013 19:57:06 +0100
 
 osmpbf (1.2.1-3) unstable; urgency=low
 

-- 
Java library to access OpenStreetMap PDF file format

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


[Pkg-osm-commits] [SCM] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino
The following commit has been merged in the debian branch:
commit 315ff8abc6c391da0b75a8f7bb55c836d1cf8108
Author: David Paleino da...@debian.org
Date:   Mon Jan 28 19:59:52 2013 +0100

Use canonical Vcs-* urls in debian/control.

diff --git a/debian/changelog b/debian/changelog
index 1a67883..7d5ad89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ osmpbf (1.3.0-1) UNRELEASED; urgency=low
   * New upstream version.
   * Bump debhelper compatibility to 9.
   * Standards-Version bump to 3.9.4, no changes needed.
+  * Use canonical Vcs-* urls in debian/control.
 
- -- David Paleino da...@debian.org  Mon, 28 Jan 2013 19:58:34 +0100
+ -- David Paleino da...@debian.org  Mon, 28 Jan 2013 19:59:42 +0100
 
 osmpbf (1.2.1-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index aa1de13..bfabbff 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ Build-Depends:
  , maven-repo-helper
 Standards-Version: 3.9.4
 Homepage: http://github.com/scrosby/OSM-binary
-Vcs-Git: git://git.debian.org/pkg-osm/osmpbf.git
-Vcs-Browser: http://git.debian.org/?p=pkg-osm/osmpbf.git;a=summary
+Vcs-Git: git://anonscm.debian.org/pkg-osm/osmpbf.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-osm/osmpbf.git;a=summary
 
 Package: libosmpbf-java
 Architecture: all

-- 
Java library to access OpenStreetMap PDF file format

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


[Pkg-osm-commits] [SCM] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino
The following commit has been merged in the debian branch:
commit 16981811547d4fbb77a78faee6f55de9d2644d15
Author: David Paleino da...@debian.org
Date:   Mon Jan 28 20:05:55 2013 +0100

Renamed patch, and added DEP-3 header

diff --git a/debian/patches/build_flags 
b/debian/patches/00-fix_build_flags.patch
similarity index 53%
rename from debian/patches/build_flags
rename to debian/patches/00-fix_build_flags.patch
index 41809c2..f1dcaca 100644
--- a/debian/patches/build_flags
+++ b/debian/patches/00-fix_build_flags.patch
@@ -1,7 +1,15 @@
-Index: osmpbf/tools/Makefile
-===
 osmpbf.orig/tools/Makefile 2012-06-15 10:35:26.0 +0200
-+++ osmpbf/tools/Makefile  2012-06-15 10:35:43.0 +0200
+From: Giovanni Mascellani g...@debian.org
+Subject: fix Makefile so Debian build flags are honoured.
+Origin: vendor
+Forwarded: not-needed
+
+---
+ src/Makefile   |2 +-
+ tools/Makefile |4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- osmpbf.orig/tools/Makefile
 osmpbf/tools/Makefile
 @@ -1,7 +1,7 @@
  
  CXX = g++
@@ -12,10 +20,8 @@ Index: osmpbf/tools/Makefile
  
  all: osmpbf-outline
  
-Index: osmpbf/src/Makefile
-===
 osmpbf.orig/src/Makefile   2012-06-15 10:36:30.0 +0200
-+++ osmpbf/src/Makefile2012-06-15 10:36:43.0 +0200
+--- osmpbf.orig/src/Makefile
 osmpbf/src/Makefile
 @@ -1,6 +1,6 @@
  
  CXX = g++
diff --git a/debian/patches/series b/debian/patches/series
index 64c4d9f..ef3eaa6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-build_flags
+00-fix_build_flags.patch

-- 
Java library to access OpenStreetMap PDF file format

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


[Pkg-osm-commits] [SCM] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino
The following commit has been merged in the debian branch:
commit c4c3fd000b44cd8a109fdf7dffd57925ec387d5a
Author: David Paleino da...@debian.org
Date:   Mon Jan 28 20:32:56 2013 +0100

Releasing to sid

diff --git a/debian/changelog b/debian/changelog
index 421d63a..43f61b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-osmpbf (1.3.0-1) UNRELEASED; urgency=low
+osmpbf (1.3.0-1) unstable; urgency=low
 
   [ Giovanni Mascellani ]
   * Remove myself from the uploaders list, since I have no time
@@ -13,7 +13,7 @@ osmpbf (1.3.0-1) UNRELEASED; urgency=low
   * Install ReleaseNotes.txt as upstream changelog.
   * Correctly clean up after builds.
 
- -- David Paleino da...@debian.org  Mon, 28 Jan 2013 20:32:24 +0100
+ -- David Paleino da...@debian.org  Mon, 28 Jan 2013 20:32:44 +0100
 
 osmpbf (1.2.1-3) unstable; urgency=low
 

-- 
Java library to access OpenStreetMap PDF file format

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


[Pkg-osm-commits] [SCM] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino
The following commit has been merged in the debian branch:
commit 12829ec2e0bfa8e02dde8188b3efc51f0ff0aff1
Author: David Paleino da...@debian.org
Date:   Mon Jan 28 20:23:54 2013 +0100

Use override_dh_install instead of binary target

diff --git a/debian/rules b/debian/rules
index e5e2925..4e68f1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,7 @@ override_dh_auto_install:
 override_dh_installchangelogs:
dh_installchangelogs -- ReleaseNotes.txt
 
-binary:
-   dh binary --until dh_install
+override_dh_install:
+   dh_install
mh_installjar -plibosmpbf-java -l pom.xml osmpbf.jar
mh_installpom -plibosmpbf-java pom.xml
-   dh binary --remaining

-- 
Java library to access OpenStreetMap PDF file format

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


[Pkg-osm-commits] [SCM] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino
The following commit has been merged in the debian branch:
commit 3ec6edac32ad797563ae95a305f55e89af540be5
Author: David Paleino da...@debian.org
Date:   Mon Jan 28 20:03:32 2013 +0100

Updated debian/copyright.

diff --git a/debian/changelog b/debian/changelog
index 7d5ad89..9cf3746 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,9 @@ osmpbf (1.3.0-1) UNRELEASED; urgency=low
   * Bump debhelper compatibility to 9.
   * Standards-Version bump to 3.9.4, no changes needed.
   * Use canonical Vcs-* urls in debian/control.
+  * Updated debian/copyright.
 
- -- David Paleino da...@debian.org  Mon, 28 Jan 2013 19:59:42 +0100
+ -- David Paleino da...@debian.org  Mon, 28 Jan 2013 20:03:25 +0100
 
 osmpbf (1.2.1-3) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 6420525..3ee781d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,42 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: http://github.com/scrosby/OSM-binary
 Upstream-Contact: Scott A. Crosby sc...@sacrosby.com
 
 Files: *
 Copyright: © 2010, Scott A. Crosby sc...@sacrosby.com
 License: LGPL-3+
- On Debian systems, the complete text of the GNU Lesser General Public License,
- version 3, can be found in `/usr/share/common-licenses/LGPL-3'.
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 3 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 Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see http://www.gnu.org/licenses/
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 3 can be found in /usr/share/common-licenses/LGPL-3.
 
 Files: debian/*
 Copyright: © 2010-2012, Giovanni Mascellani g...@debian.org
+ © 2011-2013, David Paleino da...@debian.org
 License: GPL-3+
- On Debian systems, the complete text of the GNU General Public License,
- version 3, can be found in `/usr/share/common-licenses/GPL-3'.
+ 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 3 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 program. If not, see http://www.gnu.org/licenses/
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 3 can be found in /usr/share/common-licenses/GPL-3.

-- 
Java library to access OpenStreetMap PDF file format

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