[pkg-java] r7144 - in trunk/libcommons-jexl-java/debian: . patches

onkarshinde-guest at alioth.debian.org onkarshinde-guest at alioth.debian.org
Tue Oct 14 04:40:45 UTC 2008 

Author: onkarshinde-guest
Date: 2008-10-14 04:40:44 +0000 (Tue, 14 Oct 2008)
New Revision: 7144

Added:
   trunk/libcommons-jexl-java/debian/README.source
Removed:
   trunk/libcommons-jexl-java/debian/links
Modified:
   trunk/libcommons-jexl-java/debian/ant.properties
   trunk/libcommons-jexl-java/debian/changelog
   trunk/libcommons-jexl-java/debian/control
   trunk/libcommons-jexl-java/debian/copyright
   trunk/libcommons-jexl-java/debian/install
   trunk/libcommons-jexl-java/debian/patches/01_jar_without_tests.patch
   trunk/libcommons-jexl-java/debian/rules
   trunk/libcommons-jexl-java/debian/watch
Log:
- Update commons-jexl to 1.1.

Added: trunk/libcommons-jexl-java/debian/README.source
===================================================================
--- trunk/libcommons-jexl-java/debian/README.source	                        (rev 0)
+++ trunk/libcommons-jexl-java/debian/README.source	2008-10-14 04:40:44 UTC (rev 7144)
@@ -0,0 +1,33 @@
+This package uses CDBS (and therefore simple-patchsys.mk) in order to 
+apply patches to the upstream source. Patches are stored in 
+debian/patches and their filenames usually end in .patch or .diff .
+For further details, see the man page for cdbs-edit-patch.
+
+All commands described below should be run from the top directory of the 
+package source tree, unless otherwise stated.
+
+ * To generate the fully patched source, in a form ready for
+   editing, that would be built to create Debian packages, run: 
+
+     make -f debian/rules apply-patches
+
+   Note: This should happen automatically when you run 
+   dpkg-source -x on a CDBS simple-patchsys.mk source package.
+
+ * To modify the source and save those modifications so that
+   they will be applied when building the package, pick a
+   suitably informative patch file name, for example
+   01_add_README.source_file.patch, and then run:
+
+     cdbs-edit-patch 01_add_README.source_file.patch
+
+   This will place you in a new shell in a temporary copy of the 
+   source tree.  Make your desired modifications to it, and then 
+   exit the shell to create the patch file containing them (this 
+   file will appear in debian/patches).
+
+ * To remove source modifications that are currently being
+   applied when building the package, run:
+
+     make -f debian/rules reverse-patches
+

Modified: trunk/libcommons-jexl-java/debian/ant.properties
===================================================================
--- trunk/libcommons-jexl-java/debian/ant.properties	2008-10-13 20:21:26 UTC (rev 7143)
+++ trunk/libcommons-jexl-java/debian/ant.properties	2008-10-14 04:40:44 UTC (rev 7144)
@@ -1,2 +1 @@
 build.sysclasspath=only
-final.name=commons-jexl-1.0

Modified: trunk/libcommons-jexl-java/debian/changelog
===================================================================
--- trunk/libcommons-jexl-java/debian/changelog	2008-10-13 20:21:26 UTC (rev 7143)
+++ trunk/libcommons-jexl-java/debian/changelog	2008-10-14 04:40:44 UTC (rev 7144)
@@ -1,9 +1,40 @@
-libcommons-jexl-java (1.0-6) UNRELEASED; urgency=low
+libcommons-jexl-java (1.1-1) unstable; urgency=low
 
-  * Updated watch file to match upstream version better.
+  [ Michael Koch ]
+  * debian/watch
+    - Updated watch file to match upstream version better.
 
