[xml/sgml-commit] r2193 - in /packages/epubcheck/trunk/debian: ./ patches/

eugene-guest at users.alioth.debian.org eugene-guest at users.alioth.debian.org
Tue Dec 17 18:52:10 UTC 2013 

Author: eugene-guest
Date: Tue Dec 17 18:52:10 2013
New Revision: 2193

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=2193
Log:
updated to latest upstream release

Added:
    packages/epubcheck/trunk/debian/README.source
    packages/epubcheck/trunk/debian/epubcheck.poms
    packages/epubcheck/trunk/debian/maven.cleanIgnoreRules
    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/pom.patch
    packages/epubcheck/trunk/debian/patches/test.patch
Removed:
    packages/epubcheck/trunk/debian/epubcheck.jlibs
    packages/epubcheck/trunk/debian/patches/fixencoding.patch
    packages/epubcheck/trunk/debian/patches/fixrelativepath.patch
    packages/epubcheck/trunk/debian/patches/fixtestexec.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/epubcheck.1.in
    packages/epubcheck/trunk/debian/patches/series
    packages/epubcheck/trunk/debian/rules
    packages/epubcheck/trunk/debian/watch

Added: packages/epubcheck/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/README.source?rev=2193&op=file
==============================================================================
--- packages/epubcheck/trunk/debian/README.source	(added)
+++ packages/epubcheck/trunk/debian/README.source	Tue Dec 17 18:52:10 2013
@@ -0,0 +1,9 @@
+Information about epubcheck
+------------------------------
+
+This package was debianized using the mh_make command
+from the maven-debian-helper package.
+
+The build system uses Maven but prevents it from downloading
+anything from the Internet, making the build compliant with
+the Debian policy.

Modified: packages/epubcheck/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/changelog?rev=2193&op=diff
==============================================================================
--- packages/epubcheck/trunk/debian/changelog	(original)
+++ packages/epubcheck/trunk/debian/changelog	Tue Dec 17 18:52:10 2013
@@ -1,3 +1,11 @@
+epubcheck (3.0.1-1) unstable; urgency=low
+
+  * New upstream release 3.0.1 (Closes: #701229)
+  * Used maven-debian-helper for packaging
+  * Dropped old patches
+
+ -- Eugene Zhukov <jevgeni.zh at gmail.com>  Tue, 17 Dec 2013 13:34:27 +0000
+
 epubcheck (1.2-2) unstable; urgency=low
 
   * Switch Arch: any to Arch: all

Modified: packages/epubcheck/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/control?rev=2193&op=diff
==============================================================================
--- packages/epubcheck/trunk/debian/control	(original)
+++ packages/epubcheck/trunk/debian/control	Tue Dec 17 18:52:10 2013
@@ -1,21 +1,24 @@
 Source: epubcheck
+Section: text
 Priority: optional
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
-Uploaders: Mathieu Malaterre <malat at debian.org>
-Build-Depends: debhelper (>= 9), javahelper, default-jdk, ant, libjing-java, libsaxon-java
-Standards-Version: 3.9.4
-Section: text
-Homepage: http://code.google.com/p/epubcheck/
+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.5)
+Build-Depends-Indep: libmaven-bundle-plugin-java, libxml-maven-plugin-java,  
+ libcommons-compress-java, libguava-java, libjing-java, libsac-java,  
+ libsaxonhe-java, junit4 
+Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-xml-sgml/packages/epubcheck/
-Vcs-Svn: svn://svn.debian.org/debian-xml-sgml/packages/epubcheck/trunk/
+Vcs-Svn: svn://alioth.debian.org/debian-xml-sgml/packages/epubcheck/
+Homepage: https://github.com/IDPF/epubcheck
 
 Package: epubcheck
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
-Description: ePub book format validator
- ePub is a free and open file format for electronic books. It is one of
- the popular formats, supported by many hardware and software ebook
- readers and editors.
- .
- epubcheck is a tool to validate ePub files that can detect various
- conformance errors. epubcheck was largely developed at Adobe Systems.
+Depends: ${misc:Depends}, ${maven:Depends}, jarwrapper
+Recommends: ${maven:OptionalDepends}
+Description: Validation Tool for EPUB
+ EpubCheck is a tool to validate IDPF EPUB files. It can detect many types
+ of errors in EPUB. OCF container structure, OPF and OPS mark-up, and internal
+ reference consistency are checked. EpubCheck can be run as a standalone
+ command-line tool, installed as a Java server-side web application or used
+ as a Java library.

