This is an automated email from the git hooks/post-receive script. nomadium pushed a commit to branch master in repository svnkit.
commit 7bbf9cd897fb6d567aa4678debf74bea7271e725 Author: Miguel Landaeta <[email protected]> Date: Sat Apr 5 15:08:26 2014 -0300 Prepare 1.8.5+dfsg-1 upload --- debian/00TODO | 2 -- debian/README.Debian | 20 ------------ debian/changelog | 13 ++++++-- debian/control | 5 +-- debian/copyright | 2 +- debian/libsvnkit-java.jlibs | 2 -- debian/libsvnkit-java.poms | 2 ++ debian/maven.rules | 1 + debian/orig-tar.sh | 17 +++++++--- debian/rules | 10 ++++++ debian/svnkit-javahl16.pom | 47 +++++++++++++++++++++++++++ debian/svnkit.pom | 77 +++++++++++++++++++++++++++++++++++++++++++++ 12 files changed, 164 insertions(+), 34 deletions(-) diff --git a/debian/00TODO b/debian/00TODO deleted file mode 100644 index 3ac8ade..0000000 --- a/debian/00TODO +++ /dev/null @@ -1,2 +0,0 @@ -* Maven support. - libtrilead-ssh2-java also needs Maven support to enable this. diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index 8851009..0000000 --- a/debian/README.Debian +++ /dev/null @@ -1,20 +0,0 @@ -------------------------- -libsvnkit-java for Debian -------------------------- - - -*** Removal of functionalities *** - -SVNKIT Debian package doesn't contains some of the functionalities of -upstream binary releases. - -Here is a list of excluded files regarding original content of SVNKIT. - -* sqljet - [not-in-debian] SQLJet Pure Java SQLite - org/tmatesoft/svn/core/internal/io/fs/repcache/** - - Please see #563123. - - - -- Miguel Landaeta <[email protected]> Tue, 09 Mar 2010 22:44:23 -0430 diff --git a/debian/changelog b/debian/changelog index 9fbdb16..159314a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -svnkit (1.8.4+dfsg-1) unstable; urgency=medium +svnkit (1.8.5+dfsg-1) UNRELEASED; urgency=low * Team upload. @@ -8,7 +8,7 @@ svnkit (1.8.4+dfsg-1) unstable; urgency=medium * Wrap and sort. [ Markus Koschany ] - * Imported Upstream version 1.8.4+dfsg. (Closes: #743213) + * Imported Upstream version 1.8.5+dfsg. (Closes: #743213) - Fixes FTBFS. (Closes: #735763) * debian/control: Canonicalize VCS-fields. * debian/control: @@ -18,7 +18,14 @@ svnkit (1.8.4+dfsg-1) unstable; urgency=medium * Drop fix-build-javac-1.6.0_24.patch. Java7 is the default now. * Rebase fix-logging-path.patch. - -- Markus Koschany <[email protected]> Wed, 02 Apr 2014 19:08:08 +0200 + [ Miguel Landaeta ] + * Update my email address. + * Remove outdated to-do list. + * Remove outdated d/README.Debian file. + * Install maven artifacts. (Closes: #740608). + * Update d/orig-tar.sh script. + + -- Miguel Landaeta <[email protected]> Sat, 05 Apr 2014 12:03:22 -0300 svnkit (1.7.5+dfsg-2) unstable; urgency=low diff --git a/debian/control b/debian/control index b80dfa6..bfe5465 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: svnkit Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Miguel Landaeta <[email protected]>, Jakub Adam <[email protected]> +Uploaders: Miguel Landaeta <[email protected]>, Jakub Adam <[email protected]> Section: java Priority: optional Build-Depends: ant, @@ -13,7 +13,8 @@ Build-Depends: ant, libsqljet-java, libsvn-java (>= 1.8.8), libtrilead-ssh2-java (>= 6401+svn158), - perl + perl, + maven-repo-helper Standards-Version: 3.9.5 Homepage: http://svnkit.com/ Vcs-Git: git://anonscm.debian.org/pkg-java/svnkit.git diff --git a/debian/copyright b/debian/copyright index 6bf82af..f5d0d89 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,7 +8,7 @@ Copyright: 2004-2011, TMate Software Ltd. <[email protected]> License: The TMate Open Source License Files: debian/* -Copyright: 2010-2011, Miguel Landaeta <[email protected]> +Copyright: 2010-2011,2014 Miguel Landaeta <[email protected]> 2012, Debian Java Maintainers <[email protected]> License: Apache-2.0 diff --git a/debian/libsvnkit-java.jlibs b/debian/libsvnkit-java.jlibs deleted file mode 100644 index 9283b60..0000000 --- a/debian/libsvnkit-java.jlibs +++ /dev/null @@ -1,2 +0,0 @@ -build/lib/svnkit.jar -build/lib/svnkit-javahl16.jar diff --git a/debian/libsvnkit-java.poms b/debian/libsvnkit-java.poms new file mode 100644 index 0000000..223619b --- /dev/null +++ b/debian/libsvnkit-java.poms @@ -0,0 +1,2 @@ +debian/svnkit.pom +debian/svnkit-javahl16.pom diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..d6696a1 --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1 @@ +junit junit * s/.*/4.x/ * * diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index f1e1a05..87c5ed3 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -12,8 +12,17 @@ DIR=${package}-${debian_version}.orig # clean up the upstream tarball unzip -d orig $3 mv "$(find orig -maxdepth 1 -type d ! -name orig)" orig/$DIR -GZIP=--best tar -C orig -c -z -f $TAR --exclude doc/javadoc \ - --exclude '*.class' --exclude contrib/javahl --exclude contrib/jna \ - --exclude contrib/junit --exclude contrib/maven --exclude contrib/sqljet \ - --exclude contrib/trilead --numeric-owner --group 0 --owner 0 $DIR +GZIP=--best tar -C orig -c -z -f $TAR \ + --exclude doc/javadoc \ + --exclude '*.class' \ + --exclude contrib/javahl \ + --exclude contrib/jna \ + --exclude contrib/junit \ + --exclude contrib/maven \ + --exclude contrib/sqljet \ + --exclude contrib/trilead \ + --exclude gradle-wrapper.jar \ + --exclude 'nailgun-*.jar' \ + --exclude '*.exe' \ + --numeric-owner --group 0 --owner 0 $DIR rm -rf $3 orig diff --git a/debian/rules b/debian/rules index 85f3b67..0d6f404 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f export CLASSPATH=/usr/share/java/sqljet.jar:/usr/share/java/jna.jar:/usr/share/java/sequence-library.jar:/usr/share/java/trilead-ssh2.jar:/usr/share/java/svn-javahl.jar:/usr/share/java/svnkit.jar +export UVERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/^.*: \(.*\)-.*$$/\1/') %: dh $@ --with javahelper @@ -17,8 +18,17 @@ override_dh_auto_build: pod2man -c '' -r '' debian/$${script}.pod > build/doc/$${script}.1 ; \ done ; +override_dh_auto_install: + dh_auto_install + mh_installpoms -plibsvnkit-java --set-version=$(UVERSION) + mh_installjar -plibsvnkit-java debian/svnkit.pom --set-version=$(UVERSION) \ + build/lib/svnkit.jar --java-lib --usj-version=$(UVERSION) + mh_installjar -plibsvnkit-java debian/svnkit-javahl16.pom --set-version=$(UVERSION) \ + build/lib/svnkit-javahl16.jar --java-lib --usj-version=$(UVERSION) + override_dh_auto_clean: ant -f debian/build.xml clean + mh_clean override_dh_compress: dh_compress -X.java diff --git a/debian/svnkit-javahl16.pom b/debian/svnkit-javahl16.pom new file mode 100644 index 0000000..1bb7e2c --- /dev/null +++ b/debian/svnkit-javahl16.pom @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <groupId>org.tmatesoft.svnkit</groupId> + <artifactId>svnkit-javahl16</artifactId> + <version>@VERSION</version> + <name>SVNKit Library</name> + <description>Pure Java Subversion Library</description> + <url>http://www.svnkit.com/</url> + <licenses> + <license> + <name>TMate Open Source License (with dual licensing option)</name> + <url>http://www.svnkit.com/license.html</url> + </license> + </licenses> + <developers> + <developer> + <id>tmate</id> + <name>TMate Software</name> + </developer> + </developers> + <scm> + <connection>scm:svn:http://svn.svnkit.com/repos/svnkit</connection> + <url>http://svn.svnkit.com/repos/svnkit</url> + </scm> + <dependencies> + <dependency> + <groupId>org.apache.subversion</groupId> + <artifactId>svn-javahl-api</artifactId> + <version>1.8.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.tmatesoft.svnkit</groupId> + <artifactId>svnkit</artifactId> + <version>1.8.3</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.subversion</groupId> + <artifactId>svn-javahl-tests</artifactId> + <version>1.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> +</project> diff --git a/debian/svnkit.pom b/debian/svnkit.pom new file mode 100644 index 0000000..d8385c7 --- /dev/null +++ b/debian/svnkit.pom @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <groupId>org.tmatesoft.svnkit</groupId> + <artifactId>svnkit</artifactId> + <version>@VERSION</version> + <name>SVNKit Library</name> + <description>Pure Java Subversion Library</description> + <url>http://www.svnkit.com/</url> + <licenses> + <license> + <name>TMate Open Source License (with dual licensing option)</name> + <url>http://www.svnkit.com/license.html</url> + </license> + </licenses> + <developers> + <developer> + <id>tmate</id> + <name>TMate Software</name> + </developer> + </developers> + <scm> + <connection>scm:svn:http://svn.svnkit.com/repos/svnkit</connection> + <url>http://svn.svnkit.com/repos/svnkit</url> + </scm> + <dependencies> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch.agentproxy.svnkit-trilead-ssh2</artifactId> + <version>0.0.7</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + <version>3.5.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.tmatesoft.sqljet</groupId> + <artifactId>sqljet</artifactId> + <version>1.1.10</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>platform</artifactId> + <version>3.5.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch.agentproxy.connector-factory</artifactId> + <version>0.0.7</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>de.regnis.q.sequence</groupId> + <artifactId>sequence-library</artifactId> + <version>1.0.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.trilead</groupId> + <artifactId>trilead-ssh2</artifactId> + <version>1.0.0-build217</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/svnkit.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
