[aspectj] 02/04: Depend on libasm-java (>= 5.0) instead of libasm4-java

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository aspectj.

commit 7ab07c17c976ec1680b8bf158608816ebdbf45fc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 27 13:34:07 2016 +0200

    Depend on libasm-java (>= 5.0) instead of libasm4-java
---
 build/local.properties               | 12 ------------
 debian/changelog                     |  1 +
 debian/control                       |  6 +++---
 debian/patches/07_javadoc_links.diff |  4 ++--
 debian/rules                         |  4 ++--
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/build/local.properties b/build/local.properties
deleted file mode 100644
index b93e1c8..0000000
--- a/build/local.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# for non-release builds, versions should all be DEVELOPMENT
-# except for build.version.base
-build.version=1.8.2
-build.version.base=1.8
-build.version.long=1.8.2
-build.version.short=1.8.2
-# Repo version is for maven (as built with 'ant repo')
-repo.version=1.6.4
-java11.home=c:/home/apps/jdk11
-java13.home=c:/home/apps/jdk13
-java14.home=c:/home/apps/jdk14
-java15.home=c:/home/apps/jdk15
diff --git a/debian/changelog b/debian/changelog
index cb2668c..6c7bf81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 aspectj (1.8.9-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Depend on libasm-java (>= 5.0) instead of libasm4-java
   * Standards-Version updated to 3.9.8
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 27 Sep 2016 13:27:31 +0200
diff --git a/debian/control b/debian/control
index bd68947..145475a 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Build-Depends-Indep: default-jdk-doc,
                      eclipse-platform (>= 3.4.1),
                      html2text,
                      junit (>= 3.8.1),
-                     libasm4-java,
-                     libasm4-java-doc,
+                     libasm-java (>= 5.0),
+                     libasm-java-doc,
                      libaspectj-java,
                      libcommons-logging-java,
                      libregexp-java,
@@ -69,7 +69,7 @@ Package: libaspectj-java-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: default-jdk-doc, libasm4-java-doc
+Recommends: default-jdk-doc, libasm-java-doc
 Replaces: aspectj-doc (<< 1.6.10+dfsg-1)
 Conflicts: aspectj-doc (<< 1.6.10+dfsg-1)
 Suggests: aspectj-doc
diff --git a/debian/patches/07_javadoc_links.diff b/debian/patches/07_javadoc_links.diff
index 057900a..79417d9 100644
--- a/debian/patches/07_javadoc_links.diff
+++ b/debian/patches/07_javadoc_links.diff
@@ -1,5 +1,5 @@
 Description: Fix Javadoc links to use local
- files (from default-jdk-doc and libasm4-java-doc).
+ files (from default-jdk-doc and libasm-java-doc).
 Forwarded: no
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2011-03-16
@@ -16,7 +16,7 @@ Last-Update: 2011-03-16
 +                      href="/usr/share/doc/default-jdk-doc/api/"
                  />
 +                <link
-+                      href="/usr/share/doc/libasm4-java-doc/api/"
++                      href="/usr/share/doc/libasm-java-doc/api/"
 +                />		
              </javadoc>
          </sequential>
diff --git a/debian/rules b/debian/rules
index c530c40..052ef17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,8 +81,8 @@ debian/stamp-bootstrap:
 
 	# asm5
 	$(MKDIR) $(AJ_ASM_HOME)
-	$(LN_S) /usr/share/java/asm4.jar $(AJ_ASM_HOME)/asm-5.0.4.jar
-	$(LN_S) /usr/share/java/asm4.jar $(AJ_ASM_HOME)/asm-5.0.4.renamed.jar
+	$(LN_S) /usr/share/java/asm.jar $(AJ_ASM_HOME)/asm-5.0.4.jar
+	$(LN_S) /usr/share/java/asm.jar $(AJ_ASM_HOME)/asm-5.0.4.renamed.jar
 
 	# regexp
 	$(MKDIR) lib/regexp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/aspectj.git