[xml/sgml-commit] r2257 - in /packages/epubcheck/trunk/debian: changelog control copyright epubcheck.1 maven.ignoreRules maven.properties maven.publishedRules maven.rules patches/fixed_classpath.patch patches/pom.patch patches/series patches/test.patch rules

eugene-guest at users.alioth.debian.org eugene-guest at users.alioth.debian.org
Wed Sep 17 06:18:08 UTC 2014


Author: eugene-guest
Date: Wed Sep 17 06:18:08 2014
New Revision: 2257

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=2257
Log:
new upstream release

Added:
    packages/epubcheck/trunk/debian/patches/fixed_classpath.patch
Removed:
    packages/epubcheck/trunk/debian/patches/pom.patch
    packages/epubcheck/trunk/debian/patches/test.patch
Modified:
    packages/epubcheck/trunk/debian/changelog
    packages/epubcheck/trunk/debian/control
    packages/epubcheck/trunk/debian/copyright
    packages/epubcheck/trunk/debian/epubcheck.1
    packages/epubcheck/trunk/debian/maven.ignoreRules
    packages/epubcheck/trunk/debian/maven.properties
    packages/epubcheck/trunk/debian/maven.publishedRules
    packages/epubcheck/trunk/debian/maven.rules
    packages/epubcheck/trunk/debian/patches/series
    packages/epubcheck/trunk/debian/rules

Modified: packages/epubcheck/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/changelog?rev=2257&op=diff
==============================================================================
--- packages/epubcheck/trunk/debian/changelog	(original)
+++ packages/epubcheck/trunk/debian/changelog	Wed Sep 17 06:18:08 2014
@@ -1,8 +1,13 @@
-epubcheck (3.0.1-2) UNRELEASED; urgency=low
+epubcheck (4.0.0~alpha11-1) unstable; urgency=low
 
+  [ Mathieu Malattere ]
   * Remove self from uploaders, run w-a-s
 
- -- Mathieu Malaterre <malat at debian.org>  Fri, 13 Jun 2014 14:44:51 +0200
+  [ Eugene Zhukov ]
+  * New upstream release.
+  * Disabled tests.
+
+ -- Eugene Zhukov <jevgeni.zh at gmail.com>  Tue, 16 Sep 2014 19:44:51 +0000
 
 epubcheck (3.0.1-1) unstable; urgency=low
 

Modified: packages/epubcheck/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/control?rev=2257&op=diff
==============================================================================
--- packages/epubcheck/trunk/debian/control	(original)
+++ packages/epubcheck/trunk/debian/control	Wed Sep 17 06:18:08 2014
@@ -4,14 +4,17 @@
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
 Uploaders: Eugene Zhukov <jevgeni.zh at gmail.com>
 Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
-Build-Depends-Indep: junit4,
-                     libcommons-compress-java,
+Build-Depends-Indep: libcommons-compress-java,
                      libguava-java,
                      libjing-java (>= 20131210+dfsg+1),
                      libmaven-bundle-plugin-java,
                      libsac-java,
                      libsaxonhe-java,
-                     libxml-maven-plugin-java
+                     libxml-maven-plugin-java,
+                     libjavatuples-java,
+                     libmaven-scm-java,
+                     libmaven-dependency-plugin-java,
+                     libjackson-json-java
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-xml-sgml/packages/epubcheck/
 Vcs-Svn: svn://alioth.debian.org/debian-xml-sgml/packages/epubcheck/

Modified: packages/epubcheck/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/copyright?rev=2257&op=diff
==============================================================================
--- packages/epubcheck/trunk/debian/copyright	(original)
+++ packages/epubcheck/trunk/debian/copyright	Wed Sep 17 06:18:08 2014
@@ -5,7 +5,7 @@
 
 Files: *
 Copyright: 2007 Adobe Systems Incorporated
-License: New BSD License
+License: BSD-3
  Permission is hereby granted, free of charge, to any person obtaining a copy of
  this software and associated documentation files (the "Software"), to deal in
  the Software without restriction, including without limitation the rights to
@@ -27,7 +27,7 @@
 Copyright: 2001, 2002 World Wide Web Consortium
  (Massachusetts Institute of Technology, Institut National de
  Recherche en Informatique et en Automatique, Keio University).
-License:
+License: W3C
  Permission to use, copy, modify and distribute the SVG DTD and its
  accompanying documentation for any purpose and without fee is hereby
  granted in perpetuity, provided that the above copyright notice and
