This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jtidy.
commit 6d5f29a1e7ccb9a86dcf94c0427ceca5cb4d84b4 Author: Torsten Werner <[email protected]> Date: Sun Sep 11 10:09:21 2011 +0000 * Team upload * Use Maven to build the package. * Set urgency to high because the last version is broken. * Switch to debhelper compat level 7. * Update Standards-Version: 3.9.1. --- debian/{README.Debian-source => README.source} | 7 +++ debian/build.xml | 79 -------------------------- debian/changelog | 10 ++++ debian/compat | 2 +- debian/control | 33 ++++++----- debian/libjtidy-java-doc.doc-base | 9 --- debian/libjtidy-java-doc.doc-base.api | 10 ++++ debian/libjtidy-java-doc.docs | 1 - debian/libjtidy-java-doc.install | 2 + debian/libjtidy-java.poms | 27 ++++++++- debian/manifest.mf | 4 -- debian/maven.cleanIgnoreRules | 17 ++++++ debian/maven.ignoreRules | 23 ++++++++ debian/maven.properties | 4 ++ debian/maven.publishedRules | 19 +++++++ debian/maven.rules | 26 +++++++-- debian/rules | 25 +------- 17 files changed, 161 insertions(+), 137 deletions(-) diff --git a/debian/README.Debian-source b/debian/README.source similarity index 71% rename from debian/README.Debian-source rename to debian/README.source index fb50d5f..9d64264 100644 --- a/debian/README.Debian-source +++ b/debian/README.source @@ -17,3 +17,10 @@ Upstream provide 3 types of downloads: This Debian packaging uses an svn snapshot. -- Paul Cager <[email protected]> Thu, 22 Mar 2007 23:30:02 +0000 + +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. diff --git a/debian/build.xml b/debian/build.xml deleted file mode 100644 index a0dff05..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,79 +0,0 @@ -<?xml version="1.0"?> - -<!-- - This build.xml file was written for the Debian build of jtidy. - This file copyright (c) Paul Cager <[email protected]> - - This software and documentation is provided "as is," and - the copyright holders and contributing author(s) make no - representations or warranties, express or implied, including - but not limited to, warranties of merchantability or fitness - for any particular purpose or that the use of the software or - documentation will not infringe any third party patents, - copyrights, trademarks or other rights. - - The copyright holders and contributing author(s) will not be - liable for any direct, indirect, special or consequential damages - arising out of any use of the software or documentation, even if - advised of the possibility of such damage. - - Permission is hereby granted to use, copy, modify, and distribute - this source code, or portions hereof, documentation and executables, - for any purpose, without fee, subject to the following restrictions: - - 1. The origin of this source code must not be misrepresented. - 2. Altered versions must be plainly marked as such and must - not be misrepresented as being the original source. - 3. This Copyright notice may not be removed or altered from any - source or altered source distribution. ---> - -<project name="jtidy" default="package" basedir=".."> - -<target name="package" depends="jar,javadoc"/> - -<target name="init"> - <property name="src.dir" value="src"/> - <property name="build.dir" value="build"/> - <property name="package" value="jtidy"/> - <property name="jar" value="${build.dir}/${package}-${version}.jar"/> - <property name="javadoc.dir" value="${build.dir}/doc/api"/> -</target> - -<target name="compile" depends="init"> - <mkdir dir="${build.dir}"/> - <javac srcdir="${src.dir}/main" - destdir="${build.dir}" - includes="**/*.java" - debug="on" - /> - <copy file="${src.dir}/main/resources/tidy.gif" tofile="${build.dir}/org/w3c/tidy/tidy.gif"/> - <copy file="${src.dir}/main/resources/org/w3c/tidy/TidyMessages.properties" tofile="${build.dir}/org/w3c/tidy/TidyMessages.properties"/> -</target> - -<target name="jar" depends="compile"> - <delete file="${jar}"/> - - <jar jarfile="${jar}" - basedir="${build.dir}" - includes="**/*.class,**/*.properties,**/*.gif" - manifest="debian/manifest.mf" - /> -</target> - -<target name="javadoc" depends="init"> - <mkdir dir="${javadoc.dir}"/> - <javadoc packagenames="org.w3c.dom.*, org.w3c.tidy.*" - sourcepath="${src.dir}/main/java" - destdir="${javadoc.dir}" - author="true" - version="true" - windowtitle="${package} API" - doctitle="${package} - ${version}" - /> -</target> - -<target name="clean" depends="init"> - <delete dir="${build.dir}"/> -</target> -</project> diff --git a/debian/changelog b/debian/changelog index 50d2b2d..8cf4ece 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +jtidy (7+svn20110807-2) unstable; urgency=high + + * Team upload + * Use Maven to build the package. + * Set urgency to high because the last version is broken. + * Switch to debhelper compat level 7. + * Update Standards-Version: 3.9.1. + + -- Torsten Werner <[email protected]> Sun, 11 Sep 2011 12:06:10 +0200 + jtidy (7+svn20110807-1) unstable; urgency=low * Team upload diff --git a/debian/compat b/debian/compat index 1e8b314..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -6 +7 diff --git a/debian/control b/debian/control index 06924e0..de554d7 100644 --- a/debian/control +++ b/debian/control @@ -3,34 +3,37 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Michael Koch <[email protected]> -Build-Depends: debhelper (>= 6), cdbs (>= 0.4.5.3), default-jdk -Build-Depends-Indep: maven-repo-helper, ant, ant-optional, libjaxp1.3-java -Standards-Version: 3.8.1 +Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) +Build-Depends-Indep: libmaven-javadoc-plugin-java, junit4, liblog4j1.2-java, libslf4j-java, + default-jdk-doc, ant, ant-doc +Standards-Version: 3.9.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jtidy Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jtidy Homepage: http://jtidy.sourceforge.net/ Package: libjtidy-java Architecture: all -Depends: ${misc:Depends}, libjaxp1.3-java -Suggests: libjtidy-java-doc, ant -Description: a Java port of HTML Tidy, a HTML syntax checker and pretty printer - JTidy is a Java port of HTML Tidy (http://www.w3.org/People/Raggett/tidy/). +Depends: ${misc:Depends}, ${maven:Depends} +Recommends: ${maven:OptionalDepends} +Suggests: libjtidy-java-doc +Description: JTidy + JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty printer. Like its non-Java cousin, JTidy can be used as a tool for cleaning up malformed and faulty HTML. In addition, JTidy provides a DOM interface to the document - that is being processed, which effectively makes you able to use JTidy as a - DOM parser for real-world HTML. + that is being processed, which effectively makes you able to use JTidy + as a DOM parser for real-world HTML. Package: libjtidy-java-doc Architecture: all Section: doc -Depends: ${misc:Depends} +Depends: ${misc:Depends}, ${maven:DocDepends} +Recommends: ${maven:DocOptionalDepends} Suggests: libjtidy-java -Description: API Documentation for JTidy - JTidy is a Java port of HTML Tidy (http://www.w3.org/People/Raggett/tidy/). +Description: Documentation for JTidy + JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty printer. Like its non-Java cousin, JTidy can be used as a tool for cleaning up malformed and faulty HTML. In addition, JTidy provides a DOM interface to the document - that is being processed, which effectively makes you able to use JTidy as a - DOM parser for real-world HTML. + that is being processed, which effectively makes you able to use JTidy + as a DOM parser for real-world HTML. . - This package contains the documentation for JTidy. + This package contains the API documentation of libjtidy-java. diff --git a/debian/libjtidy-java-doc.doc-base b/debian/libjtidy-java-doc.doc-base deleted file mode 100644 index 79ee9f4..0000000 --- a/debian/libjtidy-java-doc.doc-base +++ /dev/null @@ -1,9 +0,0 @@ -Document: libjtidy-java -Title: API Javadoc for jtidy -Author: jtidy developers -Abstract: This is the API Javadoc provided by the jtidy library. -Section: Programming - -Format: HTML -Index: /usr/share/doc/libjtidy-java-doc/api/index.html -Files: /usr/share/doc/libjtidy-java-doc/api/* diff --git a/debian/libjtidy-java-doc.doc-base.api b/debian/libjtidy-java-doc.doc-base.api new file mode 100644 index 0000000..1809957 --- /dev/null +++ b/debian/libjtidy-java-doc.doc-base.api @@ -0,0 +1,10 @@ +Document: libjtidy-java +Title: API Javadoc for JTidy +Author: jtidy developers +Abstract: This is the API Javadoc provided for the + libjtidy-java library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libjtidy-java/api/index.html +Files: /usr/share/doc/libjtidy-java/api/* diff --git a/debian/libjtidy-java-doc.docs b/debian/libjtidy-java-doc.docs deleted file mode 100644 index 59cfcdc..0000000 --- a/debian/libjtidy-java-doc.docs +++ /dev/null @@ -1 +0,0 @@ -build/doc/api diff --git a/debian/libjtidy-java-doc.install b/debian/libjtidy-java-doc.install new file mode 100644 index 0000000..a6fcc0d --- /dev/null +++ b/debian/libjtidy-java-doc.install @@ -0,0 +1,2 @@ +target/apidocs/* usr/share/doc/libjtidy-java/api + diff --git a/debian/libjtidy-java.poms b/debian/libjtidy-java.poms index 43e746b..bb9de22 100644 --- a/debian/libjtidy-java.poms +++ b/debian/libjtidy-java.poms @@ -1 +1,26 @@ -pom.xml --no-parent +# 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 or +# --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 +# --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. +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created +# temporarily for certain artifacts such as Javadoc jars. +# +pom.xml diff --git a/debian/manifest.mf b/debian/manifest.mf deleted file mode 100644 index 0b7a0cf..0000000 --- a/debian/manifest.mf +++ /dev/null @@ -1,4 +0,0 @@ -Main-Class: org.w3c.tidy.Tidy - -Name: org/w3c/tidy/Tidy.class -Java-Bean: True diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules new file mode 100644 index 0000000..b47b61d --- /dev/null +++ b/debian/maven.cleanIgnoreRules @@ -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/ + diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..9c7ef20 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,23 @@ +# 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-changelog-plugin * * * * +org.apache.maven.plugins maven-checkstyle-plugin * * * * +org.apache.maven.plugins maven-clover-plugin * * * * +org.apache.maven.plugins maven-jxr-plugin * * * * +org.apache.maven.plugins maven-pmd-plugin * * * * +org.apache.maven.plugins maven-project-info-reports-plugin * * * * +org.codehaus.mojo jdepend-maven-plugin * * * * diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..7c29bd7 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1,4 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true + diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules new file mode 100644 index 0000000..822f087 --- /dev/null +++ b/debian/maven.publishedRules @@ -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/ + diff --git a/debian/maven.rules b/debian/maven.rules index 9613f63..1ca0f7b 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,4 +1,22 @@ -s/xerces/xml-apis/ s/dom3-xml-apis/xml-apis/ jar s/.*/debian/ -s/ant/org.apache.ant/ * * s/.*/debian/ -junit junit jar s/3\..*/3.x/ -log4j log4j jar s/1\.2\..*/1.2.x/ +# 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/ * * +log4j log4j jar s/1\.2\..*/1.2.x/ * * +net.sf.jtidy jtidy jar s/.*/debian/ * * +s/ant/org.apache.ant/ * * s/.*/debian/ * * diff --git a/debian/rules b/debian/rules index e666e64..c9523a8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,28 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/class/maven.mk -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := $(ANT_HOME)/lib/ant-trax.jar xalan2 -DEB_ANT_BUILD_TARGET := package -DEB_ANT_BUILDFILE := debian/build.xml -DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -DartifactId=$(PACKAGE) -Dversion=$(VERSION) -API_DOCS := build/doc/api - -get-orig-source: - mkdir orig_tmp - cd orig_tmp && \ - svn export -q https://jtidy.svn.sourceforge.net/svnroot/jtidy/trunk/jtidy jtidy && \ - tar czf ../../jtidy_$(DEB_UPSTREAM_VERSION).orig.tar.gz jtidy - rm -rf orig_tmp - -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l pom.xml build/$(PACKAGE)-$(VERSION).jar - -clean:: - -rm -rf debian/tmp +JAVA_HOME := /usr/lib/jvm/default-java -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jtidy.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