- -- Michael Koch <konqueror at gmx.de>  Thu, 03 Jan 2008 20:58:25 +0100
+  [ Onkar Shinde ]
+  * New upstream release.
+  * debian/control
+    - Move cdbs and debhelper to 'Build-Depends' to make lintian happy.
+    - Use default-jdk as build dependency.
+    - Use default-jre as runtime dependency.
+    - Remove homepage from description and add 'Homepage' field.
+    - Change standard version to 3.8.0.
+  * debina/rules
+    - Use java home corresponding to default-jdk.
+    - Add ant options to compile for target JVM 1.5.
+    - Extract version from changelog.
+    - Create symlink in the install target.
+  * debian/links
+    - Remove, not needed anymore.
+  * debian/ant.properties
+    - Remove jar file name as it is already present in build.xml.
+  * debian/install
+    - Remove version from jar file name.
+  * debian/patches
+    - 01_jar_without_tests.patch: Refreshed for current source.
+  * debian/watch
+    - Change url to match current source repository.
+  * debian/README.source
+    - Add for compliance with standards version 3.8.0.
+  * debian/copyright
+    - The library is licensed under Apache License 2.0 now. So remove complete
+      text of previous license and point to the common-licenses folder.
 
+ -- Onkar Shinde <onkarshinde at ubuntu.com>  Sun, 12 Oct 2008 20:04:41 +0530
+
 libcommons-jexl-java (1.0-5) unstable; urgency=low
 
   * debian/rules: removed ANT_HOME and DEB_ANT_COMPILER (closes: #396334),

Modified: trunk/libcommons-jexl-java/debian/control
===================================================================
--- trunk/libcommons-jexl-java/debian/control	2008-10-13 20:21:26 UTC (rev 7143)
+++ trunk/libcommons-jexl-java/debian/control	2008-10-14 04:40:44 UTC (rev 7144)
@@ -3,16 +3,17 @@
 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>
-Build-Depends-Indep: debhelper (>= 4.1), cdbs (>= 0.4.8), java-gcj-compat-dev, ant, libcommons-logging-java, junit
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 4.1), cdbs (>= 0.4.8)
+Build-Depends-Indep: default-jdk, ant, libcommons-logging-java, junit
+Standards-Version: 3.8.0
+Homepage: http://jakarta.apache.org/commons/jexl
 
 Package: libcommons-jexl-java
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre | java1-runtime | java2-runtime
 Description: expression language engine
  This library is an expression language engine for easy embedding in 
  applications and frameworks. It implements an extented version of the 
  Expression Language of the JSTL (Java Standard Tag Library, java server
  related technology). 
  . 
- Homepage: http://jakarta.apache.org/commons/jexl

Modified: trunk/libcommons-jexl-java/debian/copyright
===================================================================
--- trunk/libcommons-jexl-java/debian/copyright	2008-10-13 20:21:26 UTC (rev 7143)
+++ trunk/libcommons-jexl-java/debian/copyright	2008-10-14 04:40:44 UTC (rev 7144)
@@ -8,55 +8,12 @@
                     Peter Royal <proyal at apache.org>
 
 Copyright:
-The Apache Software License, Version 1.1
+Apache License, version 2.0
 
 Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
 reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+This software is licensed under the Apache License, version 2.0.
