The following commit has been merged in the master branch:
commit 7aea28e3cccf5a1b6929151054f79120caa4734d
Author: David Paleino <da...@debian.org>
Date:   Sat Apr 14 19:11:28 2012 +0200

    Updated debian/copyright

diff --git a/debian/changelog b/debian/changelog
index 04a879d..21800b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ osmosis (0.40.1+ds1-5) UNRELEASED; urgency=low
 
   * Bump dependency on libcommons-compress-java (Closes: #664597)
   * Bump dependency on checkstyle (Closes: #664602)
+  * Updated debian/copyright
 
- -- David Paleino <da...@debian.org>  Mon, 19 Mar 2012 14:37:38 +0100
+ -- David Paleino <da...@debian.org>  Sat, 14 Apr 2012 19:11:21 +0200
 
 osmosis (0.40.1+ds1-4) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 9f87626..bedbced 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,23 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: osmosis
-Upstream-Source: http://www.bretth.com/osmosis/
-
-Files: src/*
- test/*
-Copyright: © 2007-2008, Bretth Henderson <br...@bretth.com> and other 
contributors
-License: PD
- Osmosis is placed into the public domain and where this is not legally
- possible everybody is granted a perpetual, irrevocable license to use
- this work for any purpose whatsoever.
- .
- DISCLAIMERS
- By making Osmosis publicly available, it is hoped that users will find the
- software useful.  However:
- * Osmosis comes without any warranty, to the extent permitted by applicable
- law.
- * Unless required by applicable law, no liability will be accepted by
- the authors and distributors of this software for any damages caused
- as a result of its use.
+Source: http://www.bretth.com/osmosis/
 
 Files: debian/*
 Copyright: © 2008-2009, Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
@@ -37,3 +20,19 @@ License: GPL-3+
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 X-Comment: on Debian systems, the complete text of the GNU General Public
  License version 3 can be found in /usr/share/common-licenses/GPL-3.
+
+Files: *
+Copyright: © 2007-2008, Bretth Henderson <br...@bretth.com> and other 
contributors
+License: PD
+ Osmosis is placed into the public domain and where this is not legally
+ possible everybody is granted a perpetual, irrevocable license to use
+ this work for any purpose whatsoever.
+ .
+ DISCLAIMERS
+ By making Osmosis publicly available, it is hoped that users will find the
+ software useful.  However:
+ * Osmosis comes without any warranty, to the extent permitted by applicable
+ law.
+ * Unless required by applicable law, no liability will be accepted by
+ the authors and distributors of this software for any damages caused
+ as a result of its use.

-- 
Osmosis, an OSM data processor

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

Reply via email to