[pkg-java] r11137 - in trunk/libcommons-el-java/debian: . patches source

[Niels Thykier]

Author: nthykier-guest
Date: 2009-11-26 22:49:37 +0000 (Thu, 26 Nov 2009)
New Revision: 11137

Added:
   trunk/libcommons-el-java/debian/doc-base
   trunk/libcommons-el-java/debian/source/
   trunk/libcommons-el-java/debian/source/format
Modified:
   trunk/libcommons-el-java/debian/changelog
   trunk/libcommons-el-java/debian/patches/01build_xml_license_location_patch.patch
   trunk/libcommons-el-java/debian/patches/02build_xml_javadoc_depends.patch
   trunk/libcommons-el-java/debian/patches/03rename_enum.patch
   trunk/libcommons-el-java/debian/patches/04add_OSGi_metadata.patch
   trunk/libcommons-el-java/debian/rules
Log:
  * Converted source format to 3.0 (quilt).
  * Added descriptions to the patches.
  * Added doc-base for the javadoc.

And also corrected the debian revision in the changelog.



Modified: trunk/libcommons-el-java/debian/changelog
===================================================================
--- trunk/libcommons-el-java/debian/changelog	2009-11-26 22:49:18 UTC (rev 11136)
+++ trunk/libcommons-el-java/debian/changelog	2009-11-26 22:49:37 UTC (rev 11137)
@@ -1,4 +1,4 @@
-libcommons-el-java (1.0-4) UNRELEASED; urgency=low
+libcommons-el-java (1.0-5) UNRELEASED; urgency=low
 
   [ Emmanuel Bourg ]
   * Update of the URLs
@@ -21,6 +21,9 @@
     - Thanks to Ilya Barygin for the patch.
   * Updated existing patches to be "quilt" appliable.
   * Imported patch from Fedora to add OSGi metadata. (Closes: #558180)
+  * Converted source format to 3.0 (quilt).
+  * Added descriptions to the patches.
+  * Added doc-base for the javadoc.
 
  -- Niels Thykier <niels at thykier.net>  Thu, 26 Nov 2009 22:29:43 +0100
 

Added: trunk/libcommons-el-java/debian/doc-base
===================================================================
--- trunk/libcommons-el-java/debian/doc-base	                        (rev 0)
+++ trunk/libcommons-el-java/debian/doc-base	2009-11-26 22:49:37 UTC (rev 11137)
@@ -0,0 +1,10 @@
+Document: libjgrapht-java
+Title: Javadoc for Apache's JSP2.0 implementation
+Author: The Commons-El Team
+Abstract: Programming API for Apache's implemenation of
+ JSP2.0 Expression Language interpreter.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libcommons-el-java/api/index.html
+Files: /usr/share/doc/libcommons-el-java/api/*

Modified: trunk/libcommons-el-java/debian/patches/01build_xml_license_location_patch.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/01build_xml_license_location_patch.patch	2009-11-26 22:49:18 UTC (rev 11136)
+++ trunk/libcommons-el-java/debian/patches/01build_xml_license_location_patch.patch	2009-11-26 22:49:37 UTC (rev 11137)
@@ -1,3 +1,5 @@
+Description: Corrects the location of the license file.
+
 diff -urNad /home/arnaud/debian/ITP/jakarta/libcommons-el-java-1.0/build.xml libcommons-el-java-1.0/build.xml
 --- a/build.xml	2003-06-07 00:35:28.000000000 +0200
 +++ b/build.xml	2003-07-02 11:04:37.000000000 +0200

Modified: trunk/libcommons-el-java/debian/patches/02build_xml_javadoc_depends.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/02build_xml_javadoc_depends.patch	2009-11-26 22:49:18 UTC (rev 11136)
+++ trunk/libcommons-el-java/debian/patches/02build_xml_javadoc_depends.patch	2009-11-26 22:49:37 UTC (rev 11137)
@@ -1,3 +1,5 @@
+Description: Corrects the dependency target for the javadoc target.
+
 diff -urNad /home/arnaud/debian/ITP/jakarta/libcommons-el-java-1.0/build.xml libcommons-el-java-1.0/build.xml
 --- a/libcommons-el-java-1.0/build.xml	2003-06-07 00:35:28.000000000 +0200
 +++ b/build.xml	2003-07-02 11:05:46.000000000 +0200

Modified: trunk/libcommons-el-java/debian/patches/03rename_enum.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/03rename_enum.patch	2009-11-26 22:49:18 UTC (rev 11136)
+++ trunk/libcommons-el-java/debian/patches/03rename_enum.patch	2009-11-26 22:49:37 UTC (rev 11137)
@@ -1,3 +1,5 @@
+Description: Renames variables named "enum" to avoid FTBFS with java5 or higher.
+
 diff -Nur -x '*.orig' -x '*~' libcommons-el-java-1.0/src/java/org/apache/commons/el/ImplicitObjects.java libcommons-el-java-1.0.new/src/java/org/apache/commons/el/ImplicitObjects.java
 --- a/src/java/org/apache/commons/el/ImplicitObjects.java	2003-02-04 03:22:25.000000000 +0300
 +++ b/src/java/org/apache/commons/el/ImplicitObjects.java	2009-09-25 16:23:08.000000000 +0400

Modified: trunk/libcommons-el-java/debian/patches/04add_OSGi_metadata.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/04add_OSGi_metadata.patch	2009-11-26 22:49:18 UTC (rev 11136)
+++ trunk/libcommons-el-java/debian/patches/04add_OSGi_metadata.patch	2009-11-26 22:49:37 UTC (rev 11137)
@@ -1,3 +1,5 @@
+Description: Adds OSGi metadata to the manifest.
+
 --- a/src/conf/MANIFEST.MF	2007-07-11 12:47:24.000000000 -0400
 +++ b/src/conf/MANIFEST.MF	2007-07-11 12:49:32.000000000 -0400
 @@ -9,3 +9,16 @@

Modified: trunk/libcommons-el-java/debian/rules
===================================================================
--- trunk/libcommons-el-java/debian/rules	2009-11-26 22:49:18 UTC (rev 11136)
+++ trunk/libcommons-el-java/debian/rules	2009-11-26 22:49:37 UTC (rev 11137)
@@ -10,7 +10,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME := /usr/share/ant

Added: trunk/libcommons-el-java/debian/source/format
===================================================================
--- trunk/libcommons-el-java/debian/source/format	                        (rev 0)
+++ trunk/libcommons-el-java/debian/source/format	2009-11-26 22:49:37 UTC (rev 11137)
@@ -0,0 +1 @@
+3.0 (quilt)