[pkg-java] r18437 - in tags/jardiff: . 0.2-4/debian 0.2-4/debian/patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Sep 15 22:36:00 UTC 2014 

Author: ebourg-guest
Date: 2014-09-15 22:36:00 +0000 (Mon, 15 Sep 2014)
New Revision: 18437

Added:
   tags/jardiff/0.2-4/
   tags/jardiff/0.2-4/debian/changelog
   tags/jardiff/0.2-4/debian/compat
   tags/jardiff/0.2-4/debian/control
   tags/jardiff/0.2-4/debian/copyright
   tags/jardiff/0.2-4/debian/jardiff.sh
   tags/jardiff/0.2-4/debian/patches/02_fix_build_with_asm4.diff
   tags/jardiff/0.2-4/debian/patches/series
   tags/jardiff/0.2-4/debian/rules
Removed:
   tags/jardiff/0.2-4/debian/changelog
   tags/jardiff/0.2-4/debian/compat
   tags/jardiff/0.2-4/debian/control
   tags/jardiff/0.2-4/debian/copyright
   tags/jardiff/0.2-4/debian/jardiff.sh
   tags/jardiff/0.2-4/debian/patches/series
   tags/jardiff/0.2-4/debian/rules
Log:
[svn-buildpackage] Tagging jardiff 0.2-4