Modified: packages/epubcheck/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/copyright?rev=2193&op=diff
==============================================================================
--- packages/epubcheck/trunk/debian/copyright	(original)
+++ packages/epubcheck/trunk/debian/copyright	Tue Dec 17 18:52:10 2013
@@ -37,6 +37,6 @@
  It is provided "as is" without expressed or implied warranty.
 
 Files: debian/*
-Copyright: 2012 Mathieu Malaterre <malat at debian.org>
+Copyright: 2013 Mathieu Malaterre <malat at debian.org>, Eugene Zhukov <jevgeni.zh at gmail.com>
 License: New BSD License
  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=2193&op=diff
==============================================================================
--- packages/epubcheck/trunk/debian/epubcheck.1	(original)
+++ packages/epubcheck/trunk/debian/epubcheck.1	Tue Dec 17 18:52:10 2013
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.2.
-.TH EPUBCHECK "1" "December 2012" "epubcheck 1.2" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
+.TH EPUBCHECK "1" "July 2013" "epubcheck 3.0.1" "User Commands"
 .SH NAME
 epubcheck \- Validation tool for EPUB
 .SH SYNOPSIS
@@ -7,7 +7,28 @@
 .SH DESCRIPTION
 All detected errors are simply printed to stderr
 .PP
-Epubcheck Version 1.2
+When running this tool, the first argument should be the name (with the path) of the file to check.
+If checking a non\-epub file, the epub version of the file must be specified using \fB\-v\fR and the type of the file using \fB\-mode\fR.
+The default version is: 3.0.
+.PP
+Modes and versions supported:
+\fB\-mode\fR opf \fB\-v\fR 2.0    // For single OPF file validation (EPUB 2)
+\fB\-mode\fR opf \fB\-v\fR 3.0    // For single OPF file validation (EPUB 3)
+\fB\-mode\fR xhtml \fB\-v\fR 2.0  // For single XHTML file validation (EPUB 2)
+\fB\-mode\fR xhtml \fB\-v\fR 3.0  // For single XHTML file validation (EPUB 3)
+\fB\-mode\fR svg \fB\-v\fR 2.0    // For single SVG file validation (EPUB 2)
+\fB\-mode\fR svg \fB\-v\fR 3.0    // For single SVG file validation (EPUB 3)
+\fB\-mode\fR nav \fB\-v\fR 3.0    // For single 'Navigation Document' validation
+\fB\-mode\fR mo  \fB\-v\fR 3.0    // For single 'Media Overlays' validation
+\fB\-mode\fR exp           // For validating expanded EPUB archives
+.PP
+This tool also accepts the following flags:
+\fB\-save\fR         = saves the epub created from the expanded epub (\fB\-mode\fR exp)
+\fB\-quiet\fR        = no message sent to stdout, only errors in stderr
+\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
 .SH AUTHOR
 .IP \[bu] 2
 Peter Sorotokin
@@ -25,6 +46,10 @@
 George Bina
 .IP \[bu]
 Bogdan Iordache
+.IP \[bu]
+Ionut-Maxim Margelatu
+.IP \[bu]
+Romain Deltour
 
 Most of the EpubCheck functionality comes from the schema validation tool Jing and schemas that were developed by IDPF and DAISY. Initial EpubCheck development was largely done at Adobe Systems.
 

Modified: packages/epubcheck/trunk/debian/epubcheck.1.in
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/epubcheck.1.in?rev=2193&op=diff
==============================================================================
--- packages/epubcheck/trunk/debian/epubcheck.1.in	(original)
+++ packages/epubcheck/trunk/debian/epubcheck.1.in	Tue Dec 17 18:52:10 2013
@@ -24,6 +24,10 @@
 George Bina
 .IP \[bu]
 Bogdan Iordache
+.IP \[bu]
+Ionut-Maxim Margelatu
+.IP \[bu]
+Romain Deltour
 
 Most of the EpubCheck functionality comes from the schema validation tool Jing and schemas that were developed by IDPF and DAISY. Initial EpubCheck development was largely done at Adobe Systems.
 

Added: packages/epubcheck/trunk/debian/epubcheck.poms
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/epubcheck.poms?rev=2193&op=file
==============================================================================
--- packages/epubcheck/trunk/debian/epubcheck.poms	(added)
+++ packages/epubcheck/trunk/debian/epubcheck.poms	Tue Dec 17 18:52:10 2013
@@ -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 --java-lib

Added: packages/epubcheck/trunk/debian/maven.cleanIgnoreRules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/maven.cleanIgnoreRules?rev=2193&op=file
==============================================================================
--- packages/epubcheck/trunk/debian/maven.cleanIgnoreRules	(added)
+++ packages/epubcheck/trunk/debian/maven.cleanIgnoreRules	Tue Dec 17 18:52:10 2013
@@ -0,0 +1 @@
+

Added: packages/epubcheck/trunk/debian/maven.ignoreRules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/maven.ignoreRules?rev=2193&op=file
==============================================================================
--- packages/epubcheck/trunk/debian/maven.ignoreRules	(added)
+++ packages/epubcheck/trunk/debian/maven.ignoreRules	Tue Dec 17 18:52:10 2013
@@ -0,0 +1,3 @@
+
+org.apache.maven.plugins maven-assembly-plugin * * * *
+org.codehaus.mojo license-maven-plugin * * * *

Added: packages/epubcheck/trunk/debian/maven.properties
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/maven.properties?rev=2193&op=file
==============================================================================
--- packages/epubcheck/trunk/debian/maven.properties	(added)
+++ packages/epubcheck/trunk/debian/maven.properties	Tue Dec 17 18:52:10 2013
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+

Added: packages/epubcheck/trunk/debian/maven.publishedRules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/maven.publishedRules?rev=2193&op=file
==============================================================================
--- packages/epubcheck/trunk/debian/maven.publishedRules	(added)
+++ packages/epubcheck/trunk/debian/maven.publishedRules	Tue Dec 17 18:52:10 2013
@@ -0,0 +1,2 @@
+
+org.idpf epubcheck jar s/3\..*/3.x/ * *

