[pkg-java] r18111 - in trunk/jarjar/debian: . patches
Miguel Landaeta
nomadium at moszumanska.debian.org
Sat May 3 18:50:47 UTC 2014
Author: nomadium
Date: 2014-05-03 18:50:47 +0000 (Sat, 03 May 2014)
New Revision: 18111
Added:
trunk/jarjar/debian/patches/0005-fix-javadocs.patch
Removed:
trunk/jarjar/debian/README.Debian
trunk/jarjar/debian/patches/0001-fix-build.xml.patch
Modified:
trunk/jarjar/debian/ant.properties
trunk/jarjar/debian/changelog
trunk/jarjar/debian/control
trunk/jarjar/debian/patches/series
trunk/jarjar/debian/rules
Log:
Prepare jarjar 1.4+svn142-4 upload
Deleted: trunk/jarjar/debian/README.Debian
===================================================================
--- trunk/jarjar/debian/README.Debian 2014-05-02 21:28:39 UTC (rev 18110)
+++ trunk/jarjar/debian/README.Debian 2014-05-03 18:50:47 UTC (rev 18111)
@@ -1,6 +0,0 @@
-jarjar
-------
-
-The Maven plugin is not built at the moment
-
- -- Arnaud Vandyck <avdyk at debian.org>, Fri, 11 May 2007 16:58:14 +0200
Modified: trunk/jarjar/debian/ant.properties
===================================================================
--- trunk/jarjar/debian/ant.properties 2014-05-02 21:28:39 UTC (rev 18110)
+++ trunk/jarjar/debian/ant.properties 2014-05-03 18:50:47 UTC (rev 18111)
@@ -1,7 +1,6 @@
asm.jar=/usr/share/java/asm4.jar
asm-commons.jar=/usr/share/java/asm4-commons.jar
-# WARNING: maven-plugin-api
-# does not exists in debian at the moment
-#maven-plugin-api.jar /usr/share/java/
+maven-plugin-api.jar=/usr/share/java/maven-plugin-api.jar
+ant.jar=/usr/share/java/ant.jar
compile.source=1.5
compile.target=1.5
Modified: trunk/jarjar/debian/changelog
===================================================================
--- trunk/jarjar/debian/changelog 2014-05-02 21:28:39 UTC (rev 18110)
+++ trunk/jarjar/debian/changelog 2014-05-03 18:50:47 UTC (rev 18111)
@@ -1,3 +1,16 @@
+jarjar (1.4+svn142-4) UNRELEASED; urgency=low
+
+ * Add myself to Uploaders.
+ * !!!!!!!!PENDING resolution!!!!!!!!. (Closes: #745815).
+ * Add B-D on libmaven2-core-java.
+ * Bump Standards-Version to 3.9.5. No changes were required.
+ * Remove outdated readme d/README.Debian.
+ * Remove outdated patch d/patches/0001-fix-build.xml.patch.
+ * Add patch d/patches/0005-fix-javadocs.patch to remove some
+ warnings during javadoc generation.
+
+ -- Miguel Landaeta <nomadium at debian.org> Sat, 03 May 2014 15:49:49 -0300
+
jarjar (1.4+svn142-3) unstable; urgency=low
* Team upload.
Modified: trunk/jarjar/debian/control
===================================================================
--- trunk/jarjar/debian/control 2014-05-02 21:28:39 UTC (rev 18110)
+++ trunk/jarjar/debian/control 2014-05-03 18:50:47 UTC (rev 18111)
@@ -3,10 +3,11 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Niels Thykier <niels at thykier.net>,
- Damien Raude-Morvan <drazzib at debian.org>
+ Damien Raude-Morvan <drazzib at debian.org>,
+ Miguel Landaeta <nomadium at debian.org>
Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk, libasm4-java (>= 4.1-2),
- maven-repo-helper
-Standards-Version: 3.9.4
+ maven-repo-helper, libmaven2-core-java
+Standards-Version: 3.9.5
Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jarjar
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jarjar
Homepage: http://code.google.com/p/jarjar/
Deleted: trunk/jarjar/debian/patches/0001-fix-build.xml.patch
===================================================================
--- trunk/jarjar/debian/patches/0001-fix-build.xml.patch 2014-05-02 21:28:39 UTC (rev 18110)
+++ trunk/jarjar/debian/patches/0001-fix-build.xml.patch 2014-05-03 18:50:47 UTC (rev 18111)
@@ -1,20 +0,0 @@
-From: Arnaud Vandyck <avdyk at debian.org>
-Date: Sun, 28 Feb 2010 12:42:05 +0100
-Subject: fix build.xml
-
----
- build.xml | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
---- a/build.xml
-+++ b/build.xml
-@@ -69,7 +69,8 @@
- <javac includeantruntime="true" srcdir="src/@{module}" destdir="build/@{module}"
- source="${compile.source}"
- target="${compile.target}" bootclasspath="@{bootclasspath}" extdirs="${compile.extdirs}"
-- debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}">
-+ debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}"
-+ excludes="com/tonicsystems/jarjar/JarJarMojo.java">
- <classpath refid="@{refid}"/>
- <compilerarg value="-Xlint"/>
- </javac>
Added: trunk/jarjar/debian/patches/0005-fix-javadocs.patch
===================================================================
--- trunk/jarjar/debian/patches/0005-fix-javadocs.patch (rev 0)
+++ trunk/jarjar/debian/patches/0005-fix-javadocs.patch 2014-05-03 18:50:47 UTC (rev 18111)
@@ -0,0 +1,27 @@
+Description: Fix classpath javadoc task
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2014-05-03
+
+--- jarjar-1.4+svn142.orig/build.xml
++++ jarjar-1.4+svn142/build.xml
+@@ -262,10 +262,16 @@
+ access="${javadoc.access}"
+ failonerror="true"
+ packagenames="com.tonicsystems.jarjar.*"
+- classpathref="path.run"
+ Author="true"
+ Version="true"
+- Use="true"
+- />
++ Use="true">
++ <classpath>
++ <path refid="path.run"/>
++ <pathelement location="${asm.jar}"/>
++ <pathelement location="${asm-commons.jar}"/>
++ <pathelement location="${maven-plugin-api.jar}"/>
++ <pathelement location="${ant.jar}"/>
++ </classpath>
++ </javadoc>
+ </target>
+ </project>
Modified: trunk/jarjar/debian/patches/series
===================================================================
--- trunk/jarjar/debian/patches/series 2014-05-02 21:28:39 UTC (rev 18110)
+++ trunk/jarjar/debian/patches/series 2014-05-03 18:50:47 UTC (rev 18111)
@@ -1,4 +1,4 @@
-0001-fix-build.xml.patch
0002-embed-libs-from-debian.patch
szzepiq_jar_resources.diff
add_ClassReader_EXPAND_FRAMES.diff
+0005-fix-javadocs.patch
Modified: trunk/jarjar/debian/rules
===================================================================
--- trunk/jarjar/debian/rules 2014-05-02 21:28:39 UTC (rev 18110)
+++ trunk/jarjar/debian/rules 2014-05-03 18:50:47 UTC (rev 18111)
@@ -8,7 +8,7 @@
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := asm4 asm4-commons
+DEB_JARS := asm4 asm4-commons maven-plugin-api
DEB_ANT_BUILD_TARGET := jar javadoc
install/libjarjar-java::
More information about the pkg-java-commits
mailing list