[pkg-java] r4384 - trunk/cglib2.1/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2007-10-13 17:34:33 +0000 (Sat, 13 Oct 2007)
New Revision: 4384

Removed:
   trunk/cglib2.1/debian/libcglib2.1-java.dirs
   trunk/cglib2.1/debian/libcglib2.1-java.links
Modified:
   trunk/cglib2.1/debian/control
   trunk/cglib2.1/debian/libcglib2.1-java.install
   trunk/cglib2.1/debian/rules
Log:
* source package builds now
* -doc package is still incomplete


Modified: trunk/cglib2.1/debian/control
===================================================================
--- trunk/cglib2.1/debian/control	2007-10-13 17:16:07 UTC (rev 4383)
+++ trunk/cglib2.1/debian/control	2007-10-13 17:34:33 UTC (rev 4384)
@@ -3,7 +3,9 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: debhelper (>= 4.2.30), java-gcj-compat-dev (>= 1.0.69-2), ant, cdbs, libasm-java, junit
+Build-Depends: debhelper (>= 4.2.30), cdbs
+Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.69-2), ant,
+ libasm-java, libaspectwerkz2-java, junit
 Standards-Version: 3.7.2
 
 Package: libcglib2.1-java

Deleted: trunk/cglib2.1/debian/libcglib2.1-java.dirs
===================================================================
--- trunk/cglib2.1/debian/libcglib2.1-java.dirs	2007-10-13 17:16:07 UTC (rev 4383)
+++ trunk/cglib2.1/debian/libcglib2.1-java.dirs	2007-10-13 17:34:33 UTC (rev 4384)
@@ -1 +0,0 @@
-usr/share/java

Modified: trunk/cglib2.1/debian/libcglib2.1-java.install
===================================================================
--- trunk/cglib2.1/debian/libcglib2.1-java.install	2007-10-13 17:16:07 UTC (rev 4383)
+++ trunk/cglib2.1/debian/libcglib2.1-java.install	2007-10-13 17:34:33 UTC (rev 4384)
@@ -1 +1 @@
-build/cglib-2.1.jar			/usr/share/java/
+dist/cglib-*.jar			/usr/share/java/

Deleted: trunk/cglib2.1/debian/libcglib2.1-java.links
===================================================================
--- trunk/cglib2.1/debian/libcglib2.1-java.links	2007-10-13 17:16:07 UTC (rev 4383)
+++ trunk/cglib2.1/debian/libcglib2.1-java.links	2007-10-13 17:34:33 UTC (rev 4384)
@@ -1 +0,0 @@
-/usr/share/java/cglib-2.1.jar	/usr/share/java/cglib.jar

Modified: trunk/cglib2.1/debian/rules
===================================================================
--- trunk/cglib2.1/debian/rules	2007-10-13 17:16:07 UTC (rev 4383)
+++ trunk/cglib2.1/debian/rules	2007-10-13 17:34:33 UTC (rev 4384)
@@ -1,21 +1,23 @@
 #!/usr/bin/make -f
 # debian/rules file for c3p0 (uses cdbs)
 
-export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
-
 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
 
+# the upstream version without the .dfsg* suffix:
+VERSION   := `expr match $(DEB_UPSTREAM_VERSION) '\(.*\)\.dfsg.*'`
+
 JAVA_HOME := /usr/lib/jvm/java-gcj/
-ANT_HOME := /usr/share/ant
+DEB_JARS  := asm-attrs asm asm-util junit aspectwerkz aspectwerkz-core
+DEB_ANT_BUILD_TARGET := jardep javadoc
+DEB_ANT_ARGS         += -Dcomponent.version=$(VERSION)
+JAR_DIR   := /usr/share/java
 
-DEB_JARS := asm-attrs-1.5.3 asm-1.5.3 asm-util-1.5.3 junit
-DEB_ANT_BUILD_TARGET := jardep javadocs
+install/libcglib2.1-java::
+	dh_link -plibcglib2.1-java $(JAR_DIR)/cglib-$(VERSION).jar \
+	  $(JAR_DIR)/cglib.jar
 
-#clean::
-#	-rm -rf build
-
 get-orig-source:
 	uscan --upstream-version 0 --rename