Added: packages/epubcheck/trunk/debian/maven.rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/maven.rules?rev=2193&op=file
==============================================================================
--- packages/epubcheck/trunk/debian/maven.rules	(added)
+++ packages/epubcheck/trunk/debian/maven.rules	Tue Dec 17 18:52:10 2013
@@ -0,0 +1,8 @@
+
+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/ * *
+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/pom.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/patches/pom.patch?rev=2193&op=file
==============================================================================
--- packages/epubcheck/trunk/debian/patches/pom.patch	(added)
+++ packages/epubcheck/trunk/debian/patches/pom.patch	Tue Dec 17 18:52:10 2013
@@ -0,0 +1,17 @@
+Description: pom.xml changes for Debian
+  * classpath fixed for Debian
+Author: Eugene Zhukov <jevgeni.zh at gmail.com>
+Last-Update: 2013-07-17
+
+--- a/pom.xml
++++ b/pom.xml
+@@ -224,7 +224,8 @@
+                     <archive>
+                         <manifest>
+                             <addClasspath>true</addClasspath>
+-                            <classpathPrefix>lib/</classpathPrefix>
++                            <classpathLayoutType>custom</classpathLayoutType>
++                            <customClasspathLayout>/usr/share/java/${artifact.artifactId}.${artifact.extension}</customClasspathLayout>
+                             <mainClass>com.adobe.epubcheck.tool.Checker</mainClass>
+                         </manifest>
+                         <manifestFile>${project.build.directory}/classes/META-INF/MANIFEST.MF</manifestFile>

