This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository xz-java.
commit 6fe15eb70db574e1657d10242a2ade3d00b15bc7 Author: Emmanuel Bourg <[email protected]> Date: Tue Nov 29 23:10:00 2016 +0100 Simplified debian/rules --- debian/changelog | 1 + debian/clean | 1 + debian/copyright | 10 --------- debian/libxz-java.jlibs | 1 - debian/libxz-java.poms | 2 +- debian/rules | 28 ++++++------------------ debian/xz.pom | 58 ------------------------------------------------- 7 files changed, 10 insertions(+), 91 deletions(-) diff --git a/debian/changelog b/debian/changelog index f87b9e0..d36a70e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ xz-java (1.6-1) UNRELEASED; urgency=medium * Standards-Version updated to 3.9.8 * Use secure Vcs-* URLs * Switch to debhelper level 10 + * Simplified debian/rules -- Emmanuel Bourg <[email protected]> Mon, 06 Jul 2015 10:01:45 +0200 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..3a3a895 --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +extdoc/ diff --git a/debian/copyright b/debian/copyright index 8eb91cf..f9dd409 100644 --- a/debian/copyright +++ b/debian/copyright @@ -17,16 +17,6 @@ Files: debian/* Copyright: © 2012-2013, Miguel Landaeta <[email protected]> License: Apache-2.0 -Files: debian/xz.pom -Copyright: © 2011, Lasse Collin <[email protected]>, - © 2011, Igor Pavlov -License: public-domain - All the files in this package have been written by Lasse Collin - and/or Igor Pavlov. All these files have been put into the - public domain. You can do whatever you want with these files. - . - This software is provided "as is", without any warranty. - License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/debian/libxz-java.jlibs b/debian/libxz-java.jlibs deleted file mode 100644 index 2e379e6..0000000 --- a/debian/libxz-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -build/jar/xz.jar diff --git a/debian/libxz-java.poms b/debian/libxz-java.poms index 9e2e592..9006300 100644 --- a/debian/libxz-java.poms +++ b/debian/libxz-java.poms @@ -1 +1 @@ -debian/xz.pom +build/maven/xz.pom --has-package-version --java-lib --artifact=build/jar/xz.jar diff --git a/debian/rules b/debian/rules index c369d89..601feac 100755 --- a/debian/rules +++ b/debian/rules @@ -1,29 +1,15 @@ #!/usr/bin/make -f + %: - dh $@ --with javahelper + dh $@ --with javahelper --with maven-repo-helper override_dh_auto_build: - dh_auto_build - ant -Dextdoc_url=file:///usr/share/doc/default-jdk-doc/api -Ddebug=true jar doc maven - -override_dh_auto_clean: - dh_auto_clean - mh_clean - -rm -rf extdoc + dh_auto_build -- -Dextdoc_url=file:///usr/share/doc/default-jdk-doc/api -Ddebug=true jar doc maven + cp build/maven/xz-*.pom build/maven/xz.pom -override_jh_installlibs: - cp build/maven/xz-*.pom debian/xz.pom - mh_installjar -plibxz-java --java-lib debian/xz.pom build/jar/xz.jar - mh_installpoms -plibxz-java - dh_installchangelogs -plibxz-java NEWS - dh_installchangelogs -plibxz-java-doc NEWS +override_dh_installchangelogs: + dh_installchangelogs -- NEWS get-orig-source: cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \ - uscan \ - --verbose \ - --rename \ - --destdir $(CURDIR) \ - --watchfile debian/watch \ - --force-download \ - --repack + uscan --rename --repack --compression xz --destdir $(CURDIR) --force-download diff --git a/debian/xz.pom b/debian/xz.pom deleted file mode 100644 index a23007c..0000000 --- a/debian/xz.pom +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Author: Lasse Collin <[email protected]> - - This file has been put into the public domain. - You can do whatever you want with this file. ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd";> - - <modelVersion>4.0.0</modelVersion> - - <groupId>org.tukaani</groupId> - <artifactId>xz</artifactId> - <version>1.5</version> - <packaging>jar</packaging> - - <name>XZ for Java</name> - <description>XZ data compression</description> - <url>http://tukaani.org/xz/java.html</url> - - <licenses> - <license> - <name>Public Domain</name> - <comments>You can do whatever you want with this package.</comments> - <distribution>repo</distribution> - </license> - </licenses> - - <scm> - <url>http://git.tukaani.org/?p=xz-java.git</url> - <connection>scm:git:http://git.tukaani.org/xz-java.git</connection> - </scm> - - <developers> - <developer> - <name>Lasse Collin</name> - <email>[email protected]</email> - </developer> - </developers> - - <contributors> - <contributor> - <!-- According to Maven docs, it's good to only list those people - as <developers> that should be contacted if someone wants - to talk with an upstream developer. Thus, Igor Pavlov is - marked as a <contributor> even though XZ for Java simply - couldn't exist without Igor Pavlov's code. --> - <name>Igor Pavlov</name> - <url>http://7-zip.org/</url> - </contributor> - </contributors> - -</project> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/xz-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
