Merge pull request #127 from tcarver/master

misc

Makefile

@@ -291,15 +291,15 @@ artemis.jar : $(CLASSES)
 	cd jar_build; \
 	rm -rf META-INF/MANIFEST.MF; \
 	echo "Main-Class: uk.ac.sanger.artemis.components.ArtemisMain" > manifest-art; \
-	jar cmf manifest-art artemis.jar images/PSUlogo.gif images/icon.gif README etc \
+	jar cmf manifest-art artemis.jar META-INF/services images/PSUlogo.gif images/icon.gif README etc \
 	                     artemis_sqlmap org uk com net nsdb type seqdb LICENSE.Apache j2ssh.properties; \
         echo "Main-Class: uk.ac.sanger.artemis.circular.DNADraw" > manifest-circular; \
         jar cmf manifest-circular DNAPlotter.jar images/PSUlogo.gif README etc \
                              uk org/gmod org/w3c org/apache org/biojava/bio/ com/ibatis/common/jdbc/ net/sf/samtools/ LICENSE.Apache j2ssh.properties; \
 	echo "Main-Class: uk.ac.sanger.artemis.components.alignment.BamView" > manifest-bamview; \
-	jar cmf manifest-bamview BamView.jar etc uk org/apache org/biojava org/biojavax org/gmod org/w3c net/sf com/ibatis; \
+	jar cmf manifest-bamview BamView.jar META-INF/services etc uk org/apache org/biojava org/biojavax org/gmod org/w3c net/sf com/ibatis; \
 	echo "Main-Class: uk.ac.sanger.artemis.components.ActMain" > manifest-act; \
-	jar cmf manifest-act act.jar images/PSUlogo.gif images/icon.gif README etc \
+	jar cmf manifest-act act.jar META-INF/services images/PSUlogo.gif images/icon.gif README etc \
 	                     artemis_sqlmap org uk com net nsdb type seqdb LICENSE.Apache j2ssh.properties; \
 	rm -f etc/log4j.properties; \
 	jar cmf manifest-art artemis_mac.jar images/PSUlogo.gif images/icon.gif README \

etc/versions

-Artemis Release 14.3.3
-ACT Release 11.3.3
+Artemis Release 15.0.0
+ACT Release 12.0.0
 DNAPlotter Release 1.10
 BamView 1.2.8