[med-svn] r6593 - in trunk/packages/dcm4che/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2011-04-19 19:18:18 +0000 (Tue, 19 Apr 2011)
New Revision: 6593

Added:
   trunk/packages/dcm4che/trunk/debian/patches/
   trunk/packages/dcm4che/trunk/debian/patches/no_maven_jar_plugin.patch
   trunk/packages/dcm4che/trunk/debian/patches/series
Modified:
   trunk/packages/dcm4che/trunk/debian/control
Log:
Fixed Maintainer field, followed a hint of Torsten Werner to patch out maven-jar-plugin from pom.xml which is some progress in the build process but some errors are remaining


Modified: trunk/packages/dcm4che/trunk/debian/control
===================================================================
--- trunk/packages/dcm4che/trunk/debian/control	2011-04-19 14:51:03 UTC (rev 6592)
+++ trunk/packages/dcm4che/trunk/debian/control	2011-04-19 19:18:18 UTC (rev 6593)
@@ -1,8 +1,9 @@
 Source: dcm4che
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Tille <Andreas Tille <tille at debian.org>>
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+DM-Upload-Allowed: yes
+Uploaders: Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 8), cdbs, default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep: libcommons-cli-java, liblog4j1.2-java, libslf4j-java, junit, junit4, libslf4j-java,  
  default-jdk-doc, liblog4j1.2-java-doc, libmaven-javadoc-plugin-java 

Added: trunk/packages/dcm4che/trunk/debian/patches/no_maven_jar_plugin.patch
===================================================================
--- trunk/packages/dcm4che/trunk/debian/patches/no_maven_jar_plugin.patch	                        (rev 0)
+++ trunk/packages/dcm4che/trunk/debian/patches/no_maven_jar_plugin.patch	2011-04-19 19:18:18 UTC (rev 6593)
@@ -0,0 +1,19 @@
+--- dcm4che-2.0.25.orig/pom.xml
++++ dcm4che-2.0.25/pom.xml
+@@ -57,16 +57,6 @@
+         </configuration>
+       </plugin>
+       <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-jar-plugin</artifactId>
+-        <version>2.3</version>
+-        <configuration>
+-          <archive>
+-            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+-          </archive>
+-        </configuration>
+-      </plugin>
+-      <plugin>
+         <artifactId>maven-assembly-plugin</artifactId>
+         <configuration>
+           <descriptors>

Added: trunk/packages/dcm4che/trunk/debian/patches/series
===================================================================
--- trunk/packages/dcm4che/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/dcm4che/trunk/debian/patches/series	2011-04-19 19:18:18 UTC (rev 6593)
@@ -0,0 +1 @@
+no_maven_jar_plugin.patch