[pkg-java] r9460 - trunk/bcel/debian

Ludovic Claude ludovicc-guest at alioth.debian.org
Sun Aug 2 14:04:49 UTC 2009


Author: ludovicc-guest
Date: 2009-08-02 14:04:48 +0000 (Sun, 02 Aug 2009)
New Revision: 9460

Added:
   trunk/bcel/debian/libbcel-java-doc.docs
   trunk/bcel/debian/libbcel-java.poms
   trunk/bcel/debian/maven.publishedRules
   trunk/bcel/debian/maven.rules
   trunk/bcel/debian/pom.xml
Removed:
   trunk/bcel/debian/libbcel-java.install
   trunk/bcel/debian/libbcel-java.links
Modified:
   trunk/bcel/debian/changelog
   trunk/bcel/debian/control
   trunk/bcel/debian/rules
Log:
* Add the Maven POM to the package
* Add a Build-Depends-Indep dependency on maven-repo-helper
* Add ${misc:Depends} to Depends to clear Lintian warnings
* Drop the dependency on libxerces2-java-doc on the
  libbcel-java-doc package as xerces2 is not a runtime dependency
  for bcel, in fact xerces is not used at all in bcel's code. 
  It caused lots of confusion in Ubuntu for nothing - see LP #190247.
* Add libbcel-java-doc.docs to ship to real docs for a change.
* Move the API docs to /usr/share/java/libbcel-java/api
* Remove the link to bcel.jar installed in /usr/share/ant/lib, modify
  ant at the same time to install by itself this link

Modified: trunk/bcel/debian/changelog
===================================================================
--- trunk/bcel/debian/changelog	2009-08-02 13:31:17 UTC (rev 9459)
+++ trunk/bcel/debian/changelog	2009-08-02 14:04:48 UTC (rev 9460)
@@ -1,3 +1,19 @@
+bcel (5.2-5) experimental; urgency=low
+
+  * Add the Maven POM to the package
+  * Add a Build-Depends-Indep dependency on maven-repo-helper
+  * Add ${misc:Depends} to Depends to clear Lintian warnings
+  * Drop the dependency on libxerces2-java-doc on the
+    libbcel-java-doc package as xerces2 is not a runtime dependency
+    for bcel, in fact xerces is not used at all in bcel's code. 
+    It caused lots of confusion in Ubuntu for nothing - see LP #190247.
+  * Add libbcel-java-doc.docs to ship to real docs for a change.
+  * Move the API docs to /usr/share/java/libbcel-java/api
+  * Remove the link to bcel.jar installed in /usr/share/ant/lib, modify
+    ant at the same time to install by itself this link
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 22 Jul 2009 17:53:47 +0100
+
 bcel (5.2-4) unstable; urgency=low
 
   [ Matthias Klose ]

Modified: trunk/bcel/debian/control
===================================================================
--- trunk/bcel/debian/control	2009-08-02 13:31:17 UTC (rev 9459)
+++ trunk/bcel/debian/control	2009-08-02 14:04:48 UTC (rev 9460)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Wolfgang Baer <WBaer at gmx.de>, Paul Cager <paul-debian at home.paulcager.org>, Torsten Werner <twerner at debian.org>
-Build-Depends-Indep:  default-jdk, libregexp-java, libxerces2-java
+Build-Depends-Indep: maven-repo-helper, default-jdk, libregexp-java, libxerces2-java, openjdk-6-doc
 Build-Depends: ant (>= 1.6.5), cdbs (>= 0.4.5.3), debhelper (>= 5)
 Standards-Version: 3.8.2
 Homepage: http://jakarta.apache.org/bcel/
@@ -31,7 +31,7 @@
 Package: libbcel-java-doc
 Architecture: all
 Section: doc
