[pkg-java] r11908 - trunk/aspectj/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-03-20 23:30:11 +0000 (Sat, 20 Mar 2010)
New Revision: 11908

Removed:
   trunk/aspectj/debian/aspectj.install
Modified:
   trunk/aspectj/debian/README.source
   trunk/aspectj/debian/changelog
   trunk/aspectj/debian/control
   trunk/aspectj/debian/rules
Log:
* Add Maven support:
  - debian/control: Build-Depends on maven-repo-helper
  - debian/rules: Use mh_installpoms and mh_installjar
  - Remove debian/aspectj.install
* debian/README.source: Remove stuff about quilt

Modified: trunk/aspectj/debian/README.source
===================================================================
--- trunk/aspectj/debian/README.source	2010-03-20 23:05:32 UTC (rev 11907)
+++ trunk/aspectj/debian/README.source	2010-03-20 23:30:11 UTC (rev 11908)
@@ -1,13 +1,3 @@
-Patch System
-============
-
-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.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
-
-
 Original AspectJ tarball repack
 ===============================
 

Deleted: trunk/aspectj/debian/aspectj.install
===================================================================
--- trunk/aspectj/debian/aspectj.install	2010-03-20 23:05:32 UTC (rev 11907)
+++ trunk/aspectj/debian/aspectj.install	2010-03-20 23:30:11 UTC (rev 11908)
@@ -1 +0,0 @@
-org.aspectj/modules/aj-build/dist/tools/lib/aspectj*.jar usr/share/java

Modified: trunk/aspectj/debian/changelog
===================================================================
--- trunk/aspectj/debian/changelog	2010-03-20 23:05:32 UTC (rev 11907)
+++ trunk/aspectj/debian/changelog	2010-03-20 23:30:11 UTC (rev 11908)
@@ -1,3 +1,13 @@
+aspectj (1.6.6+dfsg-3) unstable; urgency=low
+
+  * Add Maven support:
+    - debian/control: Build-Depends on maven-repo-helper
+    - debian/rules: Use mh_installpoms and mh_installjar
+    - Remove debian/aspectj.install
+  * debian/README.source: Remove stuff about quilt
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 21 Mar 2010 00:18:12 +0100
+
 aspectj (1.6.6+dfsg-2) unstable; urgency=low
 
   * Fix FTBFS (fix ant.lib.path declaration):

Modified: trunk/aspectj/debian/control
===================================================================
--- trunk/aspectj/debian/control	2010-03-20 23:05:32 UTC (rev 11907)
+++ trunk/aspectj/debian/control	2010-03-20 23:30:11 UTC (rev 11908)
@@ -5,7 +5,7 @@
 Uploaders: Thomas Girard <thomas.g.girard at free.fr>, Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: debhelper (>= 7), default-jdk, ant, ant-optional, cdbs
 Build-Depends-Indep: libxalan2-java, libcommons-logging-java, libregexp-java, docbook-xml, docbook-xsl, xsltproc, docbook-to-man,
- junit (>= 3.8.1), libasm3-java, eclipse-platform (>= 3.4.1), aspectj, gjdoc, html2text
+ junit (>= 3.8.1), libasm3-java, eclipse-platform (>= 3.4.1), aspectj, gjdoc, html2text, maven-repo-helper
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/aspectj/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/aspectj/

Modified: trunk/aspectj/debian/rules
===================================================================
--- trunk/aspectj/debian/rules	2010-03-20 23:05:32 UTC (rev 11907)
+++ trunk/aspectj/debian/rules	2010-03-20 23:30:11 UTC (rev 11908)
@@ -13,7 +13,7 @@
 MKDIR := mkdir -p
 LN_S := ln -sf
 
-AJ_SCRIPTS := debian/ajc debian/ajbrowser debian/ajdoc debian/aj debian/aj5
+AJ_SCRIPTS  := debian/ajc debian/ajbrowser debian/ajdoc debian/aj debian/aj5
 AJ_MANPAGES := debian/ajc.1 debian/ajdoc.1 debian/aj.1 debian/ajbrowser.1
 
 AJ_ANT_HOME := $(MODULES)/lib/ant
@@ -34,6 +34,8 @@
 AJ_BOOT_HOME := $(MODULES)/lib/aspectj
 AJ_BOOT_JARS := aspectjlib.jar aspectjrt.jar aspectjtools.jar
 
+VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/+dfsg//')
+
 pre-build:: debian/stamp-bootstrap
 
 debian/aj.1: debian/aj.sgml
@@ -110,6 +112,15 @@
 	for f in $(AJ_SCRIPTS) ; do \
 	   dh_install $$f /usr/bin ; \
 	done
+	mh_installpom -paspectj -e$(VERSION) org.aspectj/modules/build/aspectjrt.pom
+	mh_installjar -paspectj -e$(VERSION) -l org.aspectj/modules/build/aspectjrt.pom \
+		org.aspectj/modules/aj-build/dist/tools/lib/aspectjrt.jar
+	mh_installpom -paspectj -e$(VERSION) org.aspectj/modules/build/aspectjtools.pom
+	mh_installjar -paspectj -e$(VERSION) -l org.aspectj/modules/build/aspectjtools.pom \
+		org.aspectj/modules/aj-build/dist/tools/lib/aspectjtools.jar
+	mh_installpom -paspectj -e$(VERSION) org.aspectj/modules/build/aspectjweaver.pom
+	mh_installjar -paspectj -e$(VERSION) -l org.aspectj/modules/build/aspectjweaver.pom \
+		org.aspectj/modules/aj-build/dist/tools/lib/aspectjweaver.jar
 
 install/aspectj-doc::
 	mv org.aspectj/modules/docs/dist/doc/changes.html org.aspectj/modules/docs/dist/doc/changelog.html
@@ -127,6 +138,7 @@
 	rm -Rf $(AJ_JUNIT_HOME)
 	rm -Rf $(AJ_ANT_HOME)
 	rm -Rf $(MODULES)/aj-build
+	-rm -rf debian/tmp
 
 .PHONY: get-orig-source
 get-orig-source: