[pkg-java] r17043 - in trunk/jalview/debian: . patches

Emmanuel Bourg ebourg-guest at alioth.debian.org
Fri Jul 19 12:14:38 UTC 2013 

Author: ebourg-guest
Date: 2013-07-19 12:14:38 +0000 (Fri, 19 Jul 2013)
New Revision: 17043

Added:
   trunk/jalview/debian/patches/newer-mime4j-api.diff
Modified:
   trunk/jalview/debian/changelog
   trunk/jalview/debian/control
   trunk/jalview/debian/copyright
   trunk/jalview/debian/patches/series
   trunk/jalview/debian/rules
   trunk/jalview/debian/watch
Log:
Added a patch to compile with Apache Mime4J 0.7.2
debian/control:
- Updated Standards-Version to 3.9.4 (no changes)
- Runtime dependency on default-jre | java6-runtime
- Removed the duplicate build dependencies on javahelp2 and libaxis-java
- Fixed a typo in the package description (Closes: #676623)
debian/copyright: Updated the Format URI
Updated debian/watch to catch the new releases
debian/rules:
- Added a clean target to allow rebuilds
- Added jsearch-indexer.jar to the classpath to fix the buildindices target



Modified: trunk/jalview/debian/changelog
===================================================================
--- trunk/jalview/debian/changelog	2013-07-18 13:35:32 UTC (rev 17042)
+++ trunk/jalview/debian/changelog	2013-07-19 12:14:38 UTC (rev 17043)
@@ -1,3 +1,20 @@
+jalview (2.7.dfsg-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Added a patch to compile with Apache Mime4J 0.7.2
+  * debian/control:
+    - Updated Standards-Version to 3.9.4 (no changes)
+    - Runtime dependency on default-jre | java6-runtime
+    - Removed the duplicate build dependencies on javahelp2 and libaxis-java
+    - Fixed a typo in the package description (Closes: #676623)
+  * debian/copyright: Updated the Format URI
+  * Updated debian/watch to catch the new releases
+  * debian/rules:
+    - Added a clean target to allow rebuilds
+    - Added jsearch-indexer.jar to the classpath to fix the buildindices target
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 19 Jul 2013 13:08:43 +0200
+
 jalview (2.7.dfsg-2) unstable; urgency=low
 
   * Upload to unstable now that jmol is there too

Modified: trunk/jalview/debian/control
===================================================================
--- trunk/jalview/debian/control	2013-07-18 13:35:32 UTC (rev 17042)
+++ trunk/jalview/debian/control	2013-07-19 12:14:38 UTC (rev 17043)
@@ -9,25 +9,25 @@
 	       libcommons-discovery-java, libcommons-logging-java,
 	       libjmol-java (>= 12.1.42),
 	       jmol-applet (>= 12.1.42),
-	       libcastor-xml-java, libjaba-client-java, libaxis-java, 
-	       javahelper, javahelp2, libjswingreader-java,
+	       libcastor-xml-java, libjaba-client-java,
+	       javahelper, libjswingreader-java,
                libmiglayout-java, icedtea-netx-common,
                libhttpmime-java, libhttpcore-java,
-               libapache-mime4j-java, libhttpclient-java,
+               libapache-mime4j-java (>= 0.7.2), libhttpclient-java,
                libvamsas-client-java
-Standards-Version: 3.9.2
-Homepage: http://www.jalview.org/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jalview
+Standards-Version: 3.9.4
+Homepage: http://www.jalview.org
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jalview
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/jalview
 
 Package: jalview
 Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | cacao-oj6-jre | java6-runtime,
+Depends: ${misc:Depends}, default-jre | java6-runtime,
 	 java-wrappers (>= 0.1.22), libjmol-java (>= 12.1.42), ${java:Depends}
 Suggests: kalign, t-coffee, clustalw
 Description: multiple alignment editor
- JalView is a Java alignement editor that can work with sequence
- alignement produced by programs implementing alignment algorithms
+ JalView is a Java alignment editor that can work with sequence
+ alignment produced by programs implementing alignment algorithms
  such as clustalw, kalign and t-coffee.
  .
  It has lots of features, is actively developed, and will compare

Modified: trunk/jalview/debian/copyright
===================================================================
--- trunk/jalview/debian/copyright	2013-07-18 13:35:32 UTC (rev 17042)
+++ trunk/jalview/debian/copyright	2013-07-19 12:14:38 UTC (rev 17043)
@@ -1,4 +1,4 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: jalview
 Upstream-Contact: jalview-discuss at jalview.org
 Source:

Added: trunk/jalview/debian/patches/newer-mime4j-api.diff
===================================================================
--- trunk/jalview/debian/patches/newer-mime4j-api.diff	                        (rev 0)
+++ trunk/jalview/debian/patches/newer-mime4j-api.diff	2013-07-19 12:14:38 UTC (rev 17043)
@@ -0,0 +1,17 @@
+Description: Patch to use the latest version of Apache Mime4J
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/jalview/ws/io/mime/JalviewMimeContentHandler.java
++++ b/src/jalview/ws/io/mime/JalviewMimeContentHandler.java
+@@ -26,9 +26,9 @@
+ import java.util.List;
+ 
+ import org.apache.james.mime4j.MimeException;
+-import org.apache.james.mime4j.descriptor.BodyDescriptor;
++import org.apache.james.mime4j.stream.BodyDescriptor;
+ import org.apache.james.mime4j.parser.ContentHandler;
+-import org.apache.james.mime4j.parser.Field;
++import org.apache.james.mime4j.stream.Field;
+ 
+ /**
+  * ContentHandler for parsing mime encoded messages into Jalview objects.

Modified: trunk/jalview/debian/patches/series
===================================================================
--- trunk/jalview/debian/patches/series	2013-07-18 13:35:32 UTC (rev 17042)
+++ trunk/jalview/debian/patches/series	2013-07-19 12:14:38 UTC (rev 17043)
@@ -1,2 +1,3 @@
 mutilate-build-system.diff
 newer-jmol-api.diff
+newer-mime4j-api.diff

Modified: trunk/jalview/debian/rules
===================================================================
--- trunk/jalview/debian/rules	2013-07-18 13:35:32 UTC (rev 17042)
+++ trunk/jalview/debian/rules	2013-07-19 12:14:38 UTC (rev 17043)
@@ -21,7 +21,7 @@
 	castor-core Jmol min-jaba-client axis-jaxrpc commons-discovery \
 	axis jh vamsas-client /usr/share/jmol-applet/JmolApplet.jar \
 	jswingreader miglayout /usr/share/icedtea-web/plugin.jar \
-	httpmime httpcore apache-mime4j httpclient
+	httpmime httpcore apache-mime4j-core httpclient jsearch-indexer
 
 
 ANT_OPTS             := -Dbuild.sysclasspath=last \
@@ -29,3 +29,6 @@
 
 
 JH_CLASSPATH_ARGS := -c"$(shell echo $(DEB_CLASSPATH) | sed 's/:/ /g')" debian/jalview/usr/share/java/jalview.jar 
+
+clean::
+	rm -Rf dist

Modified: trunk/jalview/debian/watch
===================================================================
--- trunk/jalview/debian/watch	2013-07-18 13:35:32 UTC (rev 17042)
+++ trunk/jalview/debian/watch	2013-07-19 12:14:38 UTC (rev 17043)
@@ -1,10 +1,3 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
 version=3
-
-opts="dversionmangle=s/\.dfsg//,uversionmangle=s/_/./g"	\
-http://www.jalview.org/source/source.html jalview_(.*)\.tar\.gz debian debian/new-upstream
+opts="dversionmangle=s/\.dfsg//,uversionmangle=s/_/./g;s/\.0(\d)/.0.$1/g" \
+http://www.jalview.org/source jalview_([\d_]+)\.tar\.gz debian debian/new-upstream

More information about the pkg-java-commits mailing list