Modified: packages/epubcheck/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/patches/series?rev=2193&op=diff
==============================================================================
--- packages/epubcheck/trunk/debian/patches/series	(original)
+++ packages/epubcheck/trunk/debian/patches/series	Tue Dec 17 18:52:10 2013
@@ -1,3 +1,2 @@
-fixtestexec.patch
-fixencoding.patch
-fixrelativepath.patch
+test.patch
+pom.patch

Added: packages/epubcheck/trunk/debian/patches/test.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/patches/test.patch?rev=2193&op=file
==============================================================================
--- packages/epubcheck/trunk/debian/patches/test.patch	(added)
+++ packages/epubcheck/trunk/debian/patches/test.patch	Tue Dec 17 18:52:10 2013
@@ -0,0 +1,16 @@
+Description: Fixed failing test
+ * Bug in upstream #279
+Author: Eugene Zhukov <jevgeni.zh at gmail.com>
+Last-Update: 2013-06-11
+
+--- a/src/test/java/com/adobe/epubcheck/api/Epub20CheckTest.java
++++ b/src/test/java/com/adobe/epubcheck/api/Epub20CheckTest.java
+@@ -164,7 +164,7 @@
+ 	public void testMissingFullpathAttributeIssue236() { 
+ 		//container.xml missing @full-path attribute or @full-path is empty
+ 		// issue 95 / issue 236
+-		testValidateDocument("invalid/issue236.epub", 2, 0);
++		testValidateDocument("invalid/Issue236.epub", 2, 0);
+ 	}
+ 	
+ 	@Test

Modified: packages/epubcheck/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/rules?rev=2193&op=diff
==============================================================================
--- packages/epubcheck/trunk/debian/rules	(original)
+++ packages/epubcheck/trunk/debian/rules	Tue Dec 17 18:52:10 2013
@@ -1,35 +1,18 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
 
-JAVA_HOME=/usr/lib/jvm/default-java
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
 
-export CLASSPATH=/usr/share/java/jing.jar
+JAVA_HOME := /usr/lib/jvm/default-java
 
-%:
-	dh $@ --with javahelper
-
-override_dh_auto_configure:
-	-mkdir lib
-	dh_auto_configure -- buildJar
-
-# Target "clean" does not exist in the project "null". 
-override_dh_auto_clean:
-
-override_dh_clean:
-	dh_clean dist/epubcheck-src-1.2.zip
-	dh_clean dist/epubcheck-1.2.zip
-	dh_clean dist/epubcheck-1.2.jar
-	find . -name *.class -delete
-	rm -rf bin
-
-override_dh_auto_test:
-	(cd testdocs && sh -x autotest.sh)
+install/epubcheck::
+	chmod +x debian/epubcheck/usr/share/java/epubcheck.jar
 
 VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-)
 
 debian/epubcheck.1: debian/epubcheck.1.in
 	help2man --include=$< --output=$@ \
-		--no-info `basename $@ .1` --version-string=$(VER_FULL)
+		--no-info --help-option="-help" `basename $@ .1` --version-string=$(VER_FULL)
 
 get-orig-source:
-	uscan --verbose --force-download --rename --repack
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

Modified: packages/epubcheck/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/epubcheck/trunk/debian/watch?rev=2193&op=diff
==============================================================================
--- packages/epubcheck/trunk/debian/watch	(original)
+++ packages/epubcheck/trunk/debian/watch	Tue Dec 17 18:52:10 2013
@@ -1,2 +1,4 @@
 version=3
-http://code.google.com/p/epubcheck/downloads/list?can=1 .*/epubcheck-src-(\d[\d.]*)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz) debian jh_repack
+opts=dversionmangle=s/(\d)[\+\.](?:dfsg|debian|ds)\.?\d*$/$1/ \
+https://github.com/IDPF/epubcheck/tags \
+.*/archive/v(\d\S*)\.tar\.gz debian jh_repack

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