@@ -38,5 +38,5 @@
 
 Files: debian/*
 Copyright: 2013 Mathieu Malaterre <malat at debian.org>, Eugene Zhukov <jevgeni.zh at gmail.com>
-License: New BSD License
+License: BSD-3
  Same as above

Modified: packages/epubcheck/trunk/debian/epubcheck.1
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/epubcheck.1?rev=2257&op=diff
==============================================================================
--- packages/epubcheck/trunk/debian/epubcheck.1	(original)
+++ packages/epubcheck/trunk/debian/epubcheck.1	Wed Sep 17 06:18:08 2014
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH EPUBCHECK "1" "July 2013" "epubcheck 3.0.1" "User Commands"
+.TH EPUBCHECK "1" "September 2014" "epubcheck 4.0.0" "User Commands"
 .SH NAME
 epubcheck \- Validation tool for EPUB
 .SH SYNOPSIS
@@ -28,7 +28,7 @@
 \fB\-out\fR <file>   = output an assessment XML document in file (experimental)
 \-? or \fB\-help\fR   = displays this help message
 .PP
-Epubcheck Version 3.0.1
+Epubcheck Version 4.0.0
 .SH AUTHOR
 .IP \[bu] 2
 Peter Sorotokin

Modified: packages/epubcheck/trunk/debian/maven.ignoreRules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/maven.ignoreRules?rev=2257&op=diff
==============================================================================
--- packages/epubcheck/trunk/debian/maven.ignoreRules	(original)
+++ packages/epubcheck/trunk/debian/maven.ignoreRules	Wed Sep 17 06:18:08 2014
@@ -1,3 +1,7 @@
 
+junit junit * * * *
 org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
+org.apache.maven.plugins maven-surefire-plugin * * * *
 org.codehaus.mojo license-maven-plugin * * * *
+xmlunit xmlunit * * * *

Modified: packages/epubcheck/trunk/debian/maven.properties
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/maven.properties?rev=2257&op=diff
==============================================================================
--- packages/epubcheck/trunk/debian/maven.properties	(original)
+++ packages/epubcheck/trunk/debian/maven.properties	Wed Sep 17 06:18:08 2014
@@ -1,4 +1,4 @@
 # Include here properties to pass to Maven during the build.
 # For example:
-# maven.test.skip=true
+maven.test.skip=true
 

Modified: packages/epubcheck/trunk/debian/maven.publishedRules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/maven.publishedRules?rev=2257&op=diff
==============================================================================
--- packages/epubcheck/trunk/debian/maven.publishedRules	(original)
+++ packages/epubcheck/trunk/debian/maven.publishedRules	Wed Sep 17 06:18:08 2014
@@ -1,2 +1,2 @@
 
-org.idpf epubcheck jar s/3\..*/3.x/ * *
+org.idpf epubcheck jar s/.*/debian/ * *

Modified: packages/epubcheck/trunk/debian/maven.rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/maven.rules?rev=2257&op=diff
==============================================================================
--- packages/epubcheck/trunk/debian/maven.rules	(original)
+++ packages/epubcheck/trunk/debian/maven.rules	Wed Sep 17 06:18:08 2014
@@ -1,8 +1,9 @@
 
 com.google.guava guava bundle s/.*/debian/ * *
 com.google.guava guava s/jar/bundle/ s/.*/debian/ * *
-junit junit jar s/4\..*/4.x/ * *
-net.sf.saxon Saxon-HE jar s/9\..*/9.x/ * *
-org.idpf epubcheck jar s/3\..*/3.x/ * *
+net.sf.saxon Saxon-HE jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-gitexe jar s/.*/debian/ * *
+org.idpf epubcheck jar s/.*/debian/ * *
+org.javatuples javatuples jar s/.*/debian/ * *
 s/com.google.code.google-collections/com.google.guava/ s/google-collect/guava/ s/jar/bundle/ s/.*/debian/ * *
 s/com.google.collections/com.google.guava/ s/google-collections/guava/ s/jar/bundle/ s/.*/debian/ * *

Added: packages/epubcheck/trunk/debian/patches/fixed_classpath.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/patches/fixed_classpath.patch?rev=2257&op=file
==============================================================================
--- packages/epubcheck/trunk/debian/patches/fixed_classpath.patch	(added)
+++ packages/epubcheck/trunk/debian/patches/fixed_classpath.patch	Wed Sep 17 06:18:08 2014
@@ -0,0 +1,17 @@
+Description: pom.xml changes for Debian
+  * classpath fixed for Debian
+Author: Eugene Zhukov <jevgeni.zh at gmail.com>
+Last-Update: 2014-09-16
+
+--- a/pom.xml
++++ b/pom.xml
+@@ -405,7 +405,8 @@
+                             <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                             <mainClass>com.adobe.epubcheck.tool.Checker</mainClass>
+                             <addClasspath>true</addClasspath>
+-                            <classpathPrefix>lib/</classpathPrefix>
++                            <classpathLayoutType>custom</classpathLayoutType>
++                            <customClasspathLayout>/usr/share/java/${artifact.artifactId}.${artifact.extension}</customClasspathLayout>
+                         </manifest>
+                         <manifestFile>${project.build.directory}/classes/META-INF/MANIFEST.MF</manifestFile>
+                         <manifestEntries>

Modified: packages/epubcheck/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/patches/series?rev=2257&op=diff
==============================================================================
--- packages/epubcheck/trunk/debian/patches/series	(original)
+++ packages/epubcheck/trunk/debian/patches/series	Wed Sep 17 06:18:08 2014
@@ -1,2 +1 @@
-test.patch
-pom.patch
+fixed_classpath.patch

Modified: packages/epubcheck/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/rules?rev=2257&op=diff
==============================================================================
--- packages/epubcheck/trunk/debian/rules	(original)
+++ packages/epubcheck/trunk/debian/rules	Wed Sep 17 06:18:08 2014
@@ -5,7 +5,8 @@
 
 JAVA_HOME := /usr/lib/jvm/default-java
 
-install/epubcheck::
+binary-post-install/epubcheck::
+	mh_installjar -pepubcheck -l pom.xml target/epubcheck.jar
 	chmod +x debian/epubcheck/usr/share/java/epubcheck.jar
 
 VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-)




More information about the debian-xml-sgml-commit mailing list