This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository qdox2.
commit bf5e659b5df9fd7ffbbd7fe9314c719ee6640629 Author: Markus Koschany <[email protected]> Date: Mon Jan 25 14:56:32 2016 +0100 Imported Debian patch 2.0~M3-1 --- debian/changelog | 5 +++ debian/clean | 7 ++++ debian/compat | 1 + debian/control | 74 +++++++++++++++++++++++++++++++++++ debian/copyright | 19 +++++++++ debian/libqdox2-java-doc.doc-base.api | 10 +++++ debian/libqdox2-java-doc.install | 1 + debian/libqdox2-java.poms | 28 +++++++++++++ debian/maven.cleanIgnoreRules | 1 + debian/maven.ignoreRules | 12 ++++++ debian/maven.properties | 1 + debian/maven.publishedRules | 2 + debian/maven.rules | 4 ++ debian/patches/series | 1 + debian/patches/workingDirectory.patch | 33 ++++++++++++++++ debian/rules | 14 +++++++ debian/source/format | 1 + debian/watch | 3 ++ 18 files changed, 217 insertions(+) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..3bd65e5 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +qdox2 (2.0~M3-1) unstable; urgency=medium + + * Initial release. (Closes: #812548) + + -- Markus Koschany <[email protected]> Mon, 25 Jan 2016 14:56:32 +0100 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..cd1f4b9 --- /dev/null +++ b/debian/clean @@ -0,0 +1,7 @@ +src/main/java/com/thoughtworks/qdox/parser/impl/DefaultJavaCommentLexer.java +src/main/java/com/thoughtworks/qdox/parser/impl/DefaultJavaCommentParser.java +src/main/java/com/thoughtworks/qdox/parser/impl/DefaultJavaCommentParserVal.java +src/main/java/com/thoughtworks/qdox/parser/impl/JFlexLexer.java +src/main/java/com/thoughtworks/qdox/parser/impl/Parser.java +src/main/java/com/thoughtworks/qdox/parser/impl/y.output + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..3c0de0b --- /dev/null +++ b/debian/control @@ -0,0 +1,74 @@ +Source: qdox2 +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: + Markus Koschany <[email protected]> +Build-Depends: + byacc-j, + debhelper (>= 9), + default-jdk, + default-jdk-doc, + jflex, + junit4, + libmaven-exec-plugin-java, + libmaven-javadoc-plugin-java, + libmockito-java, + maven-debian-helper +Standards-Version: 3.9.6 +Vcs-Git: https://anonscm.debian.org/pkg-java/qdox2.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/qdox2.git +Homepage: https://github.com/codehaus/qdox + +Package: libqdox2-java +Architecture: all +Depends: + ${maven:Depends}, + ${misc:Depends} +Suggests: + libqdox2-java-doc, + ${maven:OptionalDepends} +Description: Quickly parses declarations and Javadoc from Java source + QDox quickly parses Java source files looking for key items of + interest: + * class and interface definitions + * member declarations + * import statements + * JavaDoc comments + . + QDox ignores all other components of Java source, such as actual method + implementations, to avoid overhead. QDox returns a simple document + model containing only the declarations and containing enough + information to be useful. + . + This is version 2 of QDox which is backwards incompatible with earlier + versions. + +Package: libqdox2-java-doc +Section: doc +Architecture: all +Depends: + ${misc:Depends} +Recommends: + ${maven:DocDepends}, + ${maven:DocOptionalDepends} +Suggests: + libqdox2-java +Description: Documentation for QDox (javadoc) + This package contains the documentation for QDox, generated from + Javadoc. + . + QDox quickly parses Java source files looking for key items of + interest: + * class and interface definitions + * member declarations + * import statements + * JavaDoc comments + . + QDox ignores all other components of Java source, such as actual method + implementations, to avoid overhead. QDox returns a simple document + model containing only the declarations and containing enough + information to be useful. + . + This is version 2 of QDox which is backwards incompatible with earlier + versions. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..406431f --- /dev/null +++ b/debian/copyright @@ -0,0 +1,19 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: QDox +Source: https://github.com/codehaus/qdox +Files-Excluded: + bootstrap/yacc* + +Files: * +Copyright: 2002-2014, Joe Walnes and QDox Project Team +License: Apache-2.0 + +Files: debian/* +Copyright: 2005, Trygve Laugstøl <[email protected]> + 2009, Ludovic Claude <[email protected]> + 2015-2016, Markus Koschany <[email protected]> +License: Apache-2.0 + +License: Apache-2.0 + On Debian GNU/Linux system you can find the complete text of the + Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'. diff --git a/debian/libqdox2-java-doc.doc-base.api b/debian/libqdox2-java-doc.doc-base.api new file mode 100644 index 0000000..b58ff91 --- /dev/null +++ b/debian/libqdox2-java-doc.doc-base.api @@ -0,0 +1,10 @@ +Document: libqdox2-java +Title: API Javadoc for QDox2 +Author: QDox developers +Abstract: This is the API Javadoc provided for the + libqdox2-java library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libqdox2-java/api/index.html +Files: /usr/share/doc/libqdox2-java/api/* diff --git a/debian/libqdox2-java-doc.install b/debian/libqdox2-java-doc.install new file mode 100644 index 0000000..8a85929 --- /dev/null +++ b/debian/libqdox2-java-doc.install @@ -0,0 +1 @@ +target/apidocs/* usr/share/doc/libqdox2-java/api diff --git a/debian/libqdox2-java.poms b/debian/libqdox2-java.poms new file mode 100644 index 0000000..5ad70f2 --- /dev/null +++ b/debian/libqdox2-java.poms @@ -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 diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/maven.cleanIgnoreRules @@ -0,0 +1 @@ + diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..a7c394d --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,12 @@ + +de.jflex maven-jflex-plugin * * * * +org.apache.maven.plugins maven-assembly-plugin * * * * +org.apache.maven.plugins maven-changes-plugin * * * * +org.apache.maven.plugins maven-enforcer-plugin * * * * +org.apache.maven.plugins maven-failsafe-plugin * * * * +org.apache.maven.plugins maven-invoker-plugin * * * * +org.apache.maven.plugins maven-jxr-plugin * * * * +org.apache.maven.plugins maven-project-info-reports-plugin * * * * +org.apache.maven.wagon wagon-webdav-jackrabbit * * * * +org.codehaus.mojo animal-sniffer-maven-plugin * * * * +org.codehaus.mojo cobertura-maven-plugin * * * * diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..fbf819a --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1 @@ +qdox.byaccj.executable=byaccj diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules new file mode 100644 index 0000000..5a9300b --- /dev/null +++ b/debian/maven.publishedRules @@ -0,0 +1,2 @@ + +s/qdox/com.thoughtworks.qdox/ * * s/.*/debian/ * * diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..ef43f7b --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,4 @@ + +com.thoughtworks.qdox qdox jar s/.*/debian/ * * +junit junit jar s/4\..*/4.x/ * * +org.mockito mockito-core * s/.*/debian/ * * diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..ba8516f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +workingDirectory.patch diff --git a/debian/patches/workingDirectory.patch b/debian/patches/workingDirectory.patch new file mode 100644 index 0000000..3872522 --- /dev/null +++ b/debian/patches/workingDirectory.patch @@ -0,0 +1,33 @@ +From: Markus Koschany <[email protected]> +Date: Sun, 4 Oct 2015 23:48:27 +0200 +Subject: workingDirectory + +Fix a FTBFS. The parser class could not be found. + +Forwarded: not-needed +--- + pom.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 5b1c760..8252f6f 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -274,7 +274,7 @@ + <argument>-Jpackage=com.thoughtworks.qdox.parser.impl</argument> + <argument>${basedir}/src/grammar/commentparser.y</argument> + </arguments> +- <workingDirectory>${project.build.directory}/generated-sources/parser/com/thoughtworks/qdox/parser/impl</workingDirectory> ++ <workingDirectory>src/main/java/com/thoughtworks/qdox/parser/impl</workingDirectory> + </configuration> + </execution> + <execution> +@@ -296,7 +296,7 @@ + <argument>-Jstack=${qdox.javaparser.stack}</argument> + <argument>${basedir}/src/grammar/parser.y</argument> + </arguments> +- <workingDirectory>${project.build.directory}/generated-sources/parser/com/thoughtworks/qdox/parser/impl</workingDirectory> ++ <workingDirectory>src/main/java/com/thoughtworks/qdox/parser/impl</workingDirectory> + </configuration> + </execution> + </executions> diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..7e0c6d4 --- /dev/null +++ b/debian/rules @@ -0,0 +1,14 @@ +#!/usr/bin/make -f +export JAVA_HOME=/usr/lib/jvm/default-java + +%: + dh $@ --parallel --buildsystem=maven + +override_dh_auto_build: + jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/lexer.flex + jflex -d src/main/java/com/thoughtworks/qdox/parser/impl src/grammar/commentlexer.flex + dh_auto_build + +get-orig-source: + -uscan --verbose --download-current-version --force-download + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..ad08982 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=uversionmangle=s/-/~/,dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/ \ +https://github.com/codehaus/qdox/tags .*/qdox-([\d\.].*)\.tar\.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/qdox2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
