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

[Eugene Zhukov]

Author: eugene-guest
Date: 2014-11-17 09:12:58 +0000 (Mon, 17 Nov 2014)
New Revision: 18593

Added:
   trunk/xslthl/debian/patches/using_system_config_file.diff
Modified:
   trunk/xslthl/debian/changelog
   trunk/xslthl/debian/control
   trunk/xslthl/debian/patches/series
Log:
fix for 769526

Modified: trunk/xslthl/debian/changelog
===================================================================
--- trunk/xslthl/debian/changelog	2014-11-16 13:55:49 UTC (rev 18592)
+++ trunk/xslthl/debian/changelog	2014-11-17 09:12:58 UTC (rev 18593)
@@ -1,7 +1,10 @@
-xslthl (2.1.0-4) UNRELEASED; urgency=low
+xslthl (2.1.0-4) unstable; urgency=low
 
   * Refreshed patches
   * Bump Std-Vers to 3.9.6, no changes needed
+  * Updated to debhelper 9
+  * Use configuration file provided by default -
+    thanks to Vasiliy Shlykov (Closes: #769526)
 
  -- Eugene Zhukov <jevgeni.zh at gmail.com>  Sun, 16 Nov 2014 11:59:06 +0000
 

Modified: trunk/xslthl/debian/control
===================================================================
--- trunk/xslthl/debian/control	2014-11-16 13:55:49 UTC (rev 18592)
+++ trunk/xslthl/debian/control	2014-11-17 09:12:58 UTC (rev 18593)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Eugene Zhukov <jevgeni.zh at gmail.com>, Mathieu Malaterre <malat at debian.org>
-Build-Depends: debhelper (>= 8), cdbs, default-jdk, maven-debian-helper (>= 1.6.1)
+Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-debian-helper (>= 1.6.1)
 Build-Depends-Indep: libsaxon-java (>= 6.5.5), libsaxonb-java (>= 9.1.0.8), libxalan2-java,
  junit4 
 Standards-Version: 3.9.6

Modified: trunk/xslthl/debian/patches/series
===================================================================
--- trunk/xslthl/debian/patches/series	2014-11-16 13:55:49 UTC (rev 18592)
+++ trunk/xslthl/debian/patches/series	2014-11-17 09:12:58 UTC (rev 18593)
@@ -1,2 +1,3 @@
 pom_fixes.patch
 sh_compat.patch
+using_system_config_file.diff

Added: trunk/xslthl/debian/patches/using_system_config_file.diff
===================================================================
--- trunk/xslthl/debian/patches/using_system_config_file.diff	                        (rev 0)
+++ trunk/xslthl/debian/patches/using_system_config_file.diff	2014-11-17 09:12:58 UTC (rev 18593)
@@ -0,0 +1,19 @@
+Description: use configuration file provided by package by default
+Author: Vasiliy Shlykov <vash at vasiliyshlykov.org>
+
+--- a/src/main/java/net/sf/xslthl/Config.java
++++ b/src/main/java/net/sf/xslthl/Config.java
+@@ -408,9 +408,11 @@
+ 				logger.config("No config file specified, falling back to default behavior");
+ 				if (System.getProperty(CONFIG_PROPERTY) != null) {
+ 					configFilename = System.getProperty(CONFIG_PROPERTY);
+-				} else {
++				} else if (new File("xslthl-config.xml").isFile()) {
+ 					configFilename = "xslthl-config.xml";
+-				}
++				} else {
++                                        configFilename = "/usr/share/xslthl/highlighters/xslthl-config.xml";
++                                }
+ 			}
+ 
+ 			logger.info(String.format("Loading Xslthl configuration from %s",