+On Debian systems, the complete text of the Apache License, version 2.0,
+can be found in '/usr/share/common-licenses/Apache-2.0'.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. The end-user documentation included with the redistribution, if
-   any, must include the following acknowlegement:
-      "This product includes software developed by the
-       Apache Software Foundation (http://www.apache.org/)."
-   Alternately, this acknowlegement may appear in the software itself,
-   if and wherever such third-party acknowlegements normally appear.
-
-4. The names "The Jakarta Project", "Commons", and "Apache Software
-   Foundation" must not be used to endorse or promote products derived
-   from this software without prior written permission. For written
-   permission, please contact apache at apache.org.
-
-5. Products derived from this software may not be called "Apache"
-   nor may "Apache" appear in their names without prior written
-   permission of the Apache Group.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-====================================================================
-
-This software consists of voluntary contributions made by many
-individuals on behalf of the Apache Software Foundation.  For more
-information on the Apache Software Foundation, please see
-<http://www.apache.org/>.
-

Modified: trunk/libcommons-jexl-java/debian/install
===================================================================
--- trunk/libcommons-jexl-java/debian/install	2008-10-13 20:21:26 UTC (rev 7143)
+++ trunk/libcommons-jexl-java/debian/install	2008-10-14 04:40:44 UTC (rev 7144)
@@ -1 +1 @@
-target/commons-jexl-1.0.jar usr/share/java/
+target/commons-jexl-*.jar usr/share/java/

Deleted: trunk/libcommons-jexl-java/debian/links
===================================================================
--- trunk/libcommons-jexl-java/debian/links	2008-10-13 20:21:26 UTC (rev 7143)
+++ trunk/libcommons-jexl-java/debian/links	2008-10-14 04:40:44 UTC (rev 7144)
@@ -1 +0,0 @@
-usr/share/java/commons-jexl-1.0.jar usr/share/java/commons-jexl.jar

Modified: trunk/libcommons-jexl-java/debian/patches/01_jar_without_tests.patch
===================================================================
--- trunk/libcommons-jexl-java/debian/patches/01_jar_without_tests.patch	2008-10-13 20:21:26 UTC (rev 7143)
+++ trunk/libcommons-jexl-java/debian/patches/01_jar_without_tests.patch	2008-10-14 04:40:44 UTC (rev 7144)
@@ -1,11 +1,12 @@
---- build.xml.orig	2004-10-11 14:47:47.360091824 +0200
-+++ build.xml	2004-10-11 14:47:59.160297920 +0200
-@@ -52,7 +52,7 @@
-       </classpath>
-     </javac>
+diff -Nur -x '*.orig' -x '*~' libcommons-jexl-java-1.1/build.xml libcommons-jexl-java-1.1.new/build.xml
+--- libcommons-jexl-java-1.1/build.xml	2006-09-09 04:45:15.000000000 +0530
++++ libcommons-jexl-java-1.1.new/build.xml	2008-10-12 20:05:58.000000000 +0530
+@@ -62,7 +62,7 @@
+       </fileset>
+     </copy>
    </target>
 -  <target name="jar" description="o Create the jar" depends="compile,test">
 +  <target name="jar" description="o Create the jar" depends="compile">
-     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
+     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}" manifest="src/conf/MANIFEST.MF">
      </jar>
    </target>

Modified: trunk/libcommons-jexl-java/debian/rules
===================================================================
--- trunk/libcommons-jexl-java/debian/rules	2008-10-13 20:21:26 UTC (rev 7143)
+++ trunk/libcommons-jexl-java/debian/rules	2008-10-14 04:40:44 UTC (rev 7144)
@@ -10,10 +10,14 @@
 
 JLIBS = /usr/share/java
 
-JAVA_HOME_DIRS       := /usr/lib/jvm/java-gcj/
+JAVA_HOME_DIRS       := /usr/lib/jvm/default-java/
 DEB_JARS             := junit commons-logging
 DEB_ANT_BUILD_TARGET := jar
 #DEB_ANT_TEST_TARGET := test
+ANT_OPTS             := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
 
 LIBRARY=commons-jexl
-VERSION=1.0
+VERSION=$(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
+
+install/libcommons-jexl-java::
+	ln -s commons-jexl-$(VERSION).jar debian/libcommons-jexl-java/usr/share/java/commons-jexl.jar

Modified: trunk/libcommons-jexl-java/debian/watch
===================================================================
--- trunk/libcommons-jexl-java/debian/watch	2008-10-13 20:21:26 UTC (rev 7143)
+++ trunk/libcommons-jexl-java/debian/watch	2008-10-14 04:40:44 UTC (rev 7144)
@@ -1,2 +1,2 @@
 version=3
-http://www.apache.org/dist/java-repository/commons-jexl/distributions/commons-jexl-([\d\.]*)-src\.tar\.gz debian uupdate
+http://archive.apache.org/dist/commons/jexl/source/commons-jexl-([\d\.]*)-src\.tar\.gz debian uupdate

More information about the pkg-java-commits mailing list