[pkg-java] r16519 - in trunk/xslthl/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Thu Apr 11 09:24:08 UTC 2013
Author: malat
Date: 2013-04-11 09:24:08 +0000 (Thu, 11 Apr 2013)
New Revision: 16519
Added:
trunk/xslthl/debian/libxslthl-java.docs
trunk/xslthl/debian/libxslthl-java.poms
trunk/xslthl/debian/maven.cleanIgnoreRules
trunk/xslthl/debian/maven.ignoreRules
trunk/xslthl/debian/maven.properties
trunk/xslthl/debian/maven.publishedRules
trunk/xslthl/debian/maven.rules
trunk/xslthl/debian/patches/pom_fixes.patch
Removed:
trunk/xslthl/debian/javabuild
trunk/xslthl/debian/libxslthl-java.jlibs
trunk/xslthl/debian/patches/add_cmake.patch
Modified:
trunk/xslthl/debian/README.source
trunk/xslthl/debian/changelog
trunk/xslthl/debian/control
trunk/xslthl/debian/copyright
trunk/xslthl/debian/libxslthl-java.install
trunk/xslthl/debian/orig-tar.sh
trunk/xslthl/debian/patches/add_sh.patch
trunk/xslthl/debian/patches/series
trunk/xslthl/debian/rules
trunk/xslthl/debian/watch
Log:
Import changes from Eugene on mentors.d.n
Modified: trunk/xslthl/debian/README.source
===================================================================
--- trunk/xslthl/debian/README.source 2013-04-10 12:56:04 UTC (rev 16518)
+++ trunk/xslthl/debian/README.source 2013-04-11 09:24:08 UTC (rev 16519)
@@ -1,9 +1,14 @@
-This debian package is a stripped version of upstream xslthl.
+Information about xslthl
+------------------------------
-libs/ directory has been removed. It contained convenient copy of
-libsaxon-java, libsaxonb-java and libxalan2-java
+This package was debianized using the mh_make command
+from the maven-debian-helper package.
-examples/ directory has also been removed. It contained third party file, with
+The build system uses Maven but prevents it from downloading
+anything from the Internet, making the build compliant with
+the Debian policy.
+
+examples/ directory has been removed. It contained third party file, with
no clear license or conflicting license (eg. GPL)
- -- Mathieu Malaterre <malat at debian.org> Tue, 23 Feb 2010 14:58:29 +0100
+ -- Mathieu Malaterre (malat) <mathieu.malaterre at gmail.com> Tue, 23 Feb 2010 14:58:29 +0100
Modified: trunk/xslthl/debian/changelog
===================================================================
--- trunk/xslthl/debian/changelog 2013-04-10 12:56:04 UTC (rev 16518)
+++ trunk/xslthl/debian/changelog 2013-04-11 09:24:08 UTC (rev 16519)
@@ -1,11 +1,17 @@
-xslthl (2.0.2-5) UNRELEASED; urgency=low
+xslthl (2.1.0-1) UNRELEASED; urgency=low
- * Update d/copyright
- * Use my @d.o alias
- * Remove DMUA flag, not required
- * Bump Std-Vers to 3.9.3, no changes needed
+ * Team upload
+ * New upsteam
+ * New syntax configurations
+ * New option for the Number highlighter: letterNoFollow
+ * New option for the Heredoc highlighter: flag
+ * New options for the Keyword highlighter
+ * 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.
- -- Mathieu Malaterre <malat at debian.org> Wed, 11 Apr 2012 22:35:03 +0200
+ -- Eugene Zhukov <jevgeni.zh at gmail.com> Thu, 21 Feb 2013 16:05:33 +0200
xslthl (2.0.2-4) unstable; urgency=low
Modified: trunk/xslthl/debian/control
===================================================================
--- trunk/xslthl/debian/control 2013-04-10 12:56:04 UTC (rev 16518)
+++ trunk/xslthl/debian/control 2013-04-11 09:24:08 UTC (rev 16519)
@@ -1,22 +1,24 @@
Source: xslthl
-Section: text
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Mathieu Malaterre <malat at debian.org>
-Build-Depends: debhelper (>= 8), ant, default-jdk, javahelper (>= 0.33~)
-Build-Depends-Indep: libsaxon-java, libsaxonb-java, libxalan2-java
-Standards-Version: 3.9.3
-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/xslthl
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/xslthl/
-Homepage: http://xslthl.sourceforge.net/
+Uploaders: Eugene Zhukov <jevgeni.zh at gmail.com>
+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,
+ junit4
+Standards-Version: 3.9.4
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/xslthl
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/xslthl
+Homepage: http://xslthl.sourceforge.net
Package: libxslthl-java
-Section: java
Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
+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
- .
- Article about programming written in DocBook, code examples can be
- automatically syntax highlighted during the XSLT processing phase.
+ 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.
+
Modified: trunk/xslthl/debian/copyright
===================================================================
--- trunk/xslthl/debian/copyright 2013-04-10 12:56:04 UTC (rev 16518)
+++ trunk/xslthl/debian/copyright 2013-04-11 09:24:08 UTC (rev 16519)
@@ -1,6 +1,6 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: http://dep.debian.net/deps/dep5/
Upstream-Name: xslthl
-Source: http://xslthl.sourceforge.net/
+Source: http://xslthl.sourceforge.net
Files: *
Copyright: 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
@@ -22,6 +22,21 @@
3. This notice may not be removed or altered from any source distribution.
Files: debian/*
-Copyright: 2010-2012 Mathieu Malaterre <malat at debian.org>
+Copyright: 2010 Mathieu Malaterre (malat) <mathieu.malaterre at gmail.com>
License:
- Same as above
+ 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.
+
Deleted: trunk/xslthl/debian/javabuild
===================================================================
--- trunk/xslthl/debian/javabuild 2013-04-10 12:56:04 UTC (rev 16518)
+++ trunk/xslthl/debian/javabuild 2013-04-11 09:24:08 UTC (rev 16519)
@@ -1 +0,0 @@
-xslthl.jar src
Added: trunk/xslthl/debian/libxslthl-java.docs
===================================================================
--- trunk/xslthl/debian/libxslthl-java.docs (rev 0)
+++ trunk/xslthl/debian/libxslthl-java.docs 2013-04-11 09:24:08 UTC (rev 16519)
@@ -0,0 +1 @@
+debian/README.source
Modified: trunk/xslthl/debian/libxslthl-java.install
===================================================================
--- trunk/xslthl/debian/libxslthl-java.install 2013-04-10 12:56:04 UTC (rev 16518)
+++ trunk/xslthl/debian/libxslthl-java.install 2013-04-11 09:24:08 UTC (rev 16519)
@@ -1 +1,2 @@
-highlighters /usr/share/xslthl
+target/xslthl-2.1.0.jar usr/share/java
+highlighters usr/share/xslthl
Deleted: trunk/xslthl/debian/libxslthl-java.jlibs
===================================================================
--- trunk/xslthl/debian/libxslthl-java.jlibs 2013-04-10 12:56:04 UTC (rev 16518)
+++ trunk/xslthl/debian/libxslthl-java.jlibs 2013-04-11 09:24:08 UTC (rev 16519)
@@ -1 +0,0 @@
-xslthl.jar
Added: trunk/xslthl/debian/libxslthl-java.poms
===================================================================
--- trunk/xslthl/debian/libxslthl-java.poms (rev 0)
+++ trunk/xslthl/debian/libxslthl-java.poms 2013-04-11 09:24:08 UTC (rev 16519)
@@ -0,0 +1,28 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+pom.xml --no-parent --has-package-version
Added: trunk/xslthl/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/xslthl/debian/maven.cleanIgnoreRules (rev 0)
+++ trunk/xslthl/debian/maven.cleanIgnoreRules 2013-04-11 09:24:08 UTC (rev 16519)
@@ -0,0 +1,17 @@
+# 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/
+
Added: trunk/xslthl/debian/maven.ignoreRules
===================================================================
--- trunk/xslthl/debian/maven.ignoreRules (rev 0)
+++ trunk/xslthl/debian/maven.ignoreRules 2013-04-11 09:24:08 UTC (rev 16519)
@@ -0,0 +1,20 @@
+# 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 * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.codehaus.mojo findbugs-maven-plugin * * * *
Added: trunk/xslthl/debian/maven.properties
===================================================================
--- trunk/xslthl/debian/maven.properties (rev 0)
+++ trunk/xslthl/debian/maven.properties 2013-04-11 09:24:08 UTC (rev 16519)
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+project.build.sourceEncoding=UTF-8
Added: trunk/xslthl/debian/maven.publishedRules
===================================================================
--- trunk/xslthl/debian/maven.publishedRules (rev 0)
+++ trunk/xslthl/debian/maven.publishedRules 2013-04-11 09:24:08 UTC (rev 16519)
@@ -0,0 +1,19 @@
+# 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/
+
Added: trunk/xslthl/debian/maven.rules
===================================================================
--- trunk/xslthl/debian/maven.rules (rev 0)
+++ trunk/xslthl/debian/maven.rules 2013-04-11 09:24:08 UTC (rev 16519)
@@ -0,0 +1,20 @@
+# 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-10 12:56:04 UTC (rev 16518)
+++ trunk/xslthl/debian/orig-tar.sh 2013-04-11 09:24:08 UTC (rev 16519)
@@ -1,20 +1,16 @@
-#!/bin/sh
+#!/bin/sh -e
-set -eu
-
VERSION=$2
TAR=../xslthl_$VERSION.orig.tar.gz
DIR=xslthl-$VERSION
-#TAG=$(echo "xslthl-$VERSION" | sed -re's,\.,_,g')
-TAG=$DIR
+TAG=$(echo "xslthl-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
-svn export http://xslthl.svn.sourceforge.net/svnroot/xslthl/tags/${TAG} $DIR
-tar -c -z -f $TAR --exclude '*.jar' $DIR
+svn export https://xslthl.svn.sourceforge.net/svnroot/xslthl/tags/${TAG}/ $DIR
+GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
rm -rf $DIR ../$TAG
# move to directory 'tarballs'
if [ -r .svn/deb-layout ]; then
. .svn/deb-layout
- mv $TAR $origDir
- echo "moved $TAR to $origDir"
+ mv $TAR $origDir && echo "moved $TAR to $origDir"
fi
Deleted: trunk/xslthl/debian/patches/add_cmake.patch
===================================================================
--- trunk/xslthl/debian/patches/add_cmake.patch 2013-04-10 12:56:04 UTC (rev 16518)
+++ trunk/xslthl/debian/patches/add_cmake.patch 2013-04-11 09:24:08 UTC (rev 16519)
@@ -1,219 +0,0 @@
-Description: add cmake syntax highlighting
-Author: Mathieu Malaterre <malat at debian.org>
-Last-Update: 2011-11-27
-Bug: http://sourceforge.net/tracker/?func=detail&aid=2957224&group_id=153524&atid=788113
-
-Index: xslthl-2.0.2/highlighters/cmake-hl.xml
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xslthl-2.0.2/highlighters/cmake-hl.xml 2011-11-27 15:32:16.000000000 +0100
-@@ -0,0 +1,189 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+
-+Syntax highlighting definition for CMake
-+Copyright (c) 2010 Mathieu Malaterre
-+
-+-->
-+<highlighters>
-+ <!--highlighter type="annotation">
-+ <start>@</start>
-+ <valueStart>(</valueStart>
-+ <valueEnd>)</valueEnd>
-+ </highlighter-->
-+ <highlighter type="oneline-comment">#</highlighter>
-+ <!--highlighter type="string">
-+ <string>"""</string>
-+ <spanNewLines />
-+ </highlighter-->
-+ <!--highlighter type="string">
-+ <string>'''</string>
-+ <spanNewLines />
-+ </highlighter-->
-+ <highlighter type="string">
-+ <string>"</string>
-+ <endString>"</endString>
-+ <!--escape>\</escape-->
-+ <spanNewLines/>
-+ </highlighter>
-+ <!--highlighter type="string">
-+ <string>'</string>
-+ <escape>\</escape>
-+ </highlighter-->
-+ <highlighter type="hexnumber">
-+ <prefix>0x</prefix>
-+ <suffix>l</suffix>
-+ <ignoreCase/>
-+ <style>string</style>
-+ </highlighter>
-+ <highlighter type="number">
-+ <point>.</point>
-+ <ignoreCase/>
-+ <style>string</style>
-+ </highlighter>
-+ <highlighter type="keywords">
-+ <!-- system variable -->
-+ <keyword>WIN32</keyword>
-+ <keyword>UNIX</keyword>
-+ <keyword>APPLE</keyword>
-+ <keyword>CYGWIN</keyword>
-+ <keyword>BORLAND</keyword>
-+ <keyword>MINGW</keyword>
-+ <keyword>MSVC</keyword>
-+ <keyword>MSVC_IDE</keyword>
-+ <keyword>MSVC60</keyword>
-+ <keyword>MSVC70</keyword>
-+ <keyword>MSVC71</keyword>
-+ <keyword>MSVC80</keyword>
-+ <style>attribute</style>
-+ </highlighter>
-+ <highlighter type="keywords">
-+ <!-- operators -->
-+ <keyword>AND</keyword>
-+ <keyword>BOOL</keyword>
-+ <keyword>CACHE</keyword>
-+ <keyword>COMMAND</keyword>
-+ <keyword>DEFINED</keyword>
-+ <keyword>DOC</keyword>
-+ <keyword>EQUAL</keyword>
-+ <keyword>EXISTS</keyword>
-+ <keyword>FALSE</keyword>
-+ <keyword>GREATER</keyword>
-+ <keyword>INTERNAL</keyword>
-+ <keyword>LESS</keyword>
-+ <keyword>MATCHES</keyword>
-+ <keyword>NAME</keyword>
-+ <keyword>NAMES</keyword>
-+ <keyword>NAME_WE</keyword>
-+ <keyword>NOT</keyword>
-+ <keyword>OFF</keyword>
-+ <keyword>ON</keyword>
-+ <keyword>OR</keyword>
-+ <keyword>PATH</keyword>
-+ <keyword>PATHS</keyword>
-+ <keyword>PROGRAM</keyword>
-+ <keyword>STREQUAL</keyword>
-+ <keyword>STRGREATER</keyword>
-+ <keyword>STRING</keyword>
-+ <keyword>STRLESS</keyword>
-+ <keyword>TRUE</keyword>
-+ <!-- color in blue -->
-+ <!--style>doccomment</style>-->
-+ <style>keyword</style>
-+ </highlighter>
-+ <highlighter type="keywords">
-+ <!-- statement -->
-+ <keyword>ADD_CUSTOM_COMMAND</keyword>
-+ <keyword>ADD_CUSTOM_TARGET</keyword>
-+ <keyword>ADD_DEFINITIONS</keyword>
-+ <keyword>ADD_DEPENDENCIES</keyword>
-+ <keyword>ADD_EXECUTABLE</keyword>
-+ <keyword>ADD_LIBRARY</keyword>
-+ <keyword>ADD_SUBDIRECTORY</keyword>
-+ <keyword>ADD_TEST</keyword>
-+ <keyword>AUX_SOURCE_DIRECTORY</keyword>
-+ <keyword>BUILD_COMMAND</keyword>
-+ <keyword>BUILD_NAME</keyword>
-+ <keyword>CMAKE_MINIMUM_REQUIRED</keyword>
-+ <keyword>CONFIGURE_FILE</keyword>
-+ <keyword>CREATE_TEST_SOURCELIST</keyword>
-+ <keyword>ELSE</keyword>
-+ <keyword>ELSEIF</keyword>
-+ <keyword>ENABLE_LANGUAGE</keyword>
-+ <keyword>ENABLE_TESTING</keyword>
-+ <keyword>ENDFOREACH</keyword>
-+ <keyword>ENDIF</keyword>
-+ <keyword>ENDWHILE</keyword>
-+ <keyword>EXEC_PROGRAM</keyword>
-+ <keyword>EXECUTE_PROCESS</keyword>
-+ <keyword>EXPORT_LIBRARY_DEPENDENCIES</keyword>
-+ <keyword>FILE</keyword>
-+ <keyword>FIND_FILE</keyword>
-+ <keyword>FIND_LIBRARY</keyword>
-+ <keyword>FIND_PACKAGE</keyword>
-+ <keyword>FIND_PATH</keyword>
-+ <keyword>FIND_PROGRAM</keyword>
-+ <keyword>FLTK_WRAP_UI</keyword>
-+ <keyword>FOREACH</keyword>
-+ <keyword>GET_CMAKE_PROPERTY</keyword>
-+ <keyword>GET_DIRECTORY_PROPERTY</keyword>
-+ <keyword>GET_FILENAME_COMPONENT</keyword>
-+ <keyword>GET_SOURCE_FILE_PROPERTY</keyword>
-+ <keyword>GET_TARGET_PROPERTY</keyword>
-+ <keyword>GET_TEST_PROPERTY</keyword>
-+ <keyword>IF</keyword>
-+ <keyword>INCLUDE</keyword>
-+ <keyword>INCLUDE_DIRECTORIES</keyword>
-+ <keyword>INCLUDE_EXTERNAL_MSPROJECT</keyword>
-+ <keyword>INCLUDE_REGULAR_EXPRESSION</keyword>
-+ <keyword>INSTALL</keyword>
-+ <keyword>INSTALL_FILES</keyword>
-+ <keyword>INSTALL_PROGRAMS</keyword>
-+ <keyword>INSTALL_TARGETS</keyword>
-+ <keyword>LINK_DIRECTORIES</keyword>
-+ <keyword>LINK_LIBRARIES</keyword>
-+ <keyword>LIST</keyword>
-+ <keyword>LOAD_CACHE</keyword>
-+ <keyword>LOAD_COMMAND</keyword>
-+ <keyword>MACRO</keyword>
-+ <keyword>MAKE_DIRECTORY</keyword>
-+ <keyword>MARK_AS_ADVANCED</keyword>
-+ <keyword>MATH</keyword>
-+ <keyword>MESSAGE</keyword>
-+ <keyword>OPTION</keyword>
-+ <keyword>OUTPUT_REQUIRED_FILES</keyword>
-+ <keyword>PROJECT</keyword>
-+ <keyword>QT_WRAP_CPP</keyword>
-+ <keyword>QT_WRAP_UI</keyword>
-+ <keyword>REMOVE</keyword>
-+ <keyword>REMOVE_DEFINITIONS</keyword>
-+ <keyword>SEPARATE_ARGUMENTS</keyword>
-+ <keyword>SET</keyword>
-+ <keyword>SET_DIRECTORY_PROPERTIES</keyword>
-+ <keyword>SET_SOURCE_FILES_PROPERTIES</keyword>
-+ <keyword>SET_TARGET_PROPERTIES</keyword>
-+ <keyword>SET_TESTS_PROPERTIES</keyword>
-+ <keyword>SITE_NAME</keyword>
-+ <keyword>SOURCE_GROUP</keyword>
-+ <keyword>STRING</keyword>
-+ <keyword>SUBDIR_DEPENDS</keyword>
-+ <keyword>SUBDIRS</keyword>
-+ <keyword>TARGET_LINK_LIBRARIES</keyword>
-+ <keyword>TRY_COMPILE</keyword>
-+ <keyword>TRY_RUN</keyword>
-+ <keyword>USE_MANGLED_MESA</keyword>
-+ <keyword>UTILITY_SOURCE</keyword>
-+ <keyword>VARIABLE_REQUIRES</keyword>
-+ <keyword>VTK_MAKE_INSTANTIATOR</keyword>
-+ <keyword>VTK_WRAP_JAVA</keyword>
-+ <keyword>VTK_WRAP_PYTHON</keyword>
-+ <keyword>VTK_WRAP_TCL</keyword>
-+ <keyword>WHILE</keyword>
-+ <keyword>WRITE_FILE</keyword>
-+ <keyword>ENDMACRO</keyword>
-+ <ignoreCase />
-+ <beginChars>()</beginChars>
-+ <partChars>()</partChars>
-+ <style>directive</style>
-+ </highlighter>
-+</highlighters>
-Index: xslthl-2.0.2/highlighters/xslthl-config.xml
-===================================================================
---- xslthl-2.0.2.orig/highlighters/xslthl-config.xml 2011-11-27 15:32:14.000000000 +0100
-+++ xslthl-2.0.2/highlighters/xslthl-config.xml 2011-11-27 15:32:42.000000000 +0100
-@@ -27,6 +27,8 @@
-
- -->
- <xslthl-config>
-+ <highlighter id="cmake" file="cmake-hl.xml" />
-+ <highlighter id="sh" file="sh-hl.xml" />
- <highlighter id="java" file="java-hl.xml" />
- <highlighter id="delphi" file="delphi-hl.xml" />
- <highlighter id="pascal" file="delphi-hl.xml" />
-@@ -43,4 +45,4 @@
- <highlighter id="perl" file="perl-hl.xml" />
- <highlighter id="javascript" file="javascript-hl.xml" />
- <namespace prefix="xslthl" uri="http://xslthl.sf.net" />
--</xslthl-config>
-\ No newline at end of file
-+</xslthl-config>
Modified: trunk/xslthl/debian/patches/add_sh.patch
===================================================================
--- trunk/xslthl/debian/patches/add_sh.patch 2013-04-10 12:56:04 UTC (rev 16518)
+++ trunk/xslthl/debian/patches/add_sh.patch 2013-04-11 09:24:08 UTC (rev 16519)
@@ -1,8 +1,7 @@
Description: add sh syntax highlighting
-Author: Mathieu Malaterre <malat at debian.org>
+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
Added: trunk/xslthl/debian/patches/pom_fixes.patch
===================================================================
--- trunk/xslthl/debian/patches/pom_fixes.patch (rev 0)
+++ trunk/xslthl/debian/patches/pom_fixes.patch 2013-04-11 09:24:08 UTC (rev 16519)
@@ -0,0 +1,107 @@
+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>
+Author: Eugene Zhukov <jevgeni.zh at gmail.com>
+
+---
+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
+ <build>
+ <plugins>
+ <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>
++ </configuration>
++ </plugin>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-surefire-plugin</artifactId>
++ <version>2.10</version>
++ <dependencies>
++ <dependency>
++ <groupId>org.apache.maven.surefire</groupId>
++ <artifactId>surefire-junit47</artifactId>
++ <version>debian</version>
++ </dependency>
++ </dependencies>
++ </plugin>
++ <plugin>
+ <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
+ </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 +133,21 @@ This version of xslthl provides extensio
+ <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/series
===================================================================
--- trunk/xslthl/debian/patches/series 2013-04-10 12:56:04 UTC (rev 16518)
+++ trunk/xslthl/debian/patches/series 2013-04-11 09:24:08 UTC (rev 16519)
@@ -1,2 +1,2 @@
-add_cmake.patch
+pom_fixes.patch
add_sh.patch
Modified: trunk/xslthl/debian/rules
===================================================================
--- trunk/xslthl/debian/rules 2013-04-10 12:56:04 UTC (rev 16518)
+++ trunk/xslthl/debian/rules 2013-04-11 09:24:08 UTC (rev 16519)
@@ -1,14 +1,6 @@
#!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/saxon.jar:/usr/share/java/saxonb.jar:/usr/share/java/xalan2.jar
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
-TARGETS := build build-arch build-indep clean binary-indep binary-arch binary install
-
-$(TARGETS):
- dh $@ --with javahelper
-
-get-orig-source:
- uscan --force-download
-
-.PHONY: $(TARGETS)
+JAVA_HOME := /usr/lib/jvm/default-java
Modified: trunk/xslthl/debian/watch
===================================================================
--- trunk/xslthl/debian/watch 2013-04-10 12:56:04 UTC (rev 16518)
+++ trunk/xslthl/debian/watch 2013-04-11 09:24:08 UTC (rev 16519)
@@ -1,4 +1,4 @@
version=3
-opts=uversionmangle=s/_/./g \
- http://xslthl.svn.sourceforge.net/svnroot/xslthl/tags/ xslthl-([\d.]*)/ \
- debian debian/orig-tar.sh
+opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
+ https://xslthl.svn.sourceforge.net/svnroot/xslthl/tags/ \
+ xslthl-(\d.*)/ debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list