Author: jamespage-guest
Date: 2012-05-23 10:55:20 +0000 (Wed, 23 May 2012)
New Revision: 16060
Removed:
trunk/libcommons-codec-java/debian/patches/javac_encoding.diff
Modified:
trunk/libcommons-codec-java/debian/changelog
trunk/libcommons-codec-java/debian/control
trunk/libcommons-codec-java/debian/copyright
trunk/libcommons-codec-java/debian/patches/manifest.diff
trunk/libcommons-codec-java/debian/patches/series
trunk/libcommons-codec-java/debian/rules
Log:
* New upstream release:
- d/patches/javac_encoding.diff: Dropped - accepted upstream.
- d/control,rules: Switch to using junit4 inline with upstream.
- Refreshed remaining patch.
* d/control: Bumped Standards-Version to 3.9.3:
- d/copyright: Tidied lintian warnings and referenced released version
of DEP-5.
* Added myself to uploaders.
Modified: trunk/libcommons-codec-java/debian/changelog
===================================================================
--- trunk/libcommons-codec-java/debian/changelog 2012-05-20 10:39:27 UTC
(rev 16059)
+++ trunk/libcommons-codec-java/debian/changelog 2012-05-23 10:55:20 UTC
(rev 16060)
@@ -1,3 +1,16 @@
+libcommons-codec-java (1.6-1) unstable; urgency=low
+
+ * New upstream release:
+ - d/patches/javac_encoding.diff: Dropped - accepted upstream.
+ - d/control,rules: Switch to using junit4 inline with upstream.
+ - Refreshed remaining patch.
+ * d/control: Bumped Standards-Version to 3.9.3:
+ - d/copyright: Tidied lintian warnings and referenced released version
+ of DEP-5.
+ * Added myself to uploaders.
+
+ -- James Page <[email protected]> Wed, 23 May 2012 11:29:46 +0100
+
libcommons-codec-java (1.5-1) unstable; urgency=low
* New upstream release.
Modified: trunk/libcommons-codec-java/debian/control
===================================================================
--- trunk/libcommons-codec-java/debian/control 2012-05-20 10:39:27 UTC (rev
16059)
+++ trunk/libcommons-codec-java/debian/control 2012-05-23 10:55:20 UTC (rev
16060)
@@ -2,10 +2,11 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
-Uploaders: Wolfgang Baer <[email protected]>, Damien Raude-Morvan
<[email protected]>, Torsten Werner <[email protected]>
+Uploaders: Wolfgang Baer <[email protected]>, Damien Raude-Morvan
<[email protected]>,
+ Torsten Werner <[email protected]>, James Page <[email protected]>
Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk
-Build-Depends-Indep: maven-repo-helper, ant-optional, junit
-Standards-Version: 3.9.2
+Build-Depends-Indep: maven-repo-helper, ant-optional, junit4
+Standards-Version: 3.9.3
Homepage: http://commons.apache.org/codec/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-codec-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-codec-java
Modified: trunk/libcommons-codec-java/debian/copyright
===================================================================
--- trunk/libcommons-codec-java/debian/copyright 2012-05-20 10:39:27 UTC
(rev 16059)
+++ trunk/libcommons-codec-java/debian/copyright 2012-05-23 10:55:20 UTC
(rev 16060)
@@ -1,10 +1,10 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
Upstream-Name: Commons Codec
Upstream-Contact: Apache Commons <http://commons.apache.org/codec/>
Source: http://www.apache.org/dist/commons/codec/
Files: *
-Copyright: Copyright 2002-2011 The Apache Software Foundation
+Copyright: 2002-2011 The Apache Software Foundation
License: Apache-2.0
On Debian systems the full text of the Apache License can be found
in `/usr/share/common-licenses/Apache-2.0'.
@@ -28,8 +28,8 @@
Matthew Inger <[email protected]>
Files: src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
-Copyright: Copyright 2002-2011 The Apache Software Foundation
-Copyright: Copyright (C) 2002 Kevin Atkinson ([email protected])
+Copyright: 2002-2011 The Apache Software Foundation,
+ 2002 Kevin Atkinson ([email protected])
License: Apache-2.0
On Debian systems the full text of the Apache License can be found
in `/usr/share/common-licenses/Apache-2.0'.
@@ -41,8 +41,8 @@
provided this notice is preserved.
Files: debian/*
-Copyright: Copyright 2004 Arnaud Vandyck <[email protected]>
-Copyright: Copyright 2010-2011 Damien Raude-Morvan <[email protected]>
+Copyright: 2004 Arnaud Vandyck <[email protected]>,
+ 2010-2011 Damien Raude-Morvan <[email protected]>
License: Apache-2.0
On Debian systems the full text of the Apache License can be found
in `/usr/share/common-licenses/Apache-2.0'.
Deleted: trunk/libcommons-codec-java/debian/patches/javac_encoding.diff
===================================================================
--- trunk/libcommons-codec-java/debian/patches/javac_encoding.diff
2012-05-20 10:39:27 UTC (rev 16059)
+++ trunk/libcommons-codec-java/debian/patches/javac_encoding.diff
2012-05-23 10:55:20 UTC (rev 16060)
@@ -1,26 +0,0 @@
-Description: build.xml: Allow to set encoding of javac ant task.
-Author: Damien Raude-Morvan <[email protected]>
-Last-Update: 2011-04-15
-Forwarded: no
---- a/build.xml
-+++ b/build.xml
-@@ -53,7 +53,8 @@
- <target name="compile" depends="static" description="Compile shareable
components">
- <javac srcdir="${source.home}" destdir="${build.home}/classes"
- source="${compile.source}" target="${compile.target}"
-- debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}">
-+ debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
-+ encoding="${compile.encoding}">
- <classpath refid="compile.classpath"/>
- </javac>
- <copy todir="${build.home}/classes" filtering="on">
-@@ -187,7 +188,8 @@
- <target name="compile.tests" depends="compile" description="Compile unit
test cases">
- <javac srcdir="${test.home}" destdir="${build.home}/tests"
- source="${compile.source}" target="${compile.target}"
-- debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}">
-+ debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
-+ encoding="${compile.encoding}">
- <classpath refid="test.classpath"/>
- </javac>
- <copy todir="${build.home}/tests" filtering="on">
Modified: trunk/libcommons-codec-java/debian/patches/manifest.diff
===================================================================
--- trunk/libcommons-codec-java/debian/patches/manifest.diff 2012-05-20
10:39:27 UTC (rev 16059)
+++ trunk/libcommons-codec-java/debian/patches/manifest.diff 2012-05-23
10:55:20 UTC (rev 16060)
@@ -3,9 +3,11 @@
Author: Damien Raude-Morvan <[email protected]>
Last-Update: 2009-11-28
Forwarded: not-needed
---- a/build.xml
-+++ b/build.xml
-@@ -103,7 +103,8 @@
+Index: libcommons-codec-java/build.xml
+===================================================================
+--- libcommons-codec-java.orig/build.xml 2011-12-02 21:56:52.000000000
+0000
++++ libcommons-codec-java/build.xml 2012-05-23 11:47:05.990089606 +0100
+@@ -106,7 +106,8 @@
<mkdir dir="${build.home}/classes/META-INF"/>
<copy file="${basedir}/LICENSE.txt"
tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
<copy file="${basedir}/LICENSE.txt"
tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
Modified: trunk/libcommons-codec-java/debian/patches/series
===================================================================
--- trunk/libcommons-codec-java/debian/patches/series 2012-05-20 10:39:27 UTC
(rev 16059)
+++ trunk/libcommons-codec-java/debian/patches/series 2012-05-23 10:55:20 UTC
(rev 16060)
@@ -1,2 +1 @@
manifest.diff
-javac_encoding.diff
Modified: trunk/libcommons-codec-java/debian/rules
===================================================================
--- trunk/libcommons-codec-java/debian/rules 2012-05-20 10:39:27 UTC (rev
16059)
+++ trunk/libcommons-codec-java/debian/rules 2012-05-23 10:55:20 UTC (rev
16060)
@@ -7,7 +7,7 @@
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ant-nodeps junit ant-junit
+DEB_JARS := ant-nodeps junit4 ant-junit4 ant-junit
DEB_ANT_BUILD_TARGET := dist
DEB_ANT_CHECK_TARGET := test
DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
