This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libcommons-logging-java.
commit fa00f0a7221a9db08e277134298687556664d9fc Author: Emmanuel Bourg <[email protected]> Date: Fri Jan 12 11:47:05 2018 +0100 Build with the DH sequencer instead of CDBS --- debian/changelog | 1 + debian/clean | 1 + debian/control | 1 - debian/libcommons-logging-java.poms | 5 +++-- debian/pom-adapters.xml | 6 ++++++ debian/pom-api.xml | 4 ++-- debian/rules | 29 +++++------------------------ 7 files changed, 18 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index eae9800..b36c61d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ libcommons-logging-java (1.2-2) UNRELEASED; urgency=medium + * Build with the DH sequencer instead of CDBS * Removed Niels Thykier from the uploaders (Closes: #770575) * Moved the package to Git * Standards-Version updated to 4.1.3 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..6b9c754 --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +src/main/resources/META-INF/MANIFEST.MF diff --git a/debian/control b/debian/control index 16ef3e7..e50f735 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,6 @@ Uploaders: Jakub Adam <[email protected]> Build-Depends: ant-optional, - cdbs, debhelper (>= 10), default-jdk, junit, diff --git a/debian/libcommons-logging-java.poms b/debian/libcommons-logging-java.poms index 739f391..915cdaf 100644 --- a/debian/libcommons-logging-java.poms +++ b/debian/libcommons-logging-java.poms @@ -1,2 +1,3 @@ -pom.xml -debian/pom-api.xml +pom.xml --has-package-version --java-lib --artifact=target/commons-logging-1.2.jar +debian/pom-api.xml --has-package-version --java-lib --artifact=target/commons-logging-api-1.2.jar +debian/pom-adapters.xml --has-package-version --java-lib --artifact=target/commons-logging-adapters-1.2.jar diff --git a/debian/pom-adapters.xml b/debian/pom-adapters.xml new file mode 100644 index 0000000..ece82be --- /dev/null +++ b/debian/pom-adapters.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?><project> + <modelVersion>4.0.0</modelVersion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-adapters</artifactId> + <version>1.2</version> +</project> diff --git a/debian/pom-api.xml b/debian/pom-api.xml index c8b5be8..bf3997e 100644 --- a/debian/pom-api.xml +++ b/debian/pom-api.xml @@ -3,7 +3,7 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging-api</artifactId> <name>Logging</name> - <version>1.1</version> + <version>1.2</version> <description>Commons Logging is a thin adapter allowing configurable bridging to other, well known logging systems.</description> <url>http://jakarta.apache.org/commons/logging/</url> @@ -162,4 +162,4 @@ </site> <status>converted</status> </distributionManagement> -</project> \ No newline at end of file +</project> diff --git a/debian/rules b/debian/rules index 330145b..ffe9b97 100755 --- a/debian/rules +++ b/debian/rules @@ -1,33 +1,14 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +%: + dh $@ --buildsystem=ant --with maven-repo-helper -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILD_TARGET := dist -DEB_JARS := commons-logging log4j-1.2 excalibur-logkit avalon-framework servlet-api-3.1 junit ant-junit -DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt - -makebuilddir/lib$(PACKAGE)-java:: +override_dh_auto_build: # copy MANIFEST.MF to src/main/resources/META-INF/ to include it in the jar install -d src/main/resources/META-INF/ - install -m644 src/main/conf/MANIFEST.MF src/main/resources/META-INF/ - -binary-post-install/$(PACKAGE):: - mh_installpoms -p$(PACKAGE) -e$(VERSION) - mh_installjar -p$(PACKAGE) -e$(VERSION) -l pom.xml \ - target/commons-logging-$(VERSION).jar - mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-api.xml \ - target/commons-logging-api-$(VERSION).jar - # commons-logging-adapters has no POM - dh_install target/commons-logging-adapters-$(VERSION).jar usr/share/java - dh_link usr/share/java/commons-logging-adapters-$(VERSION).jar usr/share/java/commons-logging-adapters.jar + install -m644 src/conf/MANIFEST.MF src/main/resources/META-INF/ -clean:: - mh_clean + dh_auto_build -- dist get-orig-source: -uscan --download-current-version --force-download --rename --repack --compression xz - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-logging-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
