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

Mathieu Malaterre malat at alioth.debian.org
Tue Apr 23 08:28:12 UTC 2013 

Author: malat
Date: 2013-04-23 08:28:12 +0000 (Tue, 23 Apr 2013)
New Revision: 16557

Removed:
   trunk/xslthl/debian/patches/add_sh.patch
Modified:
   trunk/xslthl/debian/changelog
   trunk/xslthl/debian/control
   trunk/xslthl/debian/maven.cleanIgnoreRules
   trunk/xslthl/debian/maven.ignoreRules
   trunk/xslthl/debian/maven.publishedRules
   trunk/xslthl/debian/maven.rules
   trunk/xslthl/debian/orig-tar.sh
   trunk/xslthl/debian/patches/pom_fixes.patch
   trunk/xslthl/debian/patches/series
   trunk/xslthl/debian/rules
Log:
Merge work from Eugene

Modified: trunk/xslthl/debian/changelog
===================================================================
--- trunk/xslthl/debian/changelog	2013-04-20 19:00:37 UTC (rev 16556)
+++ trunk/xslthl/debian/changelog	2013-04-23 08:28:12 UTC (rev 16557)
@@ -4,6 +4,8 @@
   * Team upload
   * 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
@@ -12,7 +14,7 @@
     - Updated keywords for PHP 5.3 
     - Added LINQ keywords to C# configuration
     - Additional keywords added to Delphi configuration
-    - Basic plugin support to load additional highlighter implementations in Java.
+    - Basic plugin support to load more highlighter implementations in Java.
 
   [ Mathieu Malaterre ]
   * Update d/copyright

Modified: trunk/xslthl/debian/control
===================================================================
--- trunk/xslthl/debian/control	2013-04-20 19:00:37 UTC (rev 16556)
+++ trunk/xslthl/debian/control	2013-04-23 08:28:12 UTC (rev 16557)
@@ -1,10 +1,10 @@
 Source: xslthl
-Section: java
+Section: text
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Eugene Zhukov <jevgeni.zh at gmail.com>
+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.5)
-Build-Depends-Indep: libsaxon-java (>= 6.5.5), libsaxonb-java (>= 9.1.0.8), libxalan2-java,  
+Build-Depends-Indep: libsaxon-java (>= 6.5.5), libsaxonb-java (>= 9.1.0.8), libxalan2-java,
  junit4 
 Standards-Version: 3.9.4
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/xslthl
@@ -12,13 +12,16 @@
 Homepage: http://xslthl.sourceforge.net
 
 Package: libxslthl-java
+Section: java
 Architecture: all
 Depends: ${misc:Depends}, ${maven:Depends}
 Recommends: ${maven:OptionalDepends}
 Description: XSLT syntax highlighting
- This is an implementation of syntax highlighting as an extension module
- for XSLT processors, so if you have e.g. article about programming written
- in DocBook, code examples can be automatically syntax highlighted during
- the XSLT processing phase. This version of xslthl provides extensions of
- the Apache Xalan and Saxon XSLT processors.
-
+ This is an implementation of syntax highlighting as an extension module for
+ XSLT processors
+ .
+ Article about programming written in DocBook, code examples can be
+ automatically syntax highlighted during the XSLT processing phase.
+ .
+ This version of xslthl provides extensions of the Apache Xalan and Saxon
+ XSLT processors.

Modified: trunk/xslthl/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/xslthl/debian/maven.cleanIgnoreRules	2013-04-20 19:00:37 UTC (rev 16556)
+++ trunk/xslthl/debian/maven.cleanIgnoreRules	2013-04-23 08:28:12 UTC (rev 16557)
@@ -1,17 +1 @@
-# Maven clean ignore rules - ignore some Maven dependencies and plugins
-# during the clean phase of a Maven build
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., this dependency is then removed
-# from the POM before mvn clean is called
-#   junit junit jar s/3\..*/3.x/
 

