[pkg-java] r16558 - in trunk/xslthl/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2013-04-23 08:44:35 +0000 (Tue, 23 Apr 2013)
New Revision: 16558

Added:
   trunk/xslthl/debian/patches/sh_compat.patch
Modified:
   trunk/xslthl/debian/changelog
   trunk/xslthl/debian/patches/series
   trunk/xslthl/debian/rules
Log:
Fix issue with sh vs bourne

Modified: trunk/xslthl/debian/changelog
===================================================================
--- trunk/xslthl/debian/changelog	2013-04-23 08:28:12 UTC (rev 16557)
+++ trunk/xslthl/debian/changelog	2013-04-23 08:44:35 UTC (rev 16558)
@@ -5,7 +5,6 @@
   * Bump Std-Vers to 3.9.4, no changes needed
   * Removed d/p/add_cmake.patch applied upstream
   * Removed d/p/add_sh.patch applied upstream as bourne highlighter
-  * Provide symlink to upstream bourne highlighter using sh for compat
   * New upsteam: 2.1.0
     - New syntax configurations
     - New option for the Number highlighter: letterNoFollow
@@ -21,6 +20,7 @@
   * Use my @d.o alias
   * Remove DMUA flag, not required
   * Bump Std-Vers to 3.9.3, no changes needed
+  * Provide link to upstream bourne-hl as shin config.xml
 
  -- Eugene Zhukov <jevgeni.zh at gmail.com>  Thu, 21 Feb 2013 16:05:33 +0200
 

Modified: trunk/xslthl/debian/patches/series
===================================================================
--- trunk/xslthl/debian/patches/series	2013-04-23 08:28:12 UTC (rev 16557)
+++ trunk/xslthl/debian/patches/series	2013-04-23 08:44:35 UTC (rev 16558)
@@ -1 +1,2 @@
 pom_fixes.patch
+sh_compat.patch

Added: trunk/xslthl/debian/patches/sh_compat.patch
===================================================================
--- trunk/xslthl/debian/patches/sh_compat.patch	                        (rev 0)
+++ trunk/xslthl/debian/patches/sh_compat.patch	2013-04-23 08:44:35 UTC (rev 16558)
@@ -0,0 +1,23 @@
+Description: provide backward compat with debian xslthl 2.0.x package
+  bourne highlighter was available as `sh`
+Author: Mathieu Malaterre <malat at debian.org>
+
+Index: xslthl-2.1.0/highlighters/xslthl-config.xml
+===================================================================
+--- xslthl-2.1.0.orig/highlighters/xslthl-config.xml	2013-04-23 10:41:27.999751741 +0200
++++ xslthl-2.1.0/highlighters/xslthl-config.xml	2013-04-23 10:41:36.267751646 +0200
+@@ -43,6 +43,7 @@
+ 	<highlighter id="perl" file="perl-hl.xml" />	
+ 	<highlighter id="javascript" file="javascript-hl.xml" />
+ 	<highlighter id="bourne" file="bourne-hl.xml" />
++	<highlighter id="sh" file="bourne-hl.xml" />
+ 	<highlighter id="css" file="css21-hl.xml" />
+ 	<highlighter id="css21" file="css21-hl.xml" />
+ 	<highlighter id="cmake" file="cmake-hl.xml" />
+@@ -53,4 +54,4 @@
+ 	<highlighter id="sql2003" file="sql2003-hl.xml" />
+ 	<highlighter id="sql" file="sql2003-hl.xml" />
+ 	<namespace prefix="xslthl" uri="http://xslthl.sf.net" />
+-</xslthl-config>
+\ No newline at end of file
++</xslthl-config>

Modified: trunk/xslthl/debian/rules
===================================================================
--- trunk/xslthl/debian/rules	2013-04-23 08:28:12 UTC (rev 16557)
+++ trunk/xslthl/debian/rules	2013-04-23 08:44:35 UTC (rev 16558)
@@ -5,8 +5,5 @@
 
 JAVA_HOME := /usr/lib/jvm/default-java
 
-install/libxslthl-java::
-	dh_link /usr/share/xslthl/highlighters/bourne-hl.xml /usr/share/xslthl/highlighters/sh-hl.xml
-
 get-orig-source:
 	uscan --force-download