This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository activemq-protobuf.
commit 255f781a15a70434e6476ec1f5e19b24836bcc2c Author: Damien Raude-Morvan <[email protected]> Date: Tue Jan 31 00:31:59 2012 +0100 Imported Debian patch 1.1-3 --- .gitignore | 1 - debian/changelog | 17 ++++------- debian/compat | 2 +- debian/control | 55 +++++++++++++---------------------- debian/libactivemq-protobuf-java.poms | 4 +-- debian/maven.ignoreRules | 2 +- debian/rules | 11 ++++--- debian/source/local-options | 1 - 8 files changed, 37 insertions(+), 56 deletions(-) diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 845ca06..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pc diff --git a/debian/changelog b/debian/changelog index ae1fa01..116e51f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,9 @@ -activemq-protobuf (1.1-3) unstable; urgency=medium +activemq-protobuf (1.1-3) unstable; urgency=low - * Team upload. - * Declare compliance with Debian Policy 3.9.7. - * wrap-and-sort -sa. - * Use compat level 9 and require debhelper >= 9. - * Use canonical Vcs-URI. - * Use Build-Depends field because we build arch:all only. - * Switch from cdbs to dh sequencer. - * Install jars into /usr/share/java to comply with the Java Policy. - * Remove obsolete Google Code URL from package description. - - -- Markus Koschany <[email protected]> Sat, 19 Mar 2016 19:05:08 +0100 + * d/control: Wrap-and-sort. + * d/control: Drop B-D on libmaven-bundle-plugin-java. + + -- Damien Raude-Morvan <[email protected]> Tue, 31 Jan 2012 00:31:59 +0100 activemq-protobuf (1.1-2) unstable; urgency=low diff --git a/debian/compat b/debian/compat index ec63514..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +7 diff --git a/debian/control b/debian/control index 66e4c4d..534e53f 100644 --- a/debian/control +++ b/debian/control @@ -2,35 +2,26 @@ Source: activemq-protobuf Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: - Damien Raude-Morvan <[email protected]> -Build-Depends: - debhelper (>= 9), - default-jdk, - default-jdk-doc, - junit4, - libjavacc-maven-plugin-java, - libmaven-bundle-plugin-java, - libmaven-enforcer-plugin-java, - libmaven-install-plugin-java, - libmaven-javadoc-plugin-java, - libmaven-plugin-tools-java, - libsurefire-java, - maven-debian-helper (>= 1.4) -Standards-Version: 3.9.7 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/activemq-protobuf.git -Vcs-Git: https://anonscm.debian.org/git/pkg-java/activemq-protobuf.git +Uploaders: Damien Raude-Morvan <[email protected]> +Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper (>= 1.4) +Build-Depends-Indep: default-jdk-doc, + junit4, + libjavacc-maven-plugin-java, + libmaven-enforcer-plugin-java, + libmaven-install-plugin-java, + libmaven-javadoc-plugin-java, + libmaven-plugin-tools-java, + libsurefire-java +Standards-Version: 3.9.2 +Vcs-Browser: http://git.debian.org/?p=pkg-java/activemq-protobuf.git +Vcs-Git: git://git.debian.org/git/pkg-java/activemq-protobuf.git Homepage: http://activemq.apache.org/ Package: libactivemq-protobuf-java Architecture: all -Depends: - ${maven:Depends}, - ${misc:Depends} -Recommends: - ${maven:OptionalDepends} -Suggests: - libactivemq-protobuf-java-doc +Depends: ${maven:Depends}, ${misc:Depends} +Recommends: ${maven:OptionalDepends} +Suggests: libactivemq-protobuf-java-doc Description: ActiveMQ Protocol Buffers Maven plugin Apache ActiveMQ is a message broker built around Java Message Service (JMS) API : allow sending messages between two or more clients in a loosely coupled, @@ -38,7 +29,7 @@ Description: ActiveMQ Protocol Buffers Maven plugin . "Protocol Buffers" are language-neutral, platform-neutral, extensible way of serializing structured data for use in communications protocols - or data storage. + or data storage. <URL:http://code.google.com/apis/protocolbuffers/> . This package, used by Apache ActiveMQ, provide a simple Protocol Buffer Java API. It comes with a built in proto file compiler and @@ -47,13 +38,9 @@ Description: ActiveMQ Protocol Buffers Maven plugin Package: libactivemq-protobuf-java-doc Architecture: all Section: doc -Depends: - ${maven:Depends}, - ${misc:Depends} -Recommends: - ${maven:OptionalDepends} -Suggests: - libactivemq-protobuf-java +Depends: ${maven:Depends}, ${misc:Depends} +Recommends: ${maven:OptionalDepends} +Suggests: libactivemq-protobuf-java Description: ActiveMQ Protocol Buffers Maven plugin - documentation Apache ActiveMQ is a message broker built around Java Message Service (JMS) API : allow sending messages between two or more clients in a loosely coupled, @@ -61,6 +48,6 @@ Description: ActiveMQ Protocol Buffers Maven plugin - documentation . "Protocol Buffers" are language-neutral, platform-neutral, extensible way of serializing structured data for use in communications protocols - or data storage. + or data storage. <URL:http://code.google.com/apis/protocolbuffers/> . This package contains Javadoc API for libactivemq-protobuf-java. diff --git a/debian/libactivemq-protobuf-java.poms b/debian/libactivemq-protobuf-java.poms index 5911405..e042bc1 100644 --- a/debian/libactivemq-protobuf-java.poms +++ b/debian/libactivemq-protobuf-java.poms @@ -24,5 +24,5 @@ # temporarily for certain artifacts such as Javadoc jars. # pom.xml --no-parent --has-package-version -activemq-protobuf/pom.xml --has-package-version --java-lib -activemq-protobuf-test/pom.xml --ignore-pom --has-package-version --java-lib +activemq-protobuf/pom.xml --has-package-version +activemq-protobuf-test/pom.xml --ignore-pom --has-package-version diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 9c4bd5d..e01fd9b 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -15,7 +15,7 @@ # junit junit jar s/3\\..*/3.x/ org.apache.maven.plugins maven-eclipse-plugin * * * * -org.apache.maven.plugins maven-javadoc-plugin * * * * +org.apache.felix maven-bundle-plugin * * * * org.apache.maven.plugins maven-surefire-report-plugin * * * * org.codehaus.mojo ianal-maven-plugin * * * * org.codehaus.mojo rat-maven-plugin * * * * diff --git a/debian/rules b/debian/rules index 844fc98..b38084c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,11 @@ #!/usr/bin/make -f -export JAVA_HOME := /usr/lib/jvm/default-java -%: - 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 +DEB_MAVEN_DOC_TARGET := javadoc:aggregate +DEB_MAVEN_BUILD_TARGET := install get-orig-source: - uscan --download-current-version --force-download --rename + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename diff --git a/debian/source/local-options b/debian/source/local-options deleted file mode 100644 index 2ee6f0f..0000000 --- a/debian/source/local-options +++ /dev/null @@ -1 +0,0 @@ -abort-on-upstream-changes -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/activemq-protobuf.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