Deleted: tags/jardiff/0.2-4/debian/changelog
===================================================================
--- trunk/jardiff/debian/changelog	2014-09-15 15:51:00 UTC (rev 18429)
+++ tags/jardiff/0.2-4/debian/changelog	2014-09-15 22:36:00 UTC (rev 18437)
@@ -1,30 +0,0 @@
-jardiff (0.2-3) unstable; urgency=low
-
-  * Team upload.
-  * asm2 -> asm3 migration
-  * Convert to 3.0 source format.
-  * Update standards version to 3.8.4.
-
- -- Onkar Shinde <onkarshinde at ubuntu.com>  Mon, 14 Jun 2010 18:24:51 +0530
-
-jardiff (0.2-2) unstable; urgency=low
-
-  * Use default-jdk:
-    - Build-Depend on default-jdk instead of java-gcj-compat-dev
-    - Depends on default-jre-headless
-    - Use default-java from default-jdk as JAVA_HOME
-  * Bump Standards-Version to 3.8.3:
-    - Add ${misc:Depends} in Depends field for debhelper
-    - Move to "java" section of archive
-  * Set Maintainer field to Debian Java Team
-  * Update Vcs-* fields
-  * Add myself as Uploaders
-  * Update my email address
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 26 Sep 2009 20:19:07 +0200
-
-jardiff (0.2-1) unstable; urgency=low
-
-  * Initial release (Closes: #495998)
-
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Mon, 13 Oct 2008 23:02:09 +0200

Copied: tags/jardiff/0.2-4/debian/changelog (from rev 18436, trunk/jardiff/debian/changelog)
===================================================================
--- tags/jardiff/0.2-4/debian/changelog	                        (rev 0)
+++ tags/jardiff/0.2-4/debian/changelog	2014-09-15 22:36:00 UTC (rev 18437)
@@ -0,0 +1,43 @@
+jardiff (0.2-4) unstable; urgency=medium
+
+  * Team upload.
+  * Generate Java 5 compatible bytecode
+  * debian/control:
+    - Standards-Version updated to 3.9.5 (no changes)
+    - Depend on libasm4-java instead of libasm3-java
+    - Use canonical URLs for the Vcs-* fields
+  * Switch to debhelper level 9
+  * debian/copyright: Updated to the Copyright Format 1.0
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 15 Sep 2014 23:32:43 +0200
+
+jardiff (0.2-3) unstable; urgency=low
+
+  * Team upload.
+  * asm2 -> asm3 migration
+  * Convert to 3.0 source format.
+  * Update standards version to 3.8.4.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com>  Mon, 14 Jun 2010 18:24:51 +0530
+
+jardiff (0.2-2) unstable; urgency=low
+
+  * Use default-jdk:
+    - Build-Depend on default-jdk instead of java-gcj-compat-dev
+    - Depends on default-jre-headless
+    - Use default-java from default-jdk as JAVA_HOME
+  * Bump Standards-Version to 3.8.3:
+    - Add ${misc:Depends} in Depends field for debhelper
+    - Move to "java" section of archive
+  * Set Maintainer field to Debian Java Team
+  * Update Vcs-* fields
+  * Add myself as Uploaders
+  * Update my email address
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 26 Sep 2009 20:19:07 +0200
+
+jardiff (0.2-1) unstable; urgency=low
+
+  * Initial release (Closes: #495998)
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Mon, 13 Oct 2008 23:02:09 +0200

Deleted: tags/jardiff/0.2-4/debian/compat
===================================================================
--- trunk/jardiff/debian/compat	2014-09-15 15:51:00 UTC (rev 18429)
+++ tags/jardiff/0.2-4/debian/compat	2014-09-15 22:36:00 UTC (rev 18437)
@@ -1 +0,0 @@
-5

Copied: tags/jardiff/0.2-4/debian/compat (from rev 18433, trunk/jardiff/debian/compat)
===================================================================
--- tags/jardiff/0.2-4/debian/compat	                        (rev 0)
+++ tags/jardiff/0.2-4/debian/compat	2014-09-15 22:36:00 UTC (rev 18437)
@@ -0,0 +1 @@
+9

Deleted: tags/jardiff/0.2-4/debian/control
===================================================================
--- trunk/jardiff/debian/control	2014-09-15 15:51:00 UTC (rev 18429)
+++ tags/jardiff/0.2-4/debian/control	2014-09-15 22:36:00 UTC (rev 18437)
@@ -1,25 +0,0 @@
-Source: jardiff
-Section: java
-Priority: extra
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), default-jdk, ant
-Build-Depends-Indep: libasm3-java, libcommons-cli-java
-Standards-Version: 3.8.4
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jardiff/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jardiff/
-Homepage: http://www.osjava.org/jardiff/
-
-Package: jardiff
-Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libasm3-java, libcommons-cli-java, java-wrappers
-Description: tool to visualise API differences between two JAR files
- Jardiff is a tool to help visualise API differences between two different
- versions of a project.
- .
- Jardiff takes two jar files and outputs all the public API changes as
- xml, html or plain text.
- .
- It can be used from command line or via an Apache Ant task.
- .
- It requires Java >= 1.4 to run.

Copied: tags/jardiff/0.2-4/debian/control (from rev 18433, trunk/jardiff/debian/control)
===================================================================
--- tags/jardiff/0.2-4/debian/control	                        (rev 0)
+++ tags/jardiff/0.2-4/debian/control	2014-09-15 22:36:00 UTC (rev 18437)
@@ -0,0 +1,25 @@
+Source: jardiff
+Section: java
+Priority: extra
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: cdbs, debhelper (>= 9), default-jdk, ant
+Build-Depends-Indep: libasm4-java, libcommons-cli-java
+Standards-Version: 3.9.5
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jardiff/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jardiff/
+Homepage: http://www.osjava.org/jardiff/
+
+Package: jardiff
+Architecture: all
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libasm4-java, libcommons-cli-java, java-wrappers
+Description: tool to visualise API differences between two JAR files
+ Jardiff is a tool to help visualise API differences between two different
+ versions of a project.
+ .
+ Jardiff takes two jar files and outputs all the public API changes as
+ xml, html or plain text.
+ .
+ It can be used from command line or via an Apache Ant task.
+ .
+ It requires Java >= 1.4 to run.

Deleted: tags/jardiff/0.2-4/debian/copyright
===================================================================
--- trunk/jardiff/debian/copyright	2014-09-15 15:51:00 UTC (rev 18429)
+++ tags/jardiff/0.2-4/debian/copyright	2014-09-15 22:36:00 UTC (rev 18437)
@@ -1,30 +0,0 @@
-This package was debianized by Damien Raude-Morvan <drazzib at debian.org> on
-Thu, 21 Aug 2008 20:59:38 +0200.
-
-It was downloaded from http://dist.osjava.org/releases/official/jardiff/
-
-Upstream Author:
-    Antony Riley <antony at cyberiantiger.org>
-
-Copyright:
-    Copyright (c) 2005, Antony Riley
-
-License:
-    BSD
-
-On Debian systems, the complete text of the BSD License
-can be found in `/usr/share/common-licenses/BSD'.
-
-Note:
-    The following notice
-    "Copyright &copy; 2005-2006 OSJava. All Rights Reserved"
-    found in build.xml file is just a build process property which
-    doesn't reflect any real copyright assignment.
-    This string could be found in every OsJava hosted projects (default
-    build.xml template file).
-    This part of build process isn't enabled
-    in Debian package (i.e. no Javadoc is generated with this Copyright)
-
-
-The Debian packaging is Copyright 2008, Damien Raude-Morvan <drazzib at debian.org> and
-is licensed under the BSD, see `/usr/share/common-licenses/BSD'.

Copied: tags/jardiff/0.2-4/debian/copyright (from rev 18435, trunk/jardiff/debian/copyright)
===================================================================
--- tags/jardiff/0.2-4/debian/copyright	                        (rev 0)
+++ tags/jardiff/0.2-4/debian/copyright	2014-09-15 22:36:00 UTC (rev 18437)
@@ -0,0 +1,46 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: JarDiff
+Source: http://dist.osjava.org/releases/official/jardiff/
+
+Files: *
+Copyright: 2005, Antony Riley <antony at cyberiantiger.org>
+License: BSD-3-clause
+Comment:
+ The following notice:
+   "Copyright &copy; 2005-2006 OSJava. All Rights Reserved"
+ found in build.xml file is just a build process property which doesn't reflect
+ any real copyright assignment. This string could be found in every OsJava
+ hosted projects (default  build.xml template file).
+ This part of build process isn't enabled in the Debian package (i.e. no Javadoc
+ is generated with this Copyright)
+
+Files: debian/*
+Copyright: 2008-2009, Damien Raude-Morvan <drazzib at debian.org>
+License: BSD-3-clause
+
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ + Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+ .
+ + 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.
+ .
+ + Neither the name JarDiff nor the names of its contributors may
+   be used to endorse or promote products derived from this software without
+   specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS 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 COPYRIGHT OWNER OR 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.

Deleted: tags/jardiff/0.2-4/debian/jardiff.sh
===================================================================
--- trunk/jardiff/debian/jardiff.sh	2014-09-15 15:51:00 UTC (rev 18429)
+++ tags/jardiff/0.2-4/debian/jardiff.sh	2014-09-15 22:36:00 UTC (rev 18437)
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# Include the wrappers utility script
-. /usr/lib/java-wrappers/java-wrappers.sh
-
-# We need a java runtime (any 1.4 work)
-find_java_runtime all
-
-# Define our classpath
-find_jars jardiff commons-cli asm3 asm3-commons
-
-# Run JarDiff
-run_java org.osjava.jardiff.Main $extra_args "$@"
-

Copied: tags/jardiff/0.2-4/debian/jardiff.sh (from rev 18430, trunk/jardiff/debian/jardiff.sh)
===================================================================
--- tags/jardiff/0.2-4/debian/jardiff.sh	                        (rev 0)
+++ tags/jardiff/0.2-4/debian/jardiff.sh	2014-09-15 22:36:00 UTC (rev 18437)
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Include the wrappers utility script
+. /usr/lib/java-wrappers/java-wrappers.sh
+
+# We need a java runtime (any 1.4 work)
+find_java_runtime all
+
+# Define our classpath
+find_jars jardiff commons-cli asm4 asm4-commons
+
+# Run JarDiff
+run_java org.osjava.jardiff.Main $extra_args "$@"
+

Copied: tags/jardiff/0.2-4/debian/patches/02_fix_build_with_asm4.diff (from rev 18430, trunk/jardiff/debian/patches/02_fix_build_with_asm4.diff)
===================================================================
--- tags/jardiff/0.2-4/debian/patches/02_fix_build_with_asm4.diff	                        (rev 0)
+++ tags/jardiff/0.2-4/debian/patches/02_fix_build_with_asm4.diff	2014-09-15 22:36:00 UTC (rev 18437)
@@ -0,0 +1,42 @@
+--- a/src/java/org/osjava/jardiff/ClassInfoVisitor.java
++++ b/src/java/org/osjava/jardiff/ClassInfoVisitor.java
+@@ -40,9 +40,10 @@
+ import java.util.HashMap;
+ import java.util.Map;
+ 
++import org.objectweb.asm.ClassVisitor;
+ import org.objectweb.asm.FieldVisitor;
+ import org.objectweb.asm.MethodVisitor;
+-import org.objectweb.asm.commons.EmptyVisitor;
++import org.objectweb.asm.Opcodes;
+ 
+ /**
+  * A reusable class which uses the ASM to build up ClassInfo about a 
+@@ -50,7 +51,7 @@
+  *
+  * @author <a href="mailto:antony at cyberiantiger.org">Antony Riley</a>
+  */
+-public class ClassInfoVisitor extends EmptyVisitor
++public class ClassInfoVisitor extends ClassVisitor
+ {
+     /**
+      * The class file version.
+@@ -92,6 +93,10 @@
+      * A map of field signature to a FieldInfo describing the field.
+      */
+     private Map fieldMap;
++
++    public ClassInfoVisitor() {
++        super(Opcodes.ASM5);
++    }
+     
+     /**
+      * Reset this ClassInfoVisitor so that it can be used to visit another
+@@ -141,6 +146,6 @@
+                                    String signature, Object value) {
+         fieldMap.put(name,
+                      new FieldInfo(access, name, desc, signature, value));
+-        return this;
++        return null;
+     }
+ }

Deleted: tags/jardiff/0.2-4/debian/patches/series
===================================================================
--- trunk/jardiff/debian/patches/series	2014-09-15 15:51:00 UTC (rev 18429)
+++ tags/jardiff/0.2-4/debian/patches/series	2014-09-15 22:36:00 UTC (rev 18437)
@@ -1 +0,0 @@
-01_fix_build_with_asm3.diff

Copied: tags/jardiff/0.2-4/debian/patches/series (from rev 18430, trunk/jardiff/debian/patches/series)
===================================================================
--- tags/jardiff/0.2-4/debian/patches/series	                        (rev 0)
+++ tags/jardiff/0.2-4/debian/patches/series	2014-09-15 22:36:00 UTC (rev 18437)
@@ -0,0 +1,2 @@
+01_fix_build_with_asm3.diff
+02_fix_build_with_asm4.diff

Deleted: tags/jardiff/0.2-4/debian/rules
===================================================================
--- trunk/jardiff/debian/rules	2014-09-15 15:51:00 UTC (rev 18429)
+++ tags/jardiff/0.2-4/debian/rules	2014-09-15 22:36:00 UTC (rev 18437)
@@ -1,26 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME            := /usr/lib/jvm/default-java
-ANT_HOME             := /usr/share/ant
-
-DEB_JARS             := commons-cli asm3 asm3-commons
-
-DEB_ANT_BUILD_TARGET := jar
-DEB_ANT_CLEAN_TARGET := clean
-
-# noget=true : force offline build
-# final.name=jardiff : force Jar name to jardiff.jar
-DEB_ANT_ARGS         := -Dnoget=true -Dfinal.name=jardiff
-
-# Strip .sh from script name
-binary-post-install/jardiff::
-	mv $(CURDIR)/debian/jardiff/usr/bin/jardiff.sh $(CURDIR)/debian/jardiff/usr/bin/jardiff
-
-get-orig-source:
-	uscan --force-download --rename

Copied: tags/jardiff/0.2-4/debian/rules (from rev 18434, trunk/jardiff/debian/rules)
===================================================================
--- tags/jardiff/0.2-4/debian/rules	                        (rev 0)
+++ tags/jardiff/0.2-4/debian/rules	2014-09-15 22:36:00 UTC (rev 18437)
@@ -0,0 +1,26 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+JAVA_HOME            := /usr/lib/jvm/default-java
+ANT_HOME             := /usr/share/ant
+
+DEB_JARS             := commons-cli asm4 asm4-commons
+
+DEB_ANT_BUILD_TARGET := jar
+DEB_ANT_CLEAN_TARGET := clean
+
+# noget=true : force offline build
+# final.name=jardiff : force Jar name to jardiff.jar
+DEB_ANT_ARGS         := -Dnoget=true -Dfinal.name=jardiff -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
+
+# Strip .sh from script name
+binary-post-install/jardiff::
+	mv $(CURDIR)/debian/jardiff/usr/bin/jardiff.sh $(CURDIR)/debian/jardiff/usr/bin/jardiff
+
+get-orig-source:
+	uscan --force-download --rename

More information about the pkg-java-commits mailing list