-Depends: openjdk-6-doc | classpath-doc, libxerces2-java-doc, ${misc:Depends}
+Depends: ${misc:Depends}, openjdk-6-doc | classpath-doc
 Suggests: libbcel-java
 Description: Documentation for Byte Code Engineering Library (BCEL)
  Documentation for the BCEL Java library which is used to manipulate Java 

Added: trunk/bcel/debian/libbcel-java-doc.docs
===================================================================
--- trunk/bcel/debian/libbcel-java-doc.docs	                        (rev 0)
+++ trunk/bcel/debian/libbcel-java-doc.docs	2009-08-02 14:04:48 UTC (rev 9460)
@@ -0,0 +1 @@
+dist/docs/api

Deleted: trunk/bcel/debian/libbcel-java.install
===================================================================
--- trunk/bcel/debian/libbcel-java.install	2009-08-02 13:31:17 UTC (rev 9459)
+++ trunk/bcel/debian/libbcel-java.install	2009-08-02 14:04:48 UTC (rev 9460)
@@ -1 +0,0 @@
-target/bcel-5.2.jar usr/share/java

Deleted: trunk/bcel/debian/libbcel-java.links
===================================================================
--- trunk/bcel/debian/libbcel-java.links	2009-08-02 13:31:17 UTC (rev 9459)
+++ trunk/bcel/debian/libbcel-java.links	2009-08-02 14:04:48 UTC (rev 9460)
@@ -1,2 +0,0 @@
-/usr/share/java/bcel-5.2.jar /usr/share/java/bcel.jar
-/usr/share/java/bcel.jar /usr/share/ant/lib/bcel.jar

Added: trunk/bcel/debian/libbcel-java.poms
===================================================================
--- trunk/bcel/debian/libbcel-java.poms	                        (rev 0)
+++ trunk/bcel/debian/libbcel-java.poms	2009-08-02 14:04:48 UTC (rev 9460)
@@ -0,0 +1 @@
+debian/pom.xml --no-parent

Added: trunk/bcel/debian/maven.publishedRules
===================================================================
--- trunk/bcel/debian/maven.publishedRules	                        (rev 0)
+++ trunk/bcel/debian/maven.publishedRules	2009-08-02 14:04:48 UTC (rev 9460)
@@ -0,0 +1 @@
+s/bcel/org.apache.bcel/ bcel jar s/5\..*/5.x/

Added: trunk/bcel/debian/maven.rules
===================================================================
--- trunk/bcel/debian/maven.rules	                        (rev 0)
+++ trunk/bcel/debian/maven.rules	2009-08-02 14:04:48 UTC (rev 9460)
@@ -0,0 +1 @@
+org.apache.bcel bcel jar s/5\..*/5.x/

Added: trunk/bcel/debian/pom.xml
===================================================================
--- trunk/bcel/debian/pom.xml	                        (rev 0)
+++ trunk/bcel/debian/pom.xml	2009-08-02 14:04:48 UTC (rev 9460)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.bcel</groupId>
+  <artifactId>bcel</artifactId>
+  <packaging>jar</packaging>
+  <version>5.2</version>
+
+  <dependencies>
+    <dependency>
+      <groupId>jakarta-regexp</groupId>
+      <artifactId>jakarta-regexp</artifactId>
+      <version>1.4</version>
+    </dependency>
+  </dependencies>
+
+</project>

Modified: trunk/bcel/debian/rules
===================================================================
--- trunk/bcel/debian/rules	2009-08-02 13:31:17 UTC (rev 9459)
+++ trunk/bcel/debian/rules	2009-08-02 14:04:48 UTC (rev 9460)
@@ -5,11 +5,20 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
-ANT_HOME             := /usr/share/ant
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar xmlParserAPIs xercesImpl regexp
 DEB_ANT_BUILD_TARGET := dist
 
+install/lib$(PACKAGE)-java::
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l debian/pom.xml target/bcel-$(VERSION).jar usr/share/ant/lib/bcel.jar
+
 clean::
 	rm -rf target dist
+	-rm -rf debian/tmp
 
+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