[med-svn] r10717 - in trunk/packages/pixelmed/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2012-05-07 08:56:09 +0000 (Mon, 07 May 2012)
New Revision: 10717

Added:
   trunk/packages/pixelmed/trunk/debian/patches/fixfonts.patch
Removed:
   trunk/packages/pixelmed/trunk/debian/README.source
Modified:
   trunk/packages/pixelmed/trunk/debian/changelog
   trunk/packages/pixelmed/trunk/debian/copyright
   trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch
   trunk/packages/pixelmed/trunk/debian/patches/series
Log:
Fix fonts issues

Deleted: trunk/packages/pixelmed/trunk/debian/README.source
===================================================================
--- trunk/packages/pixelmed/trunk/debian/README.source	2012-05-07 07:55:31 UTC (rev 10716)
+++ trunk/packages/pixelmed/trunk/debian/README.source	2012-05-07 08:56:09 UTC (rev 10717)
@@ -1,2 +0,0 @@
-This packages uses the quilt patch system. Please read
-/usr/share/doc/quilt/README.source for more information.

Modified: trunk/packages/pixelmed/trunk/debian/changelog
===================================================================
--- trunk/packages/pixelmed/trunk/debian/changelog	2012-05-07 07:55:31 UTC (rev 10716)
+++ trunk/packages/pixelmed/trunk/debian/changelog	2012-05-07 08:56:09 UTC (rev 10717)
@@ -2,6 +2,7 @@
 
   * Use my @d.o alias
   * fix issue with encapsulated DICOM files (need libjai-imageio-core-java)
+  * Add missing jmdns.jar in manifest file
 
  -- Mathieu Malaterre <malat at debian.org>  Sat, 05 May 2012 18:45:29 +0200
 

Modified: trunk/packages/pixelmed/trunk/debian/copyright
===================================================================
--- trunk/packages/pixelmed/trunk/debian/copyright	2012-05-07 07:55:31 UTC (rev 10716)
+++ trunk/packages/pixelmed/trunk/debian/copyright	2012-05-07 08:56:09 UTC (rev 10717)
@@ -34,7 +34,6 @@
  applicable local, state, national or international regulations.
 
 Files: debian/*
-Copyright:
- Copyright 2009-2012, Mathieu Malaterre <malat at debian.org>
+Copyright: 2009-2012, Mathieu Malaterre <malat at debian.org>
 License: BSD
  Same as above

Modified: trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch	2012-05-07 07:55:31 UTC (rev 10716)
+++ trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch	2012-05-07 08:56:09 UTC (rev 10717)
@@ -12,7 +12,7 @@
  	(cd com/pixelmed/test; make all)
  	date >BUILDDATE
 -	jar -cvf $@ BUILDDATE COPYRIGHT \
-+	echo "Class-Path: hsqldb.jar vecmath.jar commons-codec.jar bcprov.jar commons-net2.jar" > manifest.txt
++	echo "Class-Path: jmdns.jar hsqldb.jar vecmath.jar commons-codec.jar bcprov.jar commons-net2.jar" > manifest.txt
 +	jar -cvfm $@ manifest.txt BUILDDATE COPYRIGHT \
  		com/pixelmed/display/*.class \
  		com/pixelmed/display/*.properties \

Added: trunk/packages/pixelmed/trunk/debian/patches/fixfonts.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/fixfonts.patch	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/patches/fixfonts.patch	2012-05-07 08:56:09 UTC (rev 10717)
@@ -0,0 +1,20 @@
+Description: Attempt to display UNICODE fonts
+ No such things as Arial Unicode MS or Bitstream Cybertif on debian OS
+Author: Mathieu Malaterre <malat at debian.org>
+
+Index: pixelmed-20120218/com/pixelmed/display/ApplicationFrame.java
+===================================================================
+--- pixelmed-20120218.orig/com/pixelmed/display/ApplicationFrame.java	2012-05-07 10:50:17.956072578 +0200
++++ pixelmed-20120218/com/pixelmed/display/ApplicationFrame.java	2012-05-07 10:50:44.912071605 +0200
+@@ -238,7 +238,10 @@
+ 		if (font == null || !font.getFamily().equals("Arial Unicode MS")) {
+ 			font = new Font("Bitstream Cyberbit",Font.PLAIN,13);
+ 			if (font == null || !font.getFamily().equals("Bitstream Cyberbit")) {
+-				font=null;
++			  font = new Font("Liberation Sans",Font.PLAIN,12);
++			  if (font == null || !font.getFamily().equals("Liberation Sans")) {
++			  	font=null;
++        }
+ 			}
+ 		}
+ 		if (font == null) {

Modified: trunk/packages/pixelmed/trunk/debian/patches/series
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/series	2012-05-07 07:55:31 UTC (rev 10716)
+++ trunk/packages/pixelmed/trunk/debian/patches/series	2012-05-07 08:56:09 UTC (rev 10717)
@@ -7,3 +7,4 @@
 commons-net-ftp.patch
 addmanifest.patch
 removetest.patch
+fixfonts.patch