[pkg-java] r11294 - trunk/jetty/debian

[Pablo Duboue]

Author: pabloduboue-guest
Date: 2009-12-16 07:23:22 +0000 (Wed, 16 Dec 2009)
New Revision: 11294

Modified:
   trunk/jetty/debian/changelog
   trunk/jetty/debian/control
   trunk/jetty/debian/module.xml
Log:
Added myself to uploaders
Added fix to changelog, plus get it ready for upload
Modified ant script to include the manifests


Modified: trunk/jetty/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog	2009-12-15 09:43:50 UTC (rev 11293)
+++ trunk/jetty/debian/changelog	2009-12-16 07:23:22 UTC (rev 11294)
@@ -1,6 +1,6 @@
-jetty (6.1.22-1) UNRELEASED; urgency=low
+jetty (6.1.22-1) unstable; urgency=medium
 
-  * New upstream release.
+  * New upstream release. (Closes: #553644)
   * Added OSGi bundle metadata (by upstream). (Closes: #558187)
   * Corrected path to jetty web-apps (by Niels Thykier). (Closes: #554877)
 

Modified: trunk/jetty/debian/control
===================================================================
--- trunk/jetty/debian/control	2009-12-15 09:43:50 UTC (rev 11293)
+++ trunk/jetty/debian/control	2009-12-16 07:23:22 UTC (rev 11294)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>, Thierry Carrez <thierry.carrez at ubuntu.com>,
  Ludovic Claude <ludovic.claude at laposte.net>, Torsten Werner <twerner at debian.org>,
- Niels Thykier <niels at thykier.net>
+ Niels Thykier <niels at thykier.net>, Pablo Duboue <pablo.duboue at gmail.com>
 Build-Depends: debhelper (>= 6), cdbs (>> 0.4.5.3), openjdk-6-jdk, ant, maven-repo-helper,
  libservlet2.5-java, libslf4j-java, libmx4j-java, libgnumail-java,
  libgnujaf-java, libcommons-daemon-java, quilt

Modified: trunk/jetty/debian/module.xml
===================================================================
--- trunk/jetty/debian/module.xml	2009-12-15 09:43:50 UTC (rev 11293)
+++ trunk/jetty/debian/module.xml	2009-12-16 07:23:22 UTC (rev 11294)
@@ -37,9 +37,11 @@
            listfiles="true"/>
     
     <echo>generating ${jar.file}</echo>
+    <property name="manifest.file" value="${rsrc.dir}/META-INF/MANIFEST.MF"/>
+    <available file="${manifest.file}" type="file" property="manifest.file.exists"/>
     <available file="${rsrc.dir}" type="dir" property="rsrc.dir.exists"/>
-    <antcall target="generate-jar-with-manifest"/>
-    <antcall target="generate-jar"/>
+    <antcall target="generate-jar-with-given-manifest"/>
+    <antcall target="generate-jar-without-given-manifest"/>
     
     <echo>copying ${jar.file} to ${module-libdir}</echo>
     <copy file="${target.dir}/${jar.file}" todir="${module-libdir}"/>
@@ -53,6 +55,16 @@
     <antcall target="jar"/>
   </target>
   
+  <target name="generate-jar-with-given-manifest" if="manifest.file.exists">
+    <antcall target="jar-with-given-manifest-and-resources"/>
+    <antcall target="jar-with-given-manifest"/>
+  </target>
+
+  <target name="generate-jar-without-given-manifest" unless="manifest.file.exists">
+    <antcall target="generate-jar-with-manifest"/>
+    <antcall target="generate-jar"/>
+  </target>
+
   <target name="generate-jar-with-manifest" if="jar.main.class">
     <antcall target="jar-with-manifest-and-resources"/>
     <antcall target="jar-with-manifest"/>
@@ -102,6 +114,28 @@
     </jar>
   </target>
   
+  <target name="jar-with-given-manifest" unless="rsrc.dir.exists">
+    <jar destfile="${target.dir}/${jar.file}" manifest="${manifest.file}">
+      <fileset dir="${build.dir}">
+        <include name="**/*"/>
+      </fileset>
+      <fileset dir="${rsrc.dir}">
+        <include name="**/*"/>
+      </fileset>
+    </jar>
+  </target>
+
+  <target name="jar-with-given-manifest-and-resources" if="rsrc.dir.exists">
+    <jar destfile="${target.dir}/${jar.file}" manifest="${manifest.file}">
+      <fileset dir="${build.dir}">
+        <include name="**/*"/>
+      </fileset>
+      <fileset dir="${rsrc.dir}">
+        <include name="**/*"/>
+      </fileset>
+    </jar>
+  </target>
+  
   <target name="copy-to-etc" if="config.dir.exists">
     <echo>copying ${config.dir} to ${etc.dir} from ${module-name}</echo>
     <copy todir="${etc.dir}">