[pkg-java] r13534 - in trunk/libcommons-codec-java/debian: . patches

Damien Raude-Morvan drazzib at alioth.debian.org
Fri Apr 15 18:35:57 UTC 2011


Author: drazzib
Date: 2011-04-15 18:35:54 +0000 (Fri, 15 Apr 2011)
New Revision: 13534

Added:
   trunk/libcommons-codec-java/debian/ant.properties
   trunk/libcommons-codec-java/debian/patches/javac_encoding.diff
Modified:
   trunk/libcommons-codec-java/debian/changelog
   trunk/libcommons-codec-java/debian/copyright
   trunk/libcommons-codec-java/debian/patches/series
   trunk/libcommons-codec-java/debian/rules
Log:
* Remove Arnaud Vandyck from Uploaders. Thanks!
* Fix debian/MANIFEST.MF: don't Import-Package on itself.
* d/control: Bump Standards-Version to 3.9.2 (no changes needed).
* d/rules: Use mh_clean in clean target.
* d/patches/javac_encoding.diff: New patch to force javac encoding to UTF-8.
* d/copyright: Update and format using DEP-5.

Added: trunk/libcommons-codec-java/debian/ant.properties
===================================================================
--- trunk/libcommons-codec-java/debian/ant.properties	                        (rev 0)
+++ trunk/libcommons-codec-java/debian/ant.properties	2011-04-15 18:35:54 UTC (rev 13534)
@@ -0,0 +1 @@
+compile.encoding=UTF-8

Modified: trunk/libcommons-codec-java/debian/changelog
===================================================================
--- trunk/libcommons-codec-java/debian/changelog	2011-04-14 23:47:34 UTC (rev 13533)
+++ trunk/libcommons-codec-java/debian/changelog	2011-04-15 18:35:54 UTC (rev 13534)
@@ -1,17 +1,20 @@
 libcommons-codec-java (1.5-1) unstable; urgency=low
 
   * New upstream release.
-  * Remove Arnaud Vandyck from Uploaders
-  * Fix debian/MANIFEST.MF: don't Import-Package on itself
+  * Remove Arnaud Vandyck from Uploaders. Thanks!
+  * Fix debian/MANIFEST.MF: don't Import-Package on itself.
   * Switch to 3.0 (quilt) source format:
     - d/control: Drop B-D on quilt.
     - d/README.source: Drop file.
     - d/rules: Remove patchsys-quilt.mk usage.
   * d/control: Drop needless-dependency-on-jre since its a library package.
-  * Bump Standards-Version to 3.9.2 (no changes needed).
+  * d/control: Bump Standards-Version to 3.9.2 (no changes needed).
   * Bump to debhelper 7 compat level.
+  * d/rules: Use mh_clean in clean target.
+  * d/patches/javac_encoding.diff: New patch to force javac encoding to UTF-8.
+  * d/copyright: Update and format using DEP-5.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 15 Apr 2011 01:45:40 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 15 Apr 2011 20:25:31 +0200
 
 libcommons-codec-java (1.4-2) unstable; urgency=low
 

Modified: trunk/libcommons-codec-java/debian/copyright
===================================================================
--- trunk/libcommons-codec-java/debian/copyright	2011-04-14 23:47:34 UTC (rev 13533)
+++ trunk/libcommons-codec-java/debian/copyright	2011-04-15 18:35:54 UTC (rev 13534)
@@ -1,9 +1,15 @@
-This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
-Thu, 19 Aug 2004 13:26:48 +0200
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Upstream-Name: Commons Codec
+Upstream-Contact: Apache Commons <http://commons.apache.org/codec/>
+Source: http://www.apache.org/dist/commons/codec/
 
-It was downloaded from http://commons.apache.org/codec/
-
-Upstream Authors: Henri Yandell <bayard at generationjava.com>,
+Files: *
+Copyright: 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'.
+Comment:
+ Upstream Authors: Henri Yandell <bayard at generationjava.com>,
                   Tim OBrien <tobrien at apache.org>,
                   Scott Sanders <sanders at totalsync.com>,
                   Rodney Waldhoff <rwaldhoff at apache.org>,
@@ -21,18 +27,22 @@
                   Alex Karasulu <aok123 at bellsouth.net>,
                   Matthew Inger <mattinger at yahoo.com>
 
-Copyright: 2002-2008 The Apache Software Foundation
+Files: src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
+Copyright: Copyright 2002-2011 The Apache Software Foundation
+Copyright: Copyright (C) 2002 Kevin Atkinson (kevina at gnu.org)
+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'.
+Comment:
+ Contains test data from http://aspell.sourceforge.net/test/batch0.tab.
+ .
+ Copyright (C) 2002 Kevin Atkinson (kevina at gnu.org). Verbatim copying
+ and distribution of this entire article is permitted in any medium,
+ provided this notice is preserved.
 
-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'.
-
---------------------------------------------------------------------------------
-src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java contains
-test data from http://aspell.sourceforge.net/test/batch0.tab.
-
-Copyright (C) 2002 Kevin Atkinson (kevina at gnu.org). Verbatim copying
-and distribution of this entire article is permitted in any medium,
-provided this notice is preserved.
---------------------------------------------------------------------------------
+Files: debian/*
+Copyright: Copyright 2004 Arnaud Vandyck <avdyk at debian.org>
+Copyright: Copyright 2010-2011 Damien Raude-Morvan <drazzib at debian.org>
+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'.

Added: trunk/libcommons-codec-java/debian/patches/javac_encoding.diff
===================================================================
--- trunk/libcommons-codec-java/debian/patches/javac_encoding.diff	                        (rev 0)
+++ trunk/libcommons-codec-java/debian/patches/javac_encoding.diff	2011-04-15 18:35:54 UTC (rev 13534)
@@ -0,0 +1,26 @@
+Description: build.xml: Allow to set encoding of javac ant task.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+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/series
===================================================================
--- trunk/libcommons-codec-java/debian/patches/series	2011-04-14 23:47:34 UTC (rev 13533)
+++ trunk/libcommons-codec-java/debian/patches/series	2011-04-15 18:35:54 UTC (rev 13534)
@@ -1 +1,2 @@
 manifest.diff
+javac_encoding.diff

Modified: trunk/libcommons-codec-java/debian/rules
===================================================================
--- trunk/libcommons-codec-java/debian/rules	2011-04-14 23:47:34 UTC (rev 13533)
+++ trunk/libcommons-codec-java/debian/rules	2011-04-15 18:35:54 UTC (rev 13534)
@@ -17,7 +17,7 @@
 	mh_installjar -p$(PACKAGE) -l pom.xml dist/commons-codec-$(VERSION)-SNAPSHOT.jar
 
 clean::
-	-rm -rf debian/tmp
+	mh_clean
 
 get-orig-source:
 	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename




More information about the pkg-java-commits mailing list