Merge lp:~ari-tczew/ubuntu/maverick/commons-io/lp-604795 into lp:ubuntu/maverick/commons-io

[Artur Rona]

[lp:~ari-tczew/ubuntu/maverick/commons-io/lp-604795]

10. By Artur Rona on 2010-07-13

Merge from Debian unstable, remaining changes: (LP: #604802)

[Stefano Rivera (stefanor)]

Looks like this can be synced. See bug.

review: Disapprove

Unmerged revisions

10. By Artur Rona on 2010-07-13

Merge from Debian unstable, remaining changes: (LP: #604802)

9. By Artur Rona on 2010-07-13

* Merge from Debian unstable, remaining changes: (LP: #604795)
  - debian/control: Set libcommons-io-java runtime dependency on
    "default-jre-headless | java2-runtime-headless"

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-19 13:33:40 +0000
+++ debian/changelog	2010-07-13 20:37:40 +0000
@@ -1,3 +1,20 @@
+commons-io (1.4-3ubuntu1) maverick; urgency=low
+
+  * Merge from Debian unstable, remaining changes: (LP: #604802)
+    - debian/control: Set libcommons-io-java runtime dependency on
+      "default-jre-headless | java2-runtime-headless" 
+
+ -- Artur Rona <[e-mail]>  Mon, 12 Jul 2010 23:09:59 +0200
+
+commons-io (1.4-3) unstable; urgency=low
+
+  * Team upload
+  * Remove Arnaud and Trygve from uploaders list.
+  * Switch to source format 3.0.
+  * Update Standards-Version: 3.8.4.
+
+ -- Torsten Werner <[e-mail]>  Mon, 03 May 2010 19:43:18 +0200
+
 commons-io (1.4-2ubuntu1) karmic; urgency=low
 
   * Merge with Debian; remaining changes:

=== modified file 'debian/control'
--- debian/control	2009-10-19 13:33:40 +0000
+++ debian/control	2010-07-13 20:37:40 +0000
@@ -1,11 +1,12 @@
 Source: commons-io
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
-Uploaders: Trygve Laugstøl <[e-mail]>, Arnaud Vandyck <[e-mail]>, Varun Hiremath <[e-mail]>, Kumar Appaiah <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
+Uploaders: Varun Hiremath <[e-mail]>, Kumar Appaiah <[e-mail]>
 Build-Depends: debhelper (>= 6), cdbs, default-jdk
 Build-Depends-Indep: maven-repo-helper, ant, junit
-Standards-Version: 3.8.1
+Standards-Version: 3.8.4
 Homepage: http://commons.apache.org/io/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-io
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-io

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2010-07-13 20:37:40 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)