[pkg-java] r14749 - in trunk/net-luminis-build-plugin/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-07 17:13:55 +0000 (Wed, 07 Sep 2011)
New Revision: 14749

Added:
   trunk/net-luminis-build-plugin/debian/patches/debian-changes-0.2.0-1
Modified:
   trunk/net-luminis-build-plugin/debian/control
   trunk/net-luminis-build-plugin/debian/patches/fixbuildxml.patch
   trunk/net-luminis-build-plugin/debian/patches/series
   trunk/net-luminis-build-plugin/debian/rules
Log:
Package does compile

Modified: trunk/net-luminis-build-plugin/debian/control
===================================================================
--- trunk/net-luminis-build-plugin/debian/control	2011-09-07 17:07:01 UTC (rev 14748)
+++ trunk/net-luminis-build-plugin/debian/control	2011-09-07 17:13:55 UTC (rev 14749)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Build-Depends: debhelper (>= 8), javahelper (>=0.25)
+Build-Depends: debhelper (>= 8), javahelper (>= 0.25)
 Build-Depends-Indep: default-jdk, ant, bnd
 Standards-Version: 3.9.2
 Homepage: https://opensource.luminis.net/wiki/display/SITE/OSGi+Bundle+Ant+Task

Added: trunk/net-luminis-build-plugin/debian/patches/debian-changes-0.2.0-1
===================================================================
--- trunk/net-luminis-build-plugin/debian/patches/debian-changes-0.2.0-1	                        (rev 0)
+++ trunk/net-luminis-build-plugin/debian/patches/debian-changes-0.2.0-1	2011-09-07 17:13:55 UTC (rev 14749)
@@ -0,0 +1,38 @@
+Description: Upstream changes introduced in version 0.2.0-1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ net-luminis-build-plugin (0.2.0-1) unstable; urgency=low
+ .
+   * Initial Debian Upload (Closes: #??????)
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- net-luminis-build-plugin-0.2.0.orig/src/net/luminis/build/plugin/bnd/BuildTask.java
++++ net-luminis-build-plugin-0.2.0/src/net/luminis/build/plugin/bnd/BuildTask.java
+@@ -338,8 +338,8 @@ public class BuildTask extends Task {
+      * task attribute.
+      */
+     public void setIncludeIncludeResourceHeader(boolean include) {
+-        if (! include)
+-            m_instructions.put(Analyzer.REMOVE_HEADERS, Analyzer.INCLUDE_RESOURCE);
++        //if (! include)
++        //    m_instructions.put(Analyzer.REMOVE_HEADERS, Analyzer.INCLUDE_RESOURCE);
+         // default is do include
+     }
+     

Modified: trunk/net-luminis-build-plugin/debian/patches/fixbuildxml.patch
===================================================================
--- trunk/net-luminis-build-plugin/debian/patches/fixbuildxml.patch	2011-09-07 17:07:01 UTC (rev 14748)
+++ trunk/net-luminis-build-plugin/debian/patches/fixbuildxml.patch	2011-09-07 17:13:55 UTC (rev 14749)
@@ -2,8 +2,8 @@
 http://www.spinics.net/lists/fedora-package-review/msg213801.html
 Index: net-luminis-build-plugin-0.2.0/build.xml
 ===================================================================
---- net-luminis-build-plugin-0.2.0.orig/build.xml	2011-09-07 19:03:59.000000000 +0200
-+++ net-luminis-build-plugin-0.2.0/build.xml	2011-09-07 19:04:04.000000000 +0200
+--- net-luminis-build-plugin-0.2.0.orig/build.xml	2011-09-07 19:11:28.000000000 +0200
++++ net-luminis-build-plugin-0.2.0/build.xml	2011-09-07 19:11:51.000000000 +0200
 @@ -1,17 +1,30 @@
 -<project name="build-plugin" basedir="..">
 -    <target name="init" />
@@ -37,9 +37,9 @@
 +    <target name="dist" depends="compile"
 +        description="generate the distribution" >
 +        <!-- Create the distribution directory -->
-+        <mkdir dir="${dist}/lib"/>
++        <mkdir dir="${dist}"/>
 +        <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
-+        <jar jarfile="${dist}/lib/net.luminis.build.plugin-0.2.0.jar" update="true" basedir="${build}" />
++        <jar jarfile="${dist}/net.luminis.build.plugin-0.2.0.jar" update="true" basedir="${build}" />
 +    </target>
 +    <target name="clean"
 +        description="clean up" >

Modified: trunk/net-luminis-build-plugin/debian/patches/series
===================================================================
--- trunk/net-luminis-build-plugin/debian/patches/series	2011-09-07 17:07:01 UTC (rev 14748)
+++ trunk/net-luminis-build-plugin/debian/patches/series	2011-09-07 17:13:55 UTC (rev 14749)
@@ -1 +1,2 @@
 fixbuildxml.patch
+debian-changes-0.2.0-1

Modified: trunk/net-luminis-build-plugin/debian/rules
===================================================================
--- trunk/net-luminis-build-plugin/debian/rules	2011-09-07 17:07:01 UTC (rev 14748)
+++ trunk/net-luminis-build-plugin/debian/rules	2011-09-07 17:13:55 UTC (rev 14749)
@@ -1,13 +1,12 @@
 #!/usr/bin/make -f
+#export DH_VERBOSE=1
 
-export DH_VERBOSE=1
-
 JAVA_HOME=/usr/lib/jvm/default-java
 export CLASSPATH=/usr/share/java/bnd.jar
 #DEB_ANT_BUILD_TARGET := dist
 
 %:
-	dh $@
+	dh $@ --with javahelper
 
 override_dh_auto_build:
 	ant dist