[pkg-java] r13133 - in trunk/bcel/debian: . patches
Niels Thykier
nthykier at alioth.debian.org
Fri Dec 3 11:29:51 UTC 2010
Author: nthykier
Date: 2010-12-03 11:29:50 +0000 (Fri, 03 Dec 2010)
New Revision: 13133
Modified:
trunk/bcel/debian/changelog
trunk/bcel/debian/compat
trunk/bcel/debian/control
trunk/bcel/debian/patches/build.xml.patch
trunk/bcel/debian/patches/manifest.patch
trunk/bcel/debian/rules
Log:
bcel (5.2-8) UNRELEASED; urgency=low
* Team upload.
* Updated javadoc linking to work with default-jdk-doc.
* Use javahelper to calculate the recommends for the jacvadoc.
* Added patch description to patches.
* Updated the version number in the manifest.
* Made patches compatible with quilt.
* Bumped debhelper compat to 7.
* Use mh_clean to clean up after the mh_* commands.
-- Niels Thykier <niels at thykier.net> Fri, 03 Dec 2010 12:15:08 +0100
Modified: trunk/bcel/debian/changelog
===================================================================
--- trunk/bcel/debian/changelog 2010-12-02 22:57:24 UTC (rev 13132)
+++ trunk/bcel/debian/changelog 2010-12-03 11:29:50 UTC (rev 13133)
@@ -1,3 +1,16 @@
+bcel (5.2-8) UNRELEASED; urgency=low
+
+ * Team upload.
+ * Updated javadoc linking to work with default-jdk-doc.
+ * Use javahelper to calculate the recommends for the jacvadoc.
+ * Added patch description to patches.
+ * Updated the version number in the manifest.
+ * Made patches compatible with quilt.
+ * Bumped debhelper compat to 7.
+ * Use mh_clean to clean up after the mh_* commands.
+
+ -- Niels Thykier <niels at thykier.net> Fri, 03 Dec 2010 12:15:08 +0100
+
bcel (5.2-7) unstable; urgency=low
* Change the (Build-)Depends for the jdk's doc package to default-jdk-doc.
Modified: trunk/bcel/debian/compat
===================================================================
--- trunk/bcel/debian/compat 2010-12-02 22:57:24 UTC (rev 13132)
+++ trunk/bcel/debian/compat 2010-12-03 11:29:50 UTC (rev 13133)
@@ -1 +1 @@
-5
+7
Modified: trunk/bcel/debian/control
===================================================================
--- trunk/bcel/debian/control 2010-12-02 22:57:24 UTC (rev 13132)
+++ trunk/bcel/debian/control 2010-12-03 11:29:50 UTC (rev 13133)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>
-Build-Depends-Indep: maven-repo-helper, default-jdk, libregexp-java, libxerces2-java, default-jdk-doc
-Build-Depends: ant (>= 1.6.5), cdbs (>= 0.4.5.3), debhelper (>= 5)
+Build-Depends-Indep: maven-repo-helper, default-jdk, libregexp-java, libxerces2-java, default-jdk-doc, javahelper (>= 0.32~)
+Build-Depends: ant (>= 1.6.5), cdbs (>= 0.4.5.3), debhelper (>= 7)
Standards-Version: 3.8.4
Homepage: http://jakarta.apache.org/bcel/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/bcel
@@ -12,7 +12,7 @@
Package: libbcel-java
Architecture: all
-Depends: libregexp-java, ${misc:Depends}
+Depends: libregexp-java, ${misc:Depends}, ${java:Depends}
Suggests: libbcel-java-doc
Description: Analyze, create, and manipulate (binary) Java class files
The Byte Code Engineering Library is intended to give users a convenient
@@ -31,8 +31,8 @@
Package: libbcel-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}
-Recommends: default-jdk-doc
+Depends: ${misc:Depends}, ${java:Depends}
+Recommends: ${java:Recommends}
Suggests: libbcel-java
Description: Documentation for Byte Code Engineering Library (BCEL)
Documentation for the BCEL Java library which is used to manipulate Java
Modified: trunk/bcel/debian/patches/build.xml.patch
===================================================================
--- trunk/bcel/debian/patches/build.xml.patch 2010-12-02 22:57:24 UTC (rev 13132)
+++ trunk/bcel/debian/patches/build.xml.patch 2010-12-03 11:29:50 UTC (rev 13133)
@@ -1,5 +1,8 @@
---- build.xml 2006-06-03 04:48:22.000000000 +0100
-+++ build.xml.patched 2007-01-09 11:12:59.000000000 +0000
+Description: Disable fetching files from the net and link
+ javadoc against system javadoc.
+
+--- a/build.xml 2006-06-03 04:48:22.000000000 +0100
++++ b/build.xml 2007-01-09 11:12:59.000000000 +0000
@@ -108,10 +108,4 @@
</javadoc>
</target>
@@ -11,13 +14,13 @@
- <get dest="${libdir}/regexp-1.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/regexp/jars/regexp-1.2.jar">
- </get>
</target>
---- build.xml 2007-01-14 22:11:59.000000000 +0000
-+++ build.xml.patched 2007-01-14 22:21:35.000000000 +0000
+--- a/build.xml 2007-01-14 22:11:59.000000000 +0000
++++ b/build.xml 2007-01-14 22:21:35.000000000 +00x00
@@ -105,6 +105,7 @@
<path refid="build.classpath">
</path>
</classpath>
-+ <link offline="true" packagelistLoc="/usr/share/doc/classpath-doc/api" href="/usr/share/doc/classpath-doc/api/" />
++ <link href="/usr/share/doc/default-jdk-doc/api/" />
</javadoc>
</target>
<target name="get-deps" unless="noget" depends="init">
Modified: trunk/bcel/debian/patches/manifest.patch
===================================================================
--- trunk/bcel/debian/patches/manifest.patch 2010-12-02 22:57:24 UTC (rev 13132)
+++ trunk/bcel/debian/patches/manifest.patch 2010-12-03 11:29:50 UTC (rev 13133)
@@ -1,14 +1,16 @@
---- manifest.txt.new 1970-01-01 00:00:00.000000000 +0000
-+++ manifest.txt 2005-03-09 17:14:22.000000000 +0000
+Description: Add manifest.
+
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ b/manifest.txt 2005-03-09 17:14:22.000000000 +0000
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Package: org.apache.bcel
+
+Name: org.apache.bcel
+Specification-Title: bcel
-+Specification-Version: 5.1
++Specification-Version: 5.2
+Specification-Vendor: Apache Software Foundation
+Implementation-Title: org.apache.bcel
-+Implementation-Version: 5.1
++Implementation-Version: 5.2
+Implementation-Vendor: Apache Software Foundation
+
Modified: trunk/bcel/debian/rules
===================================================================
--- trunk/bcel/debian/rules 2010-12-02 22:57:24 UTC (rev 13132)
+++ trunk/bcel/debian/rules 2010-12-03 11:29:50 UTC (rev 13133)
@@ -3,6 +3,7 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/javahelper.mk
include /usr/share/cdbs/1/class/ant.mk
PACKAGE := $(DEB_SOURCE_PACKAGE)
@@ -17,7 +18,7 @@
clean::
rm -rf target dist
- -rm -rf debian/tmp
+ mh_clean
get-orig-pom:
wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/org/apache/bcel/bcel/$(VERSION)/bcel-$(VERSION).pom
More information about the pkg-java-commits
mailing list