The following commit has been merged in the master branch:
commit 528e3a767dbcf60b485c1896df44c14159c85fb5
Author: David Paleino <da...@debian.org>
Date:   Thu Apr 1 00:27:57 2010 +0200

    debian/control: rewrapped for easier diff'ing

diff --git a/debian/changelog b/debian/changelog
index a7ca469..e5b7f7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ osmosis (0.34+ds1-1) UNRELEASED; urgency=low
       libcommons-codec-java
     - added pkg-osm to Uploaders
     - Standards-Version bumped to 3.8.4, no changes needed
+    - rewrapped for easier diff'ing
   * debian/rules:
     - updated get-orig-source target to strip unwanted *.jar files
   * debian/copyright updated
@@ -23,7 +24,7 @@ osmosis (0.34+ds1-1) UNRELEASED; urgency=low
   * debian/*: updated my email address
   * debian/watch: updated to new upstream distribution location
 
- -- David Paleino <da...@debian.org>  Thu, 01 Apr 2010 00:25:35 +0200
+ -- David Paleino <da...@debian.org>  Thu, 01 Apr 2010 00:27:18 +0200
 
 osmosis (0.31.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index bd77e6f..c116dbf 100644
--- a/debian/control
+++ b/debian/control
@@ -2,26 +2,28 @@ Source: osmosis
 Section: utils
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
-Uploaders: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>,
- David Paleino <da...@debian.org>,
- Francesco Paolo Lovergine <fran...@debian.org>
+Uploaders:
+ Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
+ , David Paleino <da...@debian.org>
+ , Francesco Paolo Lovergine <fran...@debian.org>
  , Debian OpenStreetMap Team <pkg-osm-ma...@lists.alioth.debian.org>
-Build-Depends: ant,
- ant-optional,
- cdbs,
- debhelper (>= 7),
- libcommons-codec-java,
- libcommons-compress-java,
- libcommons-dbcp-java,
- libjpf-java,
- libmysql-java,
- libpostgis-java,
- libpg-java,
- libspring-beans-2.5-java,
- libspring-jdbc-2.5-java,
- libspring-tx-2.5-java,
- libwoodstox-java,
- openjdk-6-jdk
+Build-Depends:
+ ant
+ , ant-optional
+ , cdbs
+ , debhelper (>= 7)
+ , libcommons-codec-java
+ , libcommons-compress-java
+ , libcommons-dbcp-java
+ , libjpf-java
+ , libmysql-java
+ , libpostgis-java
+ , libpg-java
+ , libspring-beans-2.5-java
+ , libspring-jdbc-2.5-java
+ , libspring-tx-2.5-java
+ , libwoodstox-java
+ , openjdk-6-jdk
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/pkg-grass/osmosis.git
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/osmosis.git
@@ -29,18 +31,19 @@ Homepage: http://wiki.openstreetmap.org/wiki/Osmosis
 
 Package: osmosis
 Architecture: all
-Depends: ant,
- java6-runtime,
- libcommons-dbcp-java,
- libjpf-java,
- libmysql-java,
- libpostgis-java,
- libpg-java,
- libspring-beans-2.5-java,
- libspring-jdbc-2.5-java,
- libspring-tx-2.5-java,
- libwoodstox-java,
- ${misc:Depends}
+Depends:
+ ant
+ , java6-runtime
+ , libcommons-dbcp-java
+ , libjpf-java
+ , libmysql-java
+ , libpostgis-java
+ , libpg-java
+ , libspring-beans-2.5-java
+ , libspring-jdbc-2.5-java
+ , libspring-tx-2.5-java
+ , libwoodstox-java
+ , ${misc:Depends}
 Description: Command line OpenStreetMap data processor
  Osmosis consists of a series of components that can be chained together
  in order to perform operations on an OpenStreetMap database or

-- 
Osmosis, an OSM data processor

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

Reply via email to