[pkg-java] r18072 - in trunk/aspectj/debian: . patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Apr 25 14:53:18 UTC 2014 

Author: ebourg-guest
Date: 2014-04-25 14:53:18 +0000 (Fri, 25 Apr 2014)
New Revision: 18072

Modified:
   trunk/aspectj/debian/changelog
   trunk/aspectj/debian/patches/01_ajc_xml_typo.diff
   trunk/aspectj/debian/patches/03_use_system_docbook.diff
   trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff
   trunk/aspectj/debian/patches/05_build_classpath.diff
   trunk/aspectj/debian/patches/07_javadoc_links.diff
   trunk/aspectj/debian/patches/ant_0_8_fix.diff
   trunk/aspectj/debian/patches/use_system_asm.diff
   trunk/aspectj/debian/rules
Log:
New upstream release (1.7.2)
Refreshed the patches



Modified: trunk/aspectj/debian/changelog
===================================================================
--- trunk/aspectj/debian/changelog	2014-04-25 14:39:40 UTC (rev 18071)
+++ trunk/aspectj/debian/changelog	2014-04-25 14:53:18 UTC (rev 18072)
@@ -1,6 +1,8 @@
-aspectj (1.6.12+dfsg-4) UNRELEASED; urgency=medium
+aspectj (1.7.2+dfsg-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
     - Use canonical URLs for the Vcs-* fields

Modified: trunk/aspectj/debian/patches/01_ajc_xml_typo.diff
===================================================================
--- trunk/aspectj/debian/patches/01_ajc_xml_typo.diff	2014-04-25 14:39:40 UTC (rev 18071)
+++ trunk/aspectj/debian/patches/01_ajc_xml_typo.diff	2014-04-25 14:53:18 UTC (rev 18072)
@@ -2,8 +2,8 @@
 Author: Thomas Girard <thomas.g.girard at free.fr>
 Forwarded; no
 Last-Update: 2009-08-19
---- a/org.aspectj/modules/docs/devGuideDB/ajc.xml
-+++ b/org.aspectj/modules/docs/devGuideDB/ajc.xml
+--- a/docs/devGuideDB/ajc.xml
++++ b/docs/devGuideDB/ajc.xml
 @@ -45,8 +45,8 @@
          (For a discussion of what affected types might be required,
           see <ulink url="../progguide/implementation.html">The AspectJ

Modified: trunk/aspectj/debian/patches/03_use_system_docbook.diff
===================================================================
--- trunk/aspectj/debian/patches/03_use_system_docbook.diff	2014-04-25 14:39:40 UTC (rev 18071)
+++ trunk/aspectj/debian/patches/03_use_system_docbook.diff	2014-04-25 14:53:18 UTC (rev 18072)
@@ -2,8 +2,8 @@
 Author: Thomas Girard <thomas.g.girard at free.fr>
 Forwarded: not-needed
 Last-Update: 2009-08-18
---- a/org.aspectj/modules/docs/build.xml
-+++ b/org.aspectj/modules/docs/build.xml
+--- a/docs/build.xml
++++ b/docs/build.xml
 @@ -64,10 +64,10 @@
  
          <!-- callers of xml-html use these by default -->

Modified: trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff
===================================================================
--- trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff	2014-04-25 14:39:40 UTC (rev 18071)
+++ trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff	2014-04-25 14:53:18 UTC (rev 18072)
@@ -2,8 +2,8 @@
 Author: Thomas Girard <thomas.g.girard at free.fr>
 Forwarded: not-needed
 Last-Update: 2009-08-18
---- a/org.aspectj/modules/docs/build.xml
-+++ b/org.aspectj/modules/docs/build.xml
+--- a/docs/build.xml
++++ b/docs/build.xml
 @@ -69,10 +69,6 @@
          <property name="nochunk.xsl.source"
                    location="/usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl"

Modified: trunk/aspectj/debian/patches/05_build_classpath.diff
===================================================================
--- trunk/aspectj/debian/patches/05_build_classpath.diff	2014-04-25 14:39:40 UTC (rev 18071)
+++ trunk/aspectj/debian/patches/05_build_classpath.diff	2014-04-25 14:53:18 UTC (rev 18072)
@@ -2,8 +2,8 @@
 Author: Damien Raude-Morvan <drazzib at drazzib.com>
 Forwarded: no
 Last-Update: 2009-08-18
---- a/org.aspectj/modules/org.aspectj.ajdt.core/.classpath
-+++ b/org.aspectj/modules/org.aspectj.ajdt.core/.classpath
+--- a/org.aspectj.ajdt.core/.classpath
++++ b/org.aspectj.ajdt.core/.classpath
 @@ -17,5 +17,11 @@
  	<classpathentry kind="lib" path="/lib/bcel/bcel-verifier.jar"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

Modified: trunk/aspectj/debian/patches/07_javadoc_links.diff
===================================================================
--- trunk/aspectj/debian/patches/07_javadoc_links.diff	2014-04-25 14:39:40 UTC (rev 18071)
+++ trunk/aspectj/debian/patches/07_javadoc_links.diff	2014-04-25 14:53:18 UTC (rev 18072)
@@ -3,8 +3,8 @@
 Forwarded: no
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2011-03-16
---- a/org.aspectj/modules/docs/build.xml
-+++ b/org.aspectj/modules/docs/build.xml
+--- a/docs/build.xml
++++ b/docs/build.xml
 @@ -252,10 +252,12 @@
                       classpath="${@{module}.classpath}"
                       packagenames="${@{module}.packagenames}"
@@ -21,8 +21,8 @@
              </javadoc>
          </sequential>
      </macrodef>
---- a/org.aspectj/modules/docs/docs.build.properties
-+++ b/org.aspectj/modules/docs/docs.build.properties
+--- a/docs/docs.build.properties
++++ b/docs/docs.build.properties
 @@ -18,12 +18,8 @@
   
  weaver.classpath=\

Modified: trunk/aspectj/debian/patches/ant_0_8_fix.diff
===================================================================
--- trunk/aspectj/debian/patches/ant_0_8_fix.diff	2014-04-25 14:39:40 UTC (rev 18071)
+++ trunk/aspectj/debian/patches/ant_0_8_fix.diff	2014-04-25 14:53:18 UTC (rev 18072)
@@ -3,8 +3,8 @@
 Forwarded: no
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2010-02-27
---- a/org.aspectj/modules/build/build-properties.xml
-+++ b/org.aspectj/modules/build/build-properties.xml
+--- a/build/build-properties.xml
++++ b/build/build-properties.xml
 @@ -150,18 +150,11 @@
  			location="${aspectj.modules.lib.dir}/ant/lib/ant.jar"/>
  		<taskdef resource="org/aspectj/internal/tools/ant/taskdefs/taskdefs.properties"

Modified: trunk/aspectj/debian/patches/use_system_asm.diff
===================================================================
--- trunk/aspectj/debian/patches/use_system_asm.diff	2014-04-25 14:39:40 UTC (rev 18071)
+++ trunk/aspectj/debian/patches/use_system_asm.diff	2014-04-25 14:53:18 UTC (rev 18072)
@@ -2,10 +2,8 @@
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Updated: 2011-11-23
 Forwarded: no
-Index: b/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/AsmDetector.java
-===================================================================
---- a/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/AsmDetector.java
-+++ b/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/AsmDetector.java
+--- a/weaver/src/org/aspectj/weaver/bcel/asm/AsmDetector.java
++++ b/weaver/src/org/aspectj/weaver/bcel/asm/AsmDetector.java
 @@ -24,8 +24,8 @@
  
  	static {
@@ -17,18 +15,14 @@
  			Method m = reader.getMethod("accept", new Class[] { visitor, Integer.TYPE });
  			isAsmAround = m != null;
  		} catch (Exception e) {
-Index: b/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java
-===================================================================
---- a/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java
-+++ b/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java
-@@ -15,8 +15,8 @@
+--- a/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java
++++ b/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java
+@@ -15,7 +15,7 @@
  import org.aspectj.weaver.UnresolvedType;
  import org.aspectj.weaver.World;
  
--import aj.org.objectweb.asm.ClassReader;
--import aj.org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.ClassReader;
-+import org.objectweb.asm.ClassWriter;
+-import aj.org.objectweb.asm.*;
++import org.objectweb.asm.*;
  
  /**
   * Uses asm to add the stack map attribute to methods in a class. The class is passed in as pure byte data and then a reader/writer

Modified: trunk/aspectj/debian/rules
===================================================================
--- trunk/aspectj/debian/rules	2014-04-25 14:39:40 UTC (rev 18071)
+++ trunk/aspectj/debian/rules	2014-04-25 14:53:18 UTC (rev 18072)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
-MODULES := org.aspectj/modules
+MODULES := .
 DEB_BUILDDIR = $(MODULES)/build
 DEB_ANT_BUILD_TARGET = aspectj
 DEB_JARS = xalan2 ant-junit
@@ -42,7 +42,7 @@
 	docbook-to-man $< > $@
 
 # reuse the DocBook xml documents here to generate manpages.
-debian/%.1: org.aspectj/modules/docs/devGuideDB/%.xml
+debian/%.1: $(MODULES)/docs/devGuideDB/%.xml
 	sh debian/manpage_from.sh $< > $@
 
 .PHONY: bootstrap
@@ -103,21 +103,21 @@
 	done
 
 install/libaspectj-java::
-	mh_installpom -plibaspectj-java -e$(VERSION) org.aspectj/modules/build/aspectjrt.pom
-	mh_installjar -plibaspectj-java -e$(VERSION) -l org.aspectj/modules/build/aspectjrt.pom \
-		org.aspectj/modules/aj-build/dist/tools/lib/aspectjrt.jar
-	mh_installpom -plibaspectj-java -e$(VERSION) org.aspectj/modules/build/aspectjtools.pom
-	mh_installjar -plibaspectj-java -e$(VERSION) -l org.aspectj/modules/build/aspectjtools.pom \
-		org.aspectj/modules/aj-build/dist/tools/lib/aspectjtools.jar
-	mh_installpom -plibaspectj-java -e$(VERSION) org.aspectj/modules/build/aspectjweaver.pom
-	mh_installjar -plibaspectj-java -e$(VERSION) -l org.aspectj/modules/build/aspectjweaver.pom \
-		org.aspectj/modules/aj-build/dist/tools/lib/aspectjweaver.jar
+	mh_installpom -plibaspectj-java -e$(VERSION) $(MODULES)/build/aspectjrt.pom
+	mh_installjar -plibaspectj-java -e$(VERSION) -l $(MODULES)/build/aspectjrt.pom \
+		$(MODULES)/aj-build/dist/tools/lib/aspectjrt.jar
+	mh_installpom -plibaspectj-java -e$(VERSION) $(MODULES)/build/aspectjtools.pom
+	mh_installjar -plibaspectj-java -e$(VERSION) -l $(MODULES)/build/aspectjtools.pom \
+		$(MODULES)/aj-build/dist/tools/lib/aspectjtools.jar
+	mh_installpom -plibaspectj-java -e$(VERSION) $(MODULES)/build/aspectjweaver.pom
+	mh_installjar -plibaspectj-java -e$(VERSION) -l $(MODULES)/build/aspectjweaver.pom \
+		$(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
-	html2text -o org.aspectj/modules/docs/dist/doc/changelog.txt org.aspectj/modules/docs/dist/doc/changelog.html
-	dh_installchangelogs org.aspectj/modules/docs/dist/doc/changelog.html
-	dh_installchangelogs org.aspectj/modules/docs/dist/doc/changelog.txt
+	mv $(MODULES)/docs/dist/doc/changes.html $(MODULES)/docs/dist/doc/changelog.html
+	html2text -o $(MODULES)/docs/dist/doc/changelog.txt $(MODULES)/docs/dist/doc/changelog.html
+	dh_installchangelogs $(MODULES)/docs/dist/doc/changelog.html
+	dh_installchangelogs $(MODULES)/docs/dist/doc/changelog.txt
 
 clean::
 	rm -Rf $(AJ_ECLIPSE_HOME)

More information about the pkg-java-commits mailing list