[pkg-java] r18592 - in trunk/xslthl/debian: . patches
Eugene Zhukov
eugene-guest at moszumanska.debian.org
Sun Nov 16 13:55:49 UTC 2014
Author: eugene-guest
Date: 2014-11-16 13:55:49 +0000 (Sun, 16 Nov 2014)
New Revision: 18592
Modified:
trunk/xslthl/debian/changelog
trunk/xslthl/debian/control
trunk/xslthl/debian/copyright
trunk/xslthl/debian/maven.ignoreRules
trunk/xslthl/debian/maven.rules
trunk/xslthl/debian/patches/pom_fixes.patch
trunk/xslthl/debian/patches/sh_compat.patch
Log:
refreshed old patches
Modified: trunk/xslthl/debian/changelog
===================================================================
--- trunk/xslthl/debian/changelog 2014-11-13 00:16:36 UTC (rev 18591)
+++ trunk/xslthl/debian/changelog 2014-11-16 13:55:49 UTC (rev 18592)
@@ -1,3 +1,10 @@
+xslthl (2.1.0-4) UNRELEASED; urgency=low
+
+ * Refreshed patches
+ * Bump Std-Vers to 3.9.6, no changes needed
+
+ -- Eugene Zhukov <jevgeni.zh at gmail.com> Sun, 16 Nov 2014 11:59:06 +0000
+
xslthl (2.1.0-3) unstable; urgency=low
* Fix maven-debian-helper back n' forth: provides symlink. Closes: #711318
Modified: trunk/xslthl/debian/control
===================================================================
--- trunk/xslthl/debian/control 2014-11-13 00:16:36 UTC (rev 18591)
+++ trunk/xslthl/debian/control 2014-11-16 13:55:49 UTC (rev 18592)
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 8), 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.4
+Standards-Version: 3.9.6
Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/xslthl
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/xslthl
Homepage: http://xslthl.sourceforge.net
Modified: trunk/xslthl/debian/copyright
===================================================================
--- trunk/xslthl/debian/copyright 2014-11-13 00:16:36 UTC (rev 18591)
+++ trunk/xslthl/debian/copyright 2014-11-16 13:55:49 UTC (rev 18592)
@@ -4,7 +4,7 @@
Files: *
Copyright: 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
-License:
+License: Zlib
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
@@ -23,5 +23,5 @@
Files: debian/*
Copyright: 2010-2012 Mathieu Malaterre <malat at debian.org>
-License:
+License: Zlib
Same as above
Modified: trunk/xslthl/debian/maven.ignoreRules
===================================================================
--- trunk/xslthl/debian/maven.ignoreRules 2014-11-13 00:16:36 UTC (rev 18591)
+++ trunk/xslthl/debian/maven.ignoreRules 2014-11-16 13:55:49 UTC (rev 18592)
@@ -1,4 +1,5 @@
+org.apache.maven.plugins maven-antrun-plugin * * * *
org.apache.maven.plugins maven-assembly-plugin * * * *
org.apache.maven.plugins maven-javadoc-plugin * * * *
org.apache.maven.plugins maven-source-plugin * * * *
Modified: trunk/xslthl/debian/maven.rules
===================================================================
--- trunk/xslthl/debian/maven.rules 2014-11-13 00:16:36 UTC (rev 18591)
+++ trunk/xslthl/debian/maven.rules 2014-11-16 13:55:49 UTC (rev 18592)
@@ -1,3 +1,5 @@
+junit junit jar s/.*/4.x/ * *
junit junit jar s/4\..*/4.x/ * *
net.sf.xslthl xslthl jar s/2\..*/2.x/ * *
+s/net.sf.saxon/net.sourceforge.saxon/ saxon jar s/.*/debian/ * *
Modified: trunk/xslthl/debian/patches/pom_fixes.patch
===================================================================
--- trunk/xslthl/debian/patches/pom_fixes.patch 2014-11-13 00:16:36 UTC (rev 18591)
+++ trunk/xslthl/debian/patches/pom_fixes.patch 2014-11-16 13:55:49 UTC (rev 18592)
@@ -2,16 +2,11 @@
* Added maven-jar-plugin to get Class-Path element into the manifest
* Added maven-compiler-plugin to force maven to build under jdk-1.6
* Added maven-surefire-plugin to run tests properly
- * Removed maven-antrun-plugin, not needed because examples are dropped
- * Removed <optional> flag from dependencies to get correct package 'Depends on'
- * Saxon groupId fixed according to newer version of Saxon in Debian
- * Modified JUnit version to help mh_make find it
Author: Eugene Zhukov <jevgeni.zh at gmail.com>
-Last-Update: <2013-04-17>
---- a/pom.xml
-+++ b/pom.xml
-@@ -30,6 +30,39 @@
+--- xslthl-2.1.0.orig/pom.xml
++++ xslthl-2.1.0/pom.xml
+@@ -30,6 +30,38 @@ This version of xslthl provides extensio
<build>
<plugins>
<plugin>
@@ -21,15 +16,15 @@
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
++ <classpathLayoutType>custom</classpathLayoutType>
++ <customClasspathLayout>/usr/share/java/$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
+ </manifest>
+ </archive>
+ </configuration>
-+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
-+ <version>2.0.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
@@ -38,7 +33,6 @@
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
-+ <version>2.10</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
@@ -51,54 +45,3 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.5.2</version>
-@@ -43,23 +76,6 @@
- </executions>
- </plugin>
- <plugin>
-- <artifactId>maven-antrun-plugin</artifactId>
-- <version>1.7</version>
-- <executions>
-- <execution>
-- <phase>site</phase>
-- <configuration>
-- <target>
-- <ant dir="examples" />
-- </target>
-- </configuration>
-- <goals>
-- <goal>run</goal>
-- </goals>
-- </execution>
-- </executions>
-- </plugin>
-- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- <configuration>
-@@ -129,24 +145,21 @@
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>[2.7,2.8)</version>
-- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>saxon</groupId>
- <artifactId>saxon</artifactId>
- <version>[6.5,7.0]</version>
-- <optional>true</optional>
- </dependency>
- <dependency>
-- <groupId>net.sf.saxon</groupId>
-+ <groupId>net.sourceforge.saxon</groupId>
- <artifactId>saxon</artifactId>
- <version>[8.5,)</version>
-- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
-- <version>[4.0,5.0)</version>
-+ <version>4.x</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
Modified: trunk/xslthl/debian/patches/sh_compat.patch
===================================================================
--- trunk/xslthl/debian/patches/sh_compat.patch 2014-11-13 00:16:36 UTC (rev 18591)
+++ trunk/xslthl/debian/patches/sh_compat.patch 2014-11-16 13:55:49 UTC (rev 18592)
@@ -2,10 +2,8 @@
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
+--- a/highlighters/xslthl-config.xml
++++ b/highlighters/xslthl-config.xml
@@ -43,6 +43,7 @@
<highlighter id="perl" file="perl-hl.xml" />
<highlighter id="javascript" file="javascript-hl.xml" />
@@ -14,10 +12,3 @@
<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>
More information about the pkg-java-commits
mailing list