[pkg-java] r10783 - in trunk: . cglib/debian cglib/debian/patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Thu Oct 8 19:31:47 UTC 2009
Author: drazzib
Date: 2009-10-08 19:31:47 +0000 (Thu, 08 Oct 2009)
New Revision: 10783
Added:
trunk/cglib/
trunk/cglib/debian/libcglib-java-doc.doc-base
trunk/cglib/debian/libcglib-java-doc.install
trunk/cglib/debian/libcglib-java.install
trunk/cglib/debian/patches/series
Removed:
trunk/cglib/debian/libcglib2.1-java-doc.doc-base
trunk/cglib/debian/libcglib2.1-java-doc.docs
trunk/cglib/debian/libcglib2.1-java.install
trunk/cglib/debian/patches/01_build_classpath.patch
Modified:
trunk/cglib/debian/README.source
trunk/cglib/debian/changelog
trunk/cglib/debian/compat
trunk/cglib/debian/control
trunk/cglib/debian/copyright
trunk/cglib/debian/patches/02_build_split.patch
trunk/cglib/debian/rules
Log:
* New upstream release.
- Rename source package to "cglib"
- Drop unneeded Build-Depends on libaspectwerkz2-java
- Build-Depends on libasm3-java instead of libasm-java
- Drop uneeded debian/patches/01_build_classpath.patch
* Switch to debhelper 7
* Use Quilt patch system:
- refresh all debian/patches
- Build-Depends on quilt
- Update debian/README.source
* Update my email address
* Bump Standards-Version to 3.8.3: no changes needed
* Fix debian/copyright to include BSD license of
src/proxy/net/sf/cglib/core/LocalVariablesSorter.java
Modified: trunk/cglib/debian/README.source
===================================================================
--- trunk/cglib2.1/debian/README.source 2009-10-07 14:17:26 UTC (rev 10781)
+++ trunk/cglib/debian/README.source 2009-10-08 19:31:47 UTC (rev 10783)
@@ -1,39 +1,9 @@
-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.
+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.
-All commands described below should be run from the top directory of the
-package source tree, unless otherwise stated.
+See /usr/share/doc/quilt/README.source for a detailed explanation.
- * 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: It has been proposed that, in future, this should happen
- automatically when you run dpkg-source -x on a CDBS
- simple-patchsys.mk source package. However, this proposal has
- apparently not yet been implemented, so for now you have to do
- it yourself like this.
-
- * 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
-
-- Damien Raude-Morvan <drazzib at drazzib.com> Mon, 29 Jun 2009 22:13:35 +0200
The upstream supplied source package contains binary jar files and
Modified: trunk/cglib/debian/changelog
===================================================================
--- trunk/cglib2.1/debian/changelog 2009-10-07 14:17:26 UTC (rev 10781)
+++ trunk/cglib/debian/changelog 2009-10-08 19:31:47 UTC (rev 10783)
@@ -1,9 +1,23 @@
-cglib2.1 (2.1.3.dfsg.2-3) UNRELEASED; urgency=low
+cglib (2.2+dfsg-1) unstable; urgency=low
+ * New upstream release.
+ - Rename source package to "cglib"
+ - Drop unneeded Build-Depends on libaspectwerkz2-java
+ - Build-Depends on libasm3-java instead of libasm-java
+ - Drop uneeded debian/patches/01_build_classpath.patch
* Build-Depends on default-jdk instead of default-jdk-builddep
because we don't build a native GCJ package.
+ * Switch to debhelper 7
+ * Use Quilt patch system:
+ - refresh all debian/patches
+ - Build-Depends on quilt
+ - Update debian/README.source
+ * Update my email address
+ * Bump Standards-Version to 3.8.3: no changes needed
+ * Fix debian/copyright to include BSD license of
+ src/proxy/net/sf/cglib/core/LocalVariablesSorter.java
- -- Damien Raude-Morvan <drazzib at drazzib.com> Wed, 29 Jul 2009 21:45:11 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 08 Oct 2009 21:23:45 +0200
cglib2.1 (2.1.3.dfsg.2-2) unstable; urgency=low
Modified: trunk/cglib/debian/compat
===================================================================
--- trunk/cglib2.1/debian/compat 2009-10-07 14:17:26 UTC (rev 10781)
+++ trunk/cglib/debian/compat 2009-10-08 19:31:47 UTC (rev 10783)
@@ -1 +1 @@
-5
+7
Modified: trunk/cglib/debian/control
===================================================================
--- trunk/cglib2.1/debian/control 2009-10-07 14:17:26 UTC (rev 10781)
+++ trunk/cglib/debian/control 2009-10-08 19:31:47 UTC (rev 10783)
@@ -1,28 +1,32 @@
-Source: cglib2.1
+Source: cglib
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Torsten Werner <twerner at debian.org>, Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at drazzib.com>
-Build-Depends: debhelper (>= 5), cdbs, ant, default-jdk
-Build-Depends-Indep: libasm-java, libaspectwerkz2-java, junit
-Standards-Version: 3.8.2
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Torsten Werner <twerner at debian.org>,
+ Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk, quilt
+Build-Depends-Indep: libasm3-java, junit
+Standards-Version: 3.8.3
Homepage: http://cglib.sourceforge.net
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/cglib2.1/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cglib2.1
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/cglib/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cglib
-Package: libcglib2.1-java
+Package: libcglib-java
Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java2-runtime, libasm-java
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime, libasm3-java
+Conflicts: libcglib2.1-java
+Provides: libcglib2.1-java
+Replaces: libcglib2.1-java
Description: code generation library for Java
cglib is a powerful, high performance and quality code generation
library. It is used to extend Java classes and implement interfaces at
run-time.
-Package: libcglib2.1-java-doc
+Package: libcglib-java-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Suggests: libcglib2.1-java
+Suggests: libcglib-java
Description: code generation library for Java - documentation
cglib is a powerful, high performance and quality code generation
library. It is used to extend Java classes and implement interfaces at
Modified: trunk/cglib/debian/copyright
===================================================================
--- trunk/cglib2.1/debian/copyright 2009-10-07 14:17:26 UTC (rev 10781)
+++ trunk/cglib/debian/copyright 2009-10-08 19:31:47 UTC (rev 10783)
@@ -11,6 +11,8 @@
(C) 2000-2005 INRIA, France Telecom (one source file
from the ASM project)
+License: Apache 2.0
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -23,5 +25,40 @@
See the License for the specific language governing permissions and
limitations under the License.
-The full text of the Apache License can be found in
-`/usr/share/common-licenses/Apache-2.0'.
+ The full text of the Apache License can be found in
+ `/usr/share/common-licenses/Apache-2.0'.
+
+
+-------------------
+src/proxy/net/sf/cglib/core/LocalVariablesSorter.java
+License: BSD (3 clauses)
+
+ ASM: a very small and fast Java bytecode manipulation framework
+ Copyright (c) 2000-2005 INRIA, France Telecom
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 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. Neither the name of the copyright holders 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.
+
+
Copied: trunk/cglib/debian/libcglib-java-doc.doc-base (from rev 10781, trunk/cglib2.1/debian/libcglib2.1-java-doc.doc-base)
===================================================================
--- trunk/cglib/debian/libcglib-java-doc.doc-base (rev 0)
+++ trunk/cglib/debian/libcglib-java-doc.doc-base 2009-10-08 19:31:47 UTC (rev 10783)
@@ -0,0 +1,11 @@
+Document: libcglib-java-doc
+Title: code generation library for Java
+Author: Juozas Baliuka, Chris Nokleberg
+Abstract: cglib is a powerful, high performance and quality code generation
+ library. It is used to extend Java classes and implement interfaces at
+ run-time.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libcglib-java/api/index.html
+Files: /usr/share/doc/libcglib-java/api/*.html
Copied: trunk/cglib/debian/libcglib-java-doc.install (from rev 10781, trunk/cglib2.1/debian/libcglib2.1-java-doc.docs)
===================================================================
--- trunk/cglib/debian/libcglib-java-doc.install (rev 0)
+++ trunk/cglib/debian/libcglib-java-doc.install 2009-10-08 19:31:47 UTC (rev 10783)
@@ -0,0 +1 @@
+docs/* /usr/share/doc/libcglib-java/api/
Copied: trunk/cglib/debian/libcglib-java.install (from rev 10781, trunk/cglib2.1/debian/libcglib2.1-java.install)
===================================================================
--- trunk/cglib/debian/libcglib-java.install (rev 0)
+++ trunk/cglib/debian/libcglib-java.install 2009-10-08 19:31:47 UTC (rev 10783)
@@ -0,0 +1 @@
+dist/cglib-*.jar /usr/share/java/
Deleted: trunk/cglib/debian/libcglib2.1-java-doc.doc-base
===================================================================
--- trunk/cglib2.1/debian/libcglib2.1-java-doc.doc-base 2009-10-07 14:17:26 UTC (rev 10781)
+++ trunk/cglib/debian/libcglib2.1-java-doc.doc-base 2009-10-08 19:31:47 UTC (rev 10783)
@@ -1,11 +0,0 @@
-Document: libcglib2.1-java-doc
-Title: code generation library for Java
-Author: Juozas Baliuka, Chris Nokleberg
-Abstract: cglib is a powerful, high performance and quality code generation
- library. It is used to extend Java classes and implement interfaces at
- run-time.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libcglib2.1-java-doc/index.html
-Files: /usr/share/doc/libcglib2.1-java-doc/*.html
Deleted: trunk/cglib/debian/libcglib2.1-java-doc.docs
===================================================================
--- trunk/cglib2.1/debian/libcglib2.1-java-doc.docs 2009-10-07 14:17:26 UTC (rev 10781)
+++ trunk/cglib/debian/libcglib2.1-java-doc.docs 2009-10-08 19:31:47 UTC (rev 10783)
@@ -1 +0,0 @@
-docs/*
Deleted: trunk/cglib/debian/libcglib2.1-java.install
===================================================================
--- trunk/cglib2.1/debian/libcglib2.1-java.install 2009-10-07 14:17:26 UTC (rev 10781)
+++ trunk/cglib/debian/libcglib2.1-java.install 2009-10-08 19:31:47 UTC (rev 10783)
@@ -1 +0,0 @@
-dist/cglib-*.jar /usr/share/java/
Deleted: trunk/cglib/debian/patches/01_build_classpath.patch
===================================================================
--- trunk/cglib2.1/debian/patches/01_build_classpath.patch 2009-10-07 14:17:26 UTC (rev 10781)
+++ trunk/cglib/debian/patches/01_build_classpath.patch 2009-10-08 19:31:47 UTC (rev 10783)
@@ -1,28 +0,0 @@
---- build.xml.orig 2007-04-10 16:13:55.000000000 +0000
-+++ build.xml 2007-04-10 16:16:18.000000000 +0000
-@@ -37,11 +37,22 @@
- <property name="compile.deprecation" value="true"/>
- <property name="compile.optimize" value="true"/>
-
-+ <!-- dependencies -->
-+ <property name="asm-attrs.jar" value="lib/asm-attrs.jar"/>
-+ <property name="asm-util.jar" value="lib/asm-util.jar"/>
-+ <property name="asm.jar" value="lib/asm.jar"/>
-+ <property name="aspectwerkz-core.jar" value="lib/aspectwerkz-core-0.10.RC1.jar"/>
-+ <property name="junit.jar" value="lib/junit.jar"/>
-+ <property name="jarjar.jar" value="lib/jarjar.jar"/>
-+
- <path id="compile.classpath">
- <pathelement location="${build.home}/classes"/>
-- <fileset dir="./lib">
-- <include name="*.jar"/>
-- </fileset>
-+ <pathelement path="{asm-attrs.jar}"/>
-+ <pathelement path="{asm-util.jar}"/>
-+ <pathelement path="{asm.jar}"/>
-+ <pathelement path="{aspectwerkz-core.jar}"/>
-+ <pathelement path="{junit.jar}"/>
-+ <pathelement path="{jarjar.jar}"/>
- </path>
-
- <path id="javadoc.path">
Modified: trunk/cglib/debian/patches/02_build_split.patch
===================================================================
--- trunk/cglib2.1/debian/patches/02_build_split.patch 2009-10-07 14:17:26 UTC (rev 10781)
+++ trunk/cglib/debian/patches/02_build_split.patch 2009-10-08 19:31:47 UTC (rev 10783)
@@ -1,31 +1,39 @@
---- build.xml.old 2007-04-10 16:01:23.000000000 +0000
-+++ build.xml 2007-04-10 16:05:27.000000000 +0000
-@@ -110,19 +110,27 @@
-
- <target depends="jar" name="proxy"/>
-
-- <target depends="compile" description="Create binary distribution" name="jar">
-+ <target depends="jardep,jarnodep" description="Create binary distribution" name="jar"/>
-+
-+ <target depends="compile" description="Prepare binary distribution" name="preparejar">
- <mkdir dir="${dist.home}"/>
- <mkdir dir="${build.home}/src"/>
-
-
- <copy file="LICENSE" todir="${build.home}/classes"/>
- <copy file="NOTICE" todir="${build.home}/classes"/>
-+ </target>
-
-+ <target depends="preparejar" description="Create binary distribution
-+ without dependency" name="jardep">
- <jar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-${component.version}.jar" >
- <include name="**/*"/>
- <exclude name="samples/**" />
- </jar>
-+ </target>
-
-+ <target depends="preparejar" description="Create binary distribution
-+ with dependency" name="jarnodep">
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>
- <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >
- <zipfileset dir="lib" includes="asm*.txt"/>
+Description: Split ant targets to get a simple cglib jar without
+ bundled dependencies.
+ - jarnodep: simple cglib jar (target used by debian/rules)
+ - jardep: bundled cglib jar using jarjar tool
+Forwarded: not-needed
+Author: Arnaud Vandyck <avdyk at debian.org>
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-10-08
+--- a/build.xml
++++ b/build.xml
+@@ -111,19 +111,27 @@
+
+ <target depends="jar" name="proxy"/>
+
+- <target depends="compile" description="Create binary distribution" name="jar">
++ <target depends="jardep,jarnodep" description="Create binary distribution" name="jar"/>
++
++ <target depends="compile" description="Create binary distribution" name="preparejar">
+ <mkdir dir="${dist.home}"/>
+ <mkdir dir="${build.home}/src"/>
+
+
+ <copy file="LICENSE" todir="${build.home}/classes"/>
+ <copy file="NOTICE" todir="${build.home}/classes"/>
++ </target>
+
++ <target depends="preparejar" description="Create binary distribution
++ without dependency" name="jardep">
+ <jar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-${component.version}.jar" >
+ <include name="**/*"/>
+ <exclude name="samples/**" />
+ </jar>
++ </target>
+
++ <target depends="preparejar" description="Create binary distribution
++ with dependency" name="jarnodep">
+ <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>
+ <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >
+ <zipfileset dir="lib" includes="asm*.txt"/>
Added: trunk/cglib/debian/patches/series
===================================================================
--- trunk/cglib/debian/patches/series (rev 0)
+++ trunk/cglib/debian/patches/series 2009-10-08 19:31:47 UTC (rev 10783)
@@ -0,0 +1 @@
+02_build_split.patch
Modified: trunk/cglib/debian/rules
===================================================================
--- trunk/cglib2.1/debian/rules 2009-10-07 14:17:26 UTC (rev 10781)
+++ trunk/cglib/debian/rules 2009-10-08 19:31:47 UTC (rev 10783)
@@ -1,21 +1,20 @@
#!/usr/bin/make -f
-# debian/rules file for c3p0 (uses cdbs)
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
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-# the upstream version without the .dfsg* suffix:
-VERSION := `expr match $(DEB_UPSTREAM_VERSION) '\(.*\)\.dfsg.*'`
+# the upstream version without the +dfsg suffix:
+VERSION := `expr match $(DEB_UPSTREAM_VERSION) '\(.*\)+dfsg'`
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := asm-attrs asm asm-util junit aspectwerkz aspectwerkz-core
+DEB_JARS := asm3-attrs asm3 asm3-util junit
DEB_ANT_BUILD_TARGET := jardep javadoc
DEB_ANT_ARGS += -Dcomponent.version=$(VERSION)
JAR_DIR := /usr/share/java
-install/libcglib2.1-java::
- dh_link -plibcglib2.1-java $(JAR_DIR)/cglib-$(VERSION).jar \
+install/libcglib-java::
+ dh_link -plibcglib-java $(JAR_DIR)/cglib-$(VERSION).jar \
$(JAR_DIR)/cglib.jar
get-orig-source:
More information about the pkg-java-commits
mailing list