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

Sun Nov 29 00:29:57 UTC 2009

Author: drazzib
Date: 2009-11-29 00:29:54 +0000 (Sun, 29 Nov 2009)
New Revision: 11161

Added:
   trunk/libcommons-codec-java/debian/MANIFEST.MF
   trunk/libcommons-codec-java/debian/README.source
   trunk/libcommons-codec-java/debian/patches/
   trunk/libcommons-codec-java/debian/patches/manifest.diff
   trunk/libcommons-codec-java/debian/patches/series
Modified:
   trunk/libcommons-codec-java/debian/changelog
   trunk/libcommons-codec-java/debian/control
   trunk/libcommons-codec-java/debian/rules
Log:
* Use quilt as patch system
  - Build-Depends on quilt
  - Add debian/README.source
  - Use CDBS patchsys-quilt.mk
* Add debian/MANIFEST.MF for OSGi metadata (Closes: #558179)
* New debian/patches/manifest.diff to include OSGi in JAR

Added: trunk/libcommons-codec-java/debian/MANIFEST.MF
===================================================================

--- trunk/libcommons-codec-java/debian/MANIFEST.MF	                        (rev 0)
+++ trunk/libcommons-codec-java/debian/MANIFEST.MF	2009-11-29 00:29:54 UTC (rev 11161)
@@ -0,0 +1,21 @@
+Export-Package: org.apache.commons.codec;version="1.4",org.apache.comm
+ ons.codec.net;version="1.4",org.apache.commons.codec.language;version
+ ="1.4",org.apache.commons.codec.digest;version="1.4",org.apache.commo
+ ns.codec.binary;version="1.4"
+Bundle-Name: Commons Codec
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 1.4
+Bnd-LastModified: 1249576895296
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: The codec package contains simple encoder and deco
+ ders for     various formats such as Base64 and Hexadecimal.  In addi
+ tion to these     widely used encoders and decoders, the codec packag
+ e also maintains a     collection of phonetic encoding utilities.
+Import-Package: org.apache.commons.codec;version="1.4",org.apache.comm
+ ons.codec.binary;version="1.4",org.apache.commons.codec.digest;versio
+ n="1.4",org.apache.commons.codec.language;version="1.4",org.apache.co
+ mmons.codec.net;version="1.4"
+Bundle-SymbolicName: org.apache.commons.codec
+Bundle-DocURL: http://commons.apache.org/codec/
+

Added: trunk/libcommons-codec-java/debian/README.source
===================================================================
--- trunk/libcommons-codec-java/debian/README.source	                        (rev 0)
+++ trunk/libcommons-codec-java/debian/README.source	2009-11-29 00:29:54 UTC (rev 11161)
@@ -0,0 +1,5 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.

Modified: trunk/libcommons-codec-java/debian/changelog
===================================================================
--- trunk/libcommons-codec-java/debian/changelog	2009-11-29 00:29:33 UTC (rev 11160)
+++ trunk/libcommons-codec-java/debian/changelog	2009-11-29 00:29:54 UTC (rev 11161)
@@ -1,8 +1,14 @@
-libcommons-codec-java (1.4-2) UNRELEASED; urgency=low
+libcommons-codec-java (1.4-2) unstable; urgency=low
 
   * Update my email address
+  * Use quilt as patch system
+    - Build-Depends on quilt
+    - Add debian/README.source
+    - Use CDBS patchsys-quilt.mk
+  * Add debian/MANIFEST.MF for OSGi metadata (Closes: #558179)
+  * New debian/patches/manifest.diff to include OSGi in JAR
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 24 Oct 2009 21:04:08 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 29 Nov 2009 01:06:40 +0100
 
 libcommons-codec-java (1.4-1) unstable; urgency=low
 

Modified: trunk/libcommons-codec-java/debian/control
===================================================================
--- trunk/libcommons-codec-java/debian/control	2009-11-29 00:29:33 UTC (rev 11160)
+++ trunk/libcommons-codec-java/debian/control	2009-11-29 00:29:54 UTC (rev 11161)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>, Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), ant, default-jdk
+Build-Depends: cdbs, debhelper (>= 5), ant, default-jdk, quilt
 Build-Depends-Indep: maven-repo-helper, ant-optional, junit
 Standards-Version: 3.8.3
 Homepage: http://commons.apache.org/codec/

Added: trunk/libcommons-codec-java/debian/patches/manifest.diff
===================================================================
--- trunk/libcommons-codec-java/debian/patches/manifest.diff	                        (rev 0)
+++ trunk/libcommons-codec-java/debian/patches/manifest.diff	2009-11-29 00:29:54 UTC (rev 11161)
@@ -0,0 +1,17 @@
+Description: Append debian/MANIFEST.MF inside JAR file
+ Entry should be merged with others
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-11-28
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -103,7 +103,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"/>
+-        <jar jarfile="${dist.home}/${final.name}.jar" basedir="${build.home}/classes">
++        <jar jarfile="${dist.home}/${final.name}.jar" basedir="${build.home}/classes"
++		manifest="debian/MANIFEST.MF">
+             <manifest>
+                 <attribute name="Specification-Title" value="Commons Codec"/>
+                 <attribute name="Specification-Version" value="${component.version}"/>

Added: trunk/libcommons-codec-java/debian/patches/series
===================================================================
--- trunk/libcommons-codec-java/debian/patches/series	                        (rev 0)
+++ trunk/libcommons-codec-java/debian/patches/series	2009-11-29 00:29:54 UTC (rev 11161)
@@ -0,0 +1 @@
+manifest.diff

Modified: trunk/libcommons-codec-java/debian/rules
===================================================================
--- trunk/libcommons-codec-java/debian/rules	2009-11-29 00:29:33 UTC (rev 11160)
+++ trunk/libcommons-codec-java/debian/rules	2009-11-29 00:29:54 UTC (rev 11161)
@@ -2,6 +2,7 @@
 # debian/rules for libcommons-codec-java
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 PACKAGE			   := $(DEB_SOURCE_PACKAGE)


