[pkg-java] r18947 - trunk/xslthl/debian

[Eugene Zhukov]

Author: eugene
Date: 2016-01-09 10:19:00 +0000 (Sat, 09 Jan 2016)
New Revision: 18947

Modified:
   trunk/xslthl/debian/changelog
   trunk/xslthl/debian/control
   trunk/xslthl/debian/libxslthl-java.install
   trunk/xslthl/debian/libxslthl-java.poms
   trunk/xslthl/debian/maven.rules
   trunk/xslthl/debian/rules
Log:
Fix build error, switch away from CDBS build system

Modified: trunk/xslthl/debian/changelog
===================================================================
--- trunk/xslthl/debian/changelog	2016-01-08 22:00:52 UTC (rev 18946)
+++ trunk/xslthl/debian/changelog	2016-01-09 10:19:00 UTC (rev 18947)
@@ -2,6 +2,7 @@
 
   * New upstream release (Closes: #809821)
   * Changed version prefix in d/watch and d/orig-tar.sh
+  * Switch away from CDBS build system
 
  -- Eugene Zhukov <eugene at debian.org>  Fri, 08 Jan 2016 20:56:37 +0200
 

Modified: trunk/xslthl/debian/control
===================================================================
--- trunk/xslthl/debian/control	2016-01-08 22:00:52 UTC (rev 18946)
+++ trunk/xslthl/debian/control	2016-01-09 10:19:00 UTC (rev 18947)
@@ -2,13 +2,13 @@
 Section: text
 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 (>= 9), cdbs, default-jdk, maven-debian-helper (>= 1.6.1)
+Uploaders: Eugene Zhukov <eugene at debian.org>, Mathieu Malaterre <malat at debian.org>
+Build-Depends: debhelper (>= 9), 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
-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/xslthl
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/xslthl
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/xslthl
+Vcs-Browser: http://anonscm.debian.org/wsvn/pkg-java/trunk/xslthl
 Homepage: http://xslthl.sourceforge.net
 
 Package: libxslthl-java

Modified: trunk/xslthl/debian/libxslthl-java.install
===================================================================
--- trunk/xslthl/debian/libxslthl-java.install	2016-01-08 22:00:52 UTC (rev 18946)
+++ trunk/xslthl/debian/libxslthl-java.install	2016-01-09 10:19:00 UTC (rev 18947)
@@ -1,2 +1 @@
-target/xslthl-2.1.0.jar usr/share/java
 highlighters           usr/share/xslthl

Modified: trunk/xslthl/debian/libxslthl-java.poms
===================================================================
--- trunk/xslthl/debian/libxslthl-java.poms	2016-01-08 22:00:52 UTC (rev 18946)
+++ trunk/xslthl/debian/libxslthl-java.poms	2016-01-09 10:19:00 UTC (rev 18947)
@@ -25,4 +25,4 @@
 #   --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
+pom.xml --no-parent --has-package-version --java-lib

Modified: trunk/xslthl/debian/maven.rules
===================================================================
--- trunk/xslthl/debian/maven.rules	2016-01-08 22:00:52 UTC (rev 18946)
+++ trunk/xslthl/debian/maven.rules	2016-01-09 10:19:00 UTC (rev 18947)
@@ -1,5 +1,6 @@
 
 junit junit jar s/.*/4.x/ * *
 junit junit jar s/4\..*/4.x/ * *
+s/net.sf.saxon/net.sourceforge.saxon/ saxon jar s/.*/debian/ * *
 net.sf.xslthl xslthl jar s/2\..*/2.x/ * *
-s/net.sf.saxon/net.sourceforge.saxon/ saxon jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-ssh-external jar s/.*/debian/ * *

Modified: trunk/xslthl/debian/rules
===================================================================
--- trunk/xslthl/debian/rules	2016-01-08 22:00:52 UTC (rev 18946)
+++ trunk/xslthl/debian/rules	2016-01-09 10:19:00 UTC (rev 18947)
@@ -1,9 +1,6 @@
 #!/usr/bin/make -f
+%:
+	dh $@ --parallel --buildsystem=maven
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-
 get-orig-source:
 	uscan --download-current-version --no-symlink