[pkg-java] r13394 - in tags/cglib: . 2.2+dfsg-3/debian 2.2+dfsg-3/debian/patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Sun Mar 6 01:02:44 UTC 2011
Author: drazzib
Date: 2011-03-06 01:02:37 +0000 (Sun, 06 Mar 2011)
New Revision: 13394
Added:
tags/cglib/2.2+dfsg-3/
tags/cglib/2.2+dfsg-3/debian/changelog
tags/cglib/2.2+dfsg-3/debian/control
tags/cglib/2.2+dfsg-3/debian/patches/03_jarjar.diff
tags/cglib/2.2+dfsg-3/debian/patches/series
tags/cglib/2.2+dfsg-3/debian/rules
Removed:
tags/cglib/2.2+dfsg-3/debian/changelog
tags/cglib/2.2+dfsg-3/debian/control
tags/cglib/2.2+dfsg-3/debian/patches/02_build_split.patch
tags/cglib/2.2+dfsg-3/debian/patches/series
tags/cglib/2.2+dfsg-3/debian/rules
Log:
[svn-buildpackage] Tagging cglib 2.2+dfsg-3
Deleted: tags/cglib/2.2+dfsg-3/debian/changelog
===================================================================
--- trunk/cglib/debian/changelog 2011-03-05 17:39:11 UTC (rev 13385)
+++ tags/cglib/2.2+dfsg-3/debian/changelog 2011-03-06 01:02:37 UTC (rev 13394)
@@ -1,94 +0,0 @@
-cglib (2.2+dfsg-2) unstable; urgency=low
-
- [ Gabriele Giacone ]
- * Added Maven Support
- * Standards-Version to 3.8.4
- * Source format 3.0 (quilt)
-
- [ Damien Raude-Morvan ]
- * Remove Arnaud Vandyck from Uploaders
- * Source format 3.0 (quilt):
- - Remove patchsys-quilt.mk from d/rules
- - Rework d/README.source
- * Maven Support:
- - Add "get-orig-pom" target in d/rules to update pom.xml
- * Remove d/README.Debian (already included in d/README.source)
-
- -- Damien Raude-Morvan <drazzib at debian.org> Tue, 16 Mar 2010 20:42:36 +0100
-
-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 debian.org> Thu, 08 Oct 2009 21:23:45 +0200
-
-cglib2.1 (2.1.3.dfsg.2-2) unstable; urgency=low
-
- * Use default-java-builddep:
- - Remove B-D on java-gcj-compat-dev (Closes: #526274)
- - Add default-java-builddep to B-D
- - Use /usr/lib/jvm/default-java as JAVA_HOME
- * Move ant to B-D-I (needed for clean target)
- * Add myself as Uploaders
- * Add ${misc:Depends} as suggested by Lintian
- * Fix short-description of libcglib2.1-java-doc
- to include "documentation"
- * Fix Vcs-* fields to use "cglib2.1" instead of "cglib"
- * Bump Standards-Version to 3.8.2:
- - Move to "java" section
- - Rename README.Debian-source to README.source
- - Describe patch system usage in README.source
-
- -- Damien Raude-Morvan <drazzib at drazzib.com> Mon, 29 Jun 2009 22:13:35 +0200
-
-cglib2.1 (2.1.3.dfsg.2-1) unstable; urgency=low
-
- * Increase the upstream version number without changing the actual tarball
- to get the package uploaded to main.
-
- -- Torsten Werner <twerner at debian.org> Sun, 10 Aug 2008 22:32:44 +0200
-
-cglib2.1 (2.1.3.dfsg.1-3) unstable; urgency=low
-
- [ Michael Koch ]
- * Use uscan sf.net helper for SourceForge. Fixes upstream checking.
- * Added myself to Uploaders.
-
- [ Torsten Werner ]
- * Move package to main.
- * Reformat debian/copyright for better readability.
- * Do not quote the full text of the Apache License in debian/copyright.
- * Fix doc-base file.
-
- -- Torsten Werner <twerner at debian.org> Thu, 31 Jul 2008 00:18:44 +0200
-
-cglib2.1 (2.1.3.dfsg.1-2) unstable; urgency=low
-
- * Fix debian/watch.
- * Add myself to Uploaders.
- * Add Homepage and Vcs headers to debian/control.
- * Change Standards-Version: 3.7.3.
- * Switch to debhelper 5.
-
- -- Torsten Werner <twerner at debian.org> Mon, 17 Dec 2007 10:47:00 +0100
-
-cglib2.1 (2.1.3.dfsg.1-1) unstable; urgency=low
-
- * Initial Release (closes: #386101).
-
- -- Arnaud Vandyck <avdyk at debian.org> Tue, 10 Apr 2007 17:48:55 +0200
Copied: tags/cglib/2.2+dfsg-3/debian/changelog (from rev 13393, trunk/cglib/debian/changelog)
===================================================================
--- tags/cglib/2.2+dfsg-3/debian/changelog (rev 0)
+++ tags/cglib/2.2+dfsg-3/debian/changelog 2011-03-06 01:02:37 UTC (rev 13394)
@@ -0,0 +1,106 @@
+cglib (2.2+dfsg-3) unstable; urgency=low
+
+ * d/patches/02_build_split.patch: Drop, re-enable cglib-nodep
+ (Closes: #583231).
+ * d/patches/03_jarjar.diff: fix location of asm.jar.
+ * d/control: Build-Depends on libjarjar-java.
+ * d/control: drop Depends en JRE, as its a library.
+ * d/rules: add jarjar to DEB_JARS.
+ * Bump Standards-Version to 3.9.1 (no changes needed).
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 06 Mar 2011 01:57:24 +0100
+
+cglib (2.2+dfsg-2) unstable; urgency=low
+
+ [ Gabriele Giacone ]
+ * Added Maven Support
+ * Standards-Version to 3.8.4
+ * Source format 3.0 (quilt)
+
+ [ Damien Raude-Morvan ]
+ * Remove Arnaud Vandyck from Uploaders
+ * Source format 3.0 (quilt):
+ - Remove patchsys-quilt.mk from d/rules
+ - Rework d/README.source
+ * Maven Support:
+ - Add "get-orig-pom" target in d/rules to update pom.xml
+ * Remove d/README.Debian (already included in d/README.source)
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 16 Mar 2010 20:42:36 +0100
+
+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 debian.org> Thu, 08 Oct 2009 21:23:45 +0200
+
+cglib2.1 (2.1.3.dfsg.2-2) unstable; urgency=low
+
+ * Use default-java-builddep:
+ - Remove B-D on java-gcj-compat-dev (Closes: #526274)
+ - Add default-java-builddep to B-D
+ - Use /usr/lib/jvm/default-java as JAVA_HOME
+ * Move ant to B-D-I (needed for clean target)
+ * Add myself as Uploaders
+ * Add ${misc:Depends} as suggested by Lintian
+ * Fix short-description of libcglib2.1-java-doc
+ to include "documentation"
+ * Fix Vcs-* fields to use "cglib2.1" instead of "cglib"
+ * Bump Standards-Version to 3.8.2:
+ - Move to "java" section
+ - Rename README.Debian-source to README.source
+ - Describe patch system usage in README.source
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Mon, 29 Jun 2009 22:13:35 +0200
+
+cglib2.1 (2.1.3.dfsg.2-1) unstable; urgency=low
+
+ * Increase the upstream version number without changing the actual tarball
+ to get the package uploaded to main.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 10 Aug 2008 22:32:44 +0200
+
+cglib2.1 (2.1.3.dfsg.1-3) unstable; urgency=low
+
+ [ Michael Koch ]
+ * Use uscan sf.net helper for SourceForge. Fixes upstream checking.
+ * Added myself to Uploaders.
+
+ [ Torsten Werner ]
+ * Move package to main.
+ * Reformat debian/copyright for better readability.
+ * Do not quote the full text of the Apache License in debian/copyright.
+ * Fix doc-base file.
+
+ -- Torsten Werner <twerner at debian.org> Thu, 31 Jul 2008 00:18:44 +0200
+
+cglib2.1 (2.1.3.dfsg.1-2) unstable; urgency=low
+
+ * Fix debian/watch.
+ * Add myself to Uploaders.
+ * Add Homepage and Vcs headers to debian/control.
+ * Change Standards-Version: 3.7.3.
+ * Switch to debhelper 5.
+
+ -- Torsten Werner <twerner at debian.org> Mon, 17 Dec 2007 10:47:00 +0100
+
+cglib2.1 (2.1.3.dfsg.1-1) unstable; urgency=low
+
+ * Initial Release (closes: #386101).
+
+ -- Arnaud Vandyck <avdyk at debian.org> Tue, 10 Apr 2007 17:48:55 +0200
Deleted: tags/cglib/2.2+dfsg-3/debian/control
===================================================================
--- trunk/cglib/debian/control 2011-03-05 17:39:11 UTC (rev 13385)
+++ tags/cglib/2.2+dfsg-3/debian/control 2011-03-06 01:02:37 UTC (rev 13394)
@@ -1,35 +0,0 @@
-Source: cglib
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: 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, maven-repo-helper
-Build-Depends-Indep: libasm3-java, junit
-Standards-Version: 3.8.4
-Homepage: http://cglib.sourceforge.net
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/cglib/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cglib
-
-Package: libcglib-java
-Architecture: all
-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: libcglib-java-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-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
- run-time.
- .
- This package includes the documentation.
Copied: tags/cglib/2.2+dfsg-3/debian/control (from rev 13393, trunk/cglib/debian/control)
===================================================================
--- tags/cglib/2.2+dfsg-3/debian/control (rev 0)
+++ tags/cglib/2.2+dfsg-3/debian/control 2011-03-06 01:02:37 UTC (rev 13394)
@@ -0,0 +1,35 @@
+Source: cglib
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: 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, maven-repo-helper
+Build-Depends-Indep: libasm3-java, junit, libjarjar-java
+Standards-Version: 3.9.1
+Homepage: http://cglib.sourceforge.net
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/cglib/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cglib
+
+Package: libcglib-java
+Architecture: all
+Depends: ${misc:Depends}, 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: libcglib-java-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+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
+ run-time.
+ .
+ This package includes the documentation.
Deleted: tags/cglib/2.2+dfsg-3/debian/patches/02_build_split.patch
===================================================================
--- trunk/cglib/debian/patches/02_build_split.patch 2011-03-05 17:39:11 UTC (rev 13385)
+++ tags/cglib/2.2+dfsg-3/debian/patches/02_build_split.patch 2011-03-06 01:02:37 UTC (rev 13394)
@@ -1,39 +0,0 @@
-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"/>
Copied: tags/cglib/2.2+dfsg-3/debian/patches/03_jarjar.diff (from rev 13393, trunk/cglib/debian/patches/03_jarjar.diff)
===================================================================
--- tags/cglib/2.2+dfsg-3/debian/patches/03_jarjar.diff (rev 0)
+++ tags/cglib/2.2+dfsg-3/debian/patches/03_jarjar.diff 2011-03-06 01:02:37 UTC (rev 13394)
@@ -0,0 +1,11 @@
+--- a/build.xml
++++ b/build.xml
+@@ -127,7 +127,7 @@
+ <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"/>
+- <zipfileset src="lib/asm-3.1.jar" excludes="META-INF"/>
++ <zipfileset src="/usr/share/java/asm3-all.jar" excludes="META-INF"/>
+ <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm. at 1"/>
+ <include name="**/*"/>
+ <exclude name="samples/**"/>
Deleted: tags/cglib/2.2+dfsg-3/debian/patches/series
===================================================================
--- trunk/cglib/debian/patches/series 2011-03-05 17:39:11 UTC (rev 13385)
+++ tags/cglib/2.2+dfsg-3/debian/patches/series 2011-03-06 01:02:37 UTC (rev 13394)
@@ -1 +0,0 @@
-02_build_split.patch
Copied: tags/cglib/2.2+dfsg-3/debian/patches/series (from rev 13393, trunk/cglib/debian/patches/series)
===================================================================
--- tags/cglib/2.2+dfsg-3/debian/patches/series (rev 0)
+++ tags/cglib/2.2+dfsg-3/debian/patches/series 2011-03-06 01:02:37 UTC (rev 13394)
@@ -0,0 +1 @@
+03_jarjar.diff
Deleted: tags/cglib/2.2+dfsg-3/debian/rules
===================================================================
--- trunk/cglib/debian/rules 2011-03-05 17:39:11 UTC (rev 13385)
+++ tags/cglib/2.2+dfsg-3/debian/rules 2011-03-06 01:02:37 UTC (rev 13394)
@@ -1,28 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-# the upstream version without the +dfsg suffix:
-VERSION := `expr match $(DEB_UPSTREAM_VERSION) '\(.*\)+dfsg'`
-
-POM_VERSION := 2.2
-MAVEN_REPO := http://repository.sonatype.org/service/local/repositories/central/content
-
-JAVA_HOME := /usr/lib/jvm/default-java
-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/libcglib-java::
- mh_installpom -v -o -e$(VERSION) -plibcglib-java debian/pom.xml; \
- mh_installjar -l -i$(VERSION) -plibcglib-java debian/pom.xml \
- dist/cglib-$(VERSION).jar;
-
-get-orig-source:
- uscan --upstream-version 0 --rename
-
-get-orig-pom:
- wget -O debian/pom.xml $(MAVEN_REPO)/cglib/cglib/$(POM_VERSION)/cglib-$(POM_VERSION).pom
- perl -p -i -e 's/<version>$(POM_VERSION)/<version>'$(VERSION)'/' debian/pom.xml
Copied: tags/cglib/2.2+dfsg-3/debian/rules (from rev 13393, trunk/cglib/debian/rules)
===================================================================
--- tags/cglib/2.2+dfsg-3/debian/rules (rev 0)
+++ tags/cglib/2.2+dfsg-3/debian/rules 2011-03-06 01:02:37 UTC (rev 13394)
@@ -0,0 +1,30 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+# the upstream version without the +dfsg suffix:
+VERSION := `expr match $(DEB_UPSTREAM_VERSION) '\(.*\)+dfsg'`
+
+POM_VERSION := 2.2
+MAVEN_REPO := http://repository.sonatype.org/service/local/repositories/central/content
+
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := asm3-attrs asm3 asm3-util junit jarjar
+DEB_ANT_BUILD_TARGET := jar javadoc
+DEB_ANT_ARGS += -Dcomponent.version=$(VERSION)
+JAR_DIR := /usr/share/java
+
+install/libcglib-java::
+ mh_installpom -v -o -e$(VERSION) -plibcglib-java debian/pom.xml; \
+ mh_installjar -l -i$(VERSION) -plibcglib-java debian/pom.xml \
+ dist/cglib-$(VERSION).jar;
+ mh_installjar -l -i$(VERSION) -plibcglib-java -ncglib-nodep debian/pom.xml \
+ dist/cglib-nodep-$(VERSION).jar;
+
+get-orig-source:
+ uscan --upstream-version 0 --rename
+
+get-orig-pom:
+ wget -O debian/pom.xml $(MAVEN_REPO)/cglib/cglib/$(POM_VERSION)/cglib-$(POM_VERSION).pom
+ perl -p -i -e 's/<version>$(POM_VERSION)/<version>'$(VERSION)'/' debian/pom.xml
More information about the pkg-java-commits
mailing list