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

[tgg at alioth.debian.org]

Author: tgg
Date: 2008-05-11 12:16:24 +0000 (Sun, 11 May 2008)
New Revision: 6457

Modified:
   trunk/aspectj/debian/changelog
   trunk/aspectj/debian/control
   trunk/aspectj/debian/cvs-get.sh
   trunk/aspectj/debian/local.properties
Log:
prepare AspectJ 1.6.0


Modified: trunk/aspectj/debian/changelog
===================================================================
--- trunk/aspectj/debian/changelog	2008-05-11 10:11:18 UTC (rev 6456)
+++ trunk/aspectj/debian/changelog	2008-05-11 12:16:24 UTC (rev 6457)
@@ -1,3 +1,10 @@
+aspectj (1.6.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Build-depend on default-jdk-builddep.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Sun, 11 May 2008 11:46:41 +0000
+
 aspectj (1.5.4-1) unstable; urgency=low
 
   [ Michael Koch ]

Modified: trunk/aspectj/debian/control
===================================================================
--- trunk/aspectj/debian/control	2008-05-11 10:11:18 UTC (rev 6456)
+++ trunk/aspectj/debian/control	2008-05-11 12:16:24 UTC (rev 6457)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Thomas Girard <thomas.g.girard at free.fr>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>> 5), gcj, java-gcj-compat-dev (>= 1.0.65-6), ant (>= 1.6.3), ant-optional (>= 1.6.3), libxalan2-java, cdbs, libcommons-logging-java, junit (>= 3.8.1), libregexp-java, docbook-xml, docbook-xsl, xsltproc, docbook-to-man
+Build-Depends: debhelper (>> 5), default-jdk-builddep, ant (>= 1.6.3), ant-optional (>= 1.6.3), libxalan2-java, cdbs, libcommons-logging-java, junit (>= 3.8.1), libregexp-java, docbook-xml, docbook-xsl, xsltproc, docbook-to-man
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/aspectj
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/aspectj
@@ -11,7 +11,7 @@
 
 Package: aspectj
 Architecture: all
-Depends: java-gcj-compat | java2-runtime | java1-runtime
+Depends: java2-runtime | java1-runtime | java-gcj-compat
 Description: A seamless aspect-oriented extension for Java
  AspectJ enables the clean modularization of crosscutting concerns
  such as: error checking and handling, synchronization, context-sensitive

Modified: trunk/aspectj/debian/cvs-get.sh
===================================================================
--- trunk/aspectj/debian/cvs-get.sh	2008-05-11 10:11:18 UTC (rev 6456)
+++ trunk/aspectj/debian/cvs-get.sh	2008-05-11 12:16:24 UTC (rev 6457)
@@ -14,7 +14,6 @@
 trap "rm -Rf $TMPDIR" 0
 
 VERSION=`head -1 debian/changelog | cut -d ' ' -f 2 | sed -e 's#(\([^-]\+\)-.*)#\1#'`
-#TAG="V`echo $VERSION | tr . _`_final"
 TAG="V`echo $VERSION | tr . _`"
 ORIGDIR="$TMPDIR/aspectj_$VERSION.orig"
 

Modified: trunk/aspectj/debian/local.properties
===================================================================
--- trunk/aspectj/debian/local.properties	2008-05-11 10:11:18 UTC (rev 6456)
+++ trunk/aspectj/debian/local.properties	2008-05-11 12:16:24 UTC (rev 6457)
@@ -1,8 +1,8 @@
-build.version=1.5.3
-build.version.base=1.5
-build.version.long=1.5.3
-build.version.short=1.5.3
-java11.home=/usr/lib/jvm/java-gcj
-java13.home=/usr/lib/jvm/java-gcj
-java14.home=/usr/lib/jvm/java-gcj
-java15.home=/usr/lib/jvm/java-gcj
+build.version=1.6.0
+build.version.base=1.6
+build.version.long=1.6.0
+build.version.short=1.6.0
+java11.home=/usr/lib/jvm/default-java
+java13.home=/usr/lib/jvm/default-java
+java14.home=/usr/lib/jvm/default-java
+java15.home=/usr/lib/jvm/default-java