Modified: trunk/xslthl/debian/maven.ignoreRules
===================================================================
--- trunk/xslthl/debian/maven.ignoreRules	2013-04-20 19:00:37 UTC (rev 16556)
+++ trunk/xslthl/debian/maven.ignoreRules	2013-04-23 08:28:12 UTC (rev 16557)
@@ -1,18 +1,3 @@
-# Maven ignore rules - ignore some Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., this dependency is then removed
-# from the POM
-#   junit junit jar s/3\..*/3.x/
 
 org.apache.maven.plugins maven-assembly-plugin * * * *
 org.apache.maven.plugins maven-javadoc-plugin * * * *

Modified: trunk/xslthl/debian/maven.publishedRules
===================================================================
--- trunk/xslthl/debian/maven.publishedRules	2013-04-20 19:00:37 UTC (rev 16556)
+++ trunk/xslthl/debian/maven.publishedRules	2013-04-23 08:28:12 UTC (rev 16557)
@@ -1,19 +1,2 @@
-# Maven published rules - additional rules to publish, to help
-# the packaging work of Debian maintainers using mh_make
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-#   in this case, elements that match are transformed using
-#   the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., replacing the version with 3.x
-#   junit junit jar s/3\..*/3.x/
 
+net.sf.xslthl xslthl jar s/2\..*/2.x/ * *

Modified: trunk/xslthl/debian/maven.rules
===================================================================
--- trunk/xslthl/debian/maven.rules	2013-04-20 19:00:37 UTC (rev 16556)
+++ trunk/xslthl/debian/maven.rules	2013-04-23 08:28:12 UTC (rev 16557)
@@ -1,20 +1,3 @@
-# Maven rules - transform Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-#   in this case, elements that match are transformed using
-#   the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., replacing the version with 3.x
-#   junit junit jar s/3\..*/3.x/
 
 junit junit jar s/4\..*/4.x/ * *
 net.sf.xslthl xslthl jar s/2\..*/2.x/ * *

Modified: trunk/xslthl/debian/orig-tar.sh
===================================================================
--- trunk/xslthl/debian/orig-tar.sh	2013-04-20 19:00:37 UTC (rev 16556)
+++ trunk/xslthl/debian/orig-tar.sh	2013-04-23 08:28:12 UTC (rev 16557)
@@ -6,7 +6,7 @@
 TAG=$(echo "xslthl-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
 
 svn export https://xslthl.svn.sourceforge.net/svnroot/xslthl/tags/${TAG}/ $DIR
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
+GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' --exclude 'examples' $DIR
 rm -rf $DIR ../$TAG
 
 # move to directory 'tarballs'

Deleted: trunk/xslthl/debian/patches/add_sh.patch
===================================================================
--- trunk/xslthl/debian/patches/add_sh.patch	2013-04-20 19:00:37 UTC (rev 16556)
+++ trunk/xslthl/debian/patches/add_sh.patch	2013-04-23 08:28:12 UTC (rev 16557)
@@ -1,87 +0,0 @@
-Description: add sh syntax highlighting
-Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Last-Update: 2011-11-27
-Bug: http://sourceforge.net/tracker/?func=detail&aid=3036514&group_id=153524&atid=788113
-Index: xslthl-2.0.2/highlighters/sh-hl.xml
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xslthl-2.0.2/highlighters/sh-hl.xml	2011-11-27 15:33:22.000000000 +0100
-@@ -0,0 +1,78 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+
-+Syntax highlighting definition for SH
-+
-+xslthl - XSLT Syntax Highlighting
-+http://sourceforge.net/projects/xslthl/
-+Copyright (C) 2010 Mathieu Malaterre
-+
-+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.
-+
-+Permission is granted to anyone to use this software for any purpose,
-+including commercial applications, and to alter it and redistribute it
-+freely, subject to the following restrictions:
-+
-+1. The origin of this software must not be misrepresented; you must not
-+   claim that you wrote the original software. If you use this software
-+   in a product, an acknowledgment in the product documentation would be
-+   appreciated but is not required.
-+2. Altered source versions must be plainly marked as such, and must not be
-+   misrepresented as being the original software.
-+3. This notice may not be removed or altered from any source distribution.
-+
-+-->
-+<highlighters>
-+  <highlighter type="oneline-comment">#</highlighter>
-+  <highlighter type="heredoc">
-+    <start><<</start>
-+    <quote>'</quote>
-+    <quote>"</quote>
-+    <noWhiteSpace/>
-+  </highlighter>
-+  <highlighter type="string">
-+    <string>"</string>
-+    <escape>\</escape>
-+  </highlighter>
-+  <highlighter type="string">
-+    <string>'</string>
-+    <escape>\</escape>
-+    <spanNewLines/>
-+  </highlighter>
-+  <highlighter type="hexnumber">
-+    <prefix>0x</prefix>
-+    <ignoreCase/>
-+  </highlighter>
-+  <highlighter type="number">
-+    <point>.</point>
-+    <pointStarts/>
-+    <ignoreCase/>
-+  </highlighter>
-+  <highlighter type="keywords">
-+    <keyword>break</keyword>
-+    <keyword>cd</keyword>
-+    <keyword>chdir</keyword>
-+    <keyword>continue</keyword>
-+    <keyword>eval</keyword>
-+    <keyword>exec</keyword>
-+    <keyword>exit</keyword>
-+    <keyword>kill</keyword>
-+    <keyword>newgrp</keyword>
-+    <keyword>pwd</keyword>
-+    <keyword>read</keyword>
-+    <keyword>readonly</keyword>
-+    <keyword>return</keyword>
-+    <keyword>shift</keyword>
-+    <keyword>test</keyword>
-+    <keyword>trap</keyword>
-+    <keyword>ulimit</keyword>
-+    <keyword>umask</keyword>
-+    <keyword>wait</keyword>
-+    <keyword>contained</keyword>
-+    <keyword>elif</keyword>
-+    <keyword>else</keyword>
-+    <keyword>then</keyword>
-+  </highlighter>
-+</highlighters>

Modified: trunk/xslthl/debian/patches/pom_fixes.patch
===================================================================
--- trunk/xslthl/debian/patches/pom_fixes.patch	2013-04-20 19:00:37 UTC (rev 16556)
+++ trunk/xslthl/debian/patches/pom_fixes.patch	2013-04-23 08:28:12 UTC (rev 16557)
@@ -1,32 +1,16 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- xslthl (2.1.0-1) UNRELEASED; urgency=low
- .
-   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your
-     ITP>
+Description: pom fixes for debian packaging
+ * 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>
 
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- xslthl-2.1.0.orig/pom.xml
-+++ xslthl-2.1.0/pom.xml
-@@ -30,6 +30,27 @@ This version of xslthl provides extensio
+--- a/pom.xml
++++ b/pom.xml
+@@ -30,6 +30,27 @@
  	<build>
  		<plugins>
  			<plugin>
@@ -54,7 +38,7 @@
  				<groupId>org.codehaus.mojo</groupId>
  				<artifactId>findbugs-maven-plugin</artifactId>
  				<version>2.5.2</version>
-@@ -43,23 +64,6 @@ This version of xslthl provides extensio
+@@ -43,23 +64,6 @@
  				</executions>
  			</plugin>
  			<plugin>
@@ -78,7 +62,7 @@
  				<artifactId>maven-assembly-plugin</artifactId>
  				<version>2.3</version>
  				<configuration>
-@@ -129,24 +133,21 @@ This version of xslthl provides extensio
+@@ -129,24 +133,21 @@
  			<groupId>xalan</groupId>
  			<artifactId>xalan</artifactId>
  			<version>[2.7,2.8)</version>

Modified: trunk/xslthl/debian/patches/series
===================================================================
--- trunk/xslthl/debian/patches/series	2013-04-20 19:00:37 UTC (rev 16556)
+++ trunk/xslthl/debian/patches/series	2013-04-23 08:28:12 UTC (rev 16557)
@@ -1,2 +1 @@
 pom_fixes.patch
-add_sh.patch

Modified: trunk/xslthl/debian/rules
===================================================================
--- trunk/xslthl/debian/rules	2013-04-20 19:00:37 UTC (rev 16556)
+++ trunk/xslthl/debian/rules	2013-04-23 08:28:12 UTC (rev 16557)
@@ -5,5 +5,8 @@
 
 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

More information about the pkg-java-commits mailing list