This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository svnclientadapter.
commit d1466d444d73ae8f68629f58a34626d733948df3 Merge: 8ef6233 178f615 Author: Markus Koschany <[email protected]> Date: Mon Dec 19 00:55:27 2016 +0100 Import Debian patch 1.10.12-1 debian/changelog | 15 +++ debian/compat | 2 +- debian/control | 51 +++++--- debian/patches/disable-cmdline-wrapper.patch | 105 ----------------- debian/patches/packaging-changes.patch | 45 +++---- debian/patches/series | 2 - ...bclipse-load-nativelib-from-single-bundle.patch | 131 --------------------- debian/svnclientadapter-get-orig-source | 6 +- .../javahl/AbstractJhlClientAdapter.java | 40 ++++--- .../svnclientadapter/javahl/JhlAnnotations.java | 49 ++++---- .../svnclientadapter/javahl/JhlConverter.java | 12 ++ .../tigris/subversion/svnclientadapter/SVNUrl.java | 2 +- 12 files changed, 133 insertions(+), 327 deletions(-) diff --cc debian/changelog index 69b0534,0000000..ee890ad mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,87 -1,0 +1,102 @@@ ++svnclientadapter (1.10.12-1) unstable; urgency=medium ++ ++ * Team upload. ++ * New upstream version 1.10.12. ++ * Switch to compat level 10. ++ * wrap-and-sort -sa. ++ * Declare compliance with Debian Policy 3.9.8. ++ * Vcs-Git: Use https. ++ * Update svnclientadapter-get-orig-source ++ * Drop disable-cmdline-wrapper.patch. The package builds fine. ++ * Rebase packaging-changes.patch and ++ subclipse-load-nativelib-from-single-bundle.patch. ++ ++ -- Markus Koschany <[email protected]> Mon, 19 Dec 2016 00:55:27 +0100 ++ +svnclientadapter (1.10.3-4) unstable; urgency=medium + + * Team upload. + * Restored the missing Export-Package attribute (Closes: #808487) + + -- Emmanuel Bourg <[email protected]> Fri, 15 Jan 2016 19:30:56 +0100 + +svnclientadapter (1.10.3-3) unstable; urgency=medium + + * Team upload. + * Transition to bnd >= 2.1.0. + * Declare compliance with Debian Policy 3.9.6. + * Vcs-Browser: Switch to cgit and https. + + -- Markus Koschany <[email protected]> Wed, 18 Nov 2015 19:46:02 +0100 + +svnclientadapter (1.10.3-2) unstable; urgency=medium + + * Team upload. + * Removed the build dependency on libemma-java + * Removed Andres Mejia from the uploaders (Closes: #743539) + * Switch to debhelper level 9 + + -- Emmanuel Bourg <[email protected]> Sat, 30 Aug 2014 22:03:50 +0200 + +svnclientadapter (1.10.3-1) unstable; urgency=medium + + * New upstream release. + * Refresh d/patches/subclipse-load-nativelib-from-single-bundle.patch. + * Depend on libsvn-java (>= 1.8~). + * Bump Standards-Version to 3.9.5. + * Use xz for upstream tarball compression. + * Make Vcs-* fields canonical. + + -- Jakub Adam <[email protected]> Sat, 22 Feb 2014 08:54:26 +0100 + +svnclientadapter (1.8.16-2) unstable; urgency=low + + * Team upload to unstable. + + -- Niels Thykier <[email protected]> Fri, 28 Jun 2013 15:22:01 +0200 + +svnclientadapter (1.8.16-1) experimental; urgency=low + + * New Upstream release. + * Add Jakub Adam to Uploaders. + * Build depend on libsvn-java (>= 1.7.5~). + * Disable commandline SVN client wrapper. + - Seems upstream stopped maintaining commandline SVN client wrapper + and it now became uncompilable as a result. + * Use real version number during build. + * Bump Standards-Version to 3.9.3. + * Remove dependency on libganymed-ssh2-java. + - Was a dependency of old SVNKit version, not needed anymore. + * Don't depend on both JavaHL and SVNKit, require only one of them to + be installed. + * Remove emma.jar and emma_ant.jar from Class-Path, they are required + only for running tests. + * Refreshed d/patches/packaging-changes.patch. + * Use bnd to generate OSGi metadata. + + -- Jakub Adam <[email protected]> Sun, 14 Oct 2012 15:43:00 +0200 + +svnclientadapter (0.9.100-2) unstable; urgency=low + + [ Andres Mejia ] + * Update to my @debian.org email. + + [ Jakub Adam ] + * Add OSGi metadata to JAR manifest + * Fix compatibility with eclipse-subclipse + * Bump to Standards-Version 3.9.2. + * Increase debhelper compatibility to 8. + + -- Andres Mejia <[email protected]> Sun, 17 Jul 2011 14:25:29 -0400 + +svnclientadapter (0.9.100-1) unstable; urgency=low + + [ Andres Mejia ] + * Initial release. (Closes: #374257) + + [ Damien Raude-Morvan ] + * d/control: Drop Depends: default-jre | java2-runtime + as a Java library don't need to depends on runtime (Java Policy). + * d/control: Fix indentation for long description. + + -- Andres Mejia <[email protected]> Sat, 22 Jan 2011 09:47:57 -0500 diff --cc debian/compat index ec63514,0000000..f599e28 mode 100644,000000..100644 --- a/debian/compat +++ b/debian/compat @@@ -1,1 -1,0 +1,1 @@@ - 9 ++10 diff --cc debian/control index 0eb19a2,0000000..8e8e566 mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,51 -1,0 +1,70 @@@ +Source: svnclientadapter +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> - Uploaders: Jakub Adam <[email protected]> - Build-Depends: debhelper (>= 9~), javahelper, ant, ant-optional, bnd (>= 2.1.0), - default-jdk, libsvn-java (>= 1.8~), libsvnkit-java (>= 1.7.5~) - Standards-Version: 3.9.6 ++Uploaders: ++ Jakub Adam <[email protected]> ++Build-Depends: ++ ant, ++ ant-optional, ++ bnd (>= 2.1.0), ++ debhelper (>= 10), ++ default-jdk, ++ javahelper, ++ libsvn-java (>= 1.8~), ++ libsvnkit-java (>= 1.7.5~) ++Standards-Version: 3.9.8 +Homepage: http://subclipse.tigris.org/svnClientAdapter.html +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/svnclientadapter.git - Vcs-Git: git://anonscm.debian.org/pkg-java/svnclientadapter.git ++Vcs-Git: https://anonscm.debian.org/git/pkg-java/svnclientadapter.git + +Package: libsvnclientadapter-java +Architecture: all - Depends: libsvn-java (>= 1.8~) | libsvnkit-java (>= 1.7.5~), - ${java:Depends}, ${misc:Depends} - Suggests: libsvnclientadapter-java-doc - Provides: libnb-svnclientadapter-java - Replaces: libnb-svnclientadapter-java - Conflicts: libnb-svnclientadapter-java ++Depends: ++ libsvn-java (>= 1.8~) | libsvnkit-java (>= 1.7.5~), ++ ${java:Depends}, ++ ${misc:Depends} ++Suggests: ++ libsvnclientadapter-java-doc ++Provides: ++ libnb-svnclientadapter-java ++Replaces: ++ libnb-svnclientadapter-java ++Conflicts: ++ libnb-svnclientadapter-java +Description: High-level Java API for Subversion (library) + SVNClientAdapter is a high-level Java API for Subversion. + It can use one of 3 low-level svn client implementations to provide access to + the Subversion API: + - JavaHL native (JNI) Subversion library + <http://svn.collab.net/repos/svn/trunk/subversion/bindings/java/javahl/> + - JavaSVN (pure Java) Subversion API implementation + <http://tmate.org/svn/> + - svn command line client wrapper + . + This package contains the SvnClientAdapter library. + +Package: libsvnclientadapter-java-doc +Architecture: all +Section: doc - Depends: ${misc:Depends} - Recommends: ${java:Recommends} - Provides: libnb-svnclientadapter-java-doc - Replaces: libnb-svnclientadapter-java-doc - Conflicts: libnb-svnclientadapter-java-doc ++Depends: ++ ${misc:Depends} ++Recommends: ++ ${java:Recommends} ++Provides: ++ libnb-svnclientadapter-java-doc ++Replaces: ++ libnb-svnclientadapter-java-doc ++Conflicts: ++ libnb-svnclientadapter-java-doc +Description: High-level Java API for Subversion (documentation) + SVNClientAdapter is a high-level Java API for Subversion. + It can use one of 3 low-level svn client implementations to provide access to + the Subversion API: + - JavaHL native (JNI) Subversion library + <http://svn.collab.net/repos/svn/trunk/subversion/bindings/java/javahl/> + - JavaSVN (pure Java) Subversion API implementation + <http://tmate.org/svn/> + - svn command line client wrapper + . + This package contains Javadoc API documentation. diff --cc debian/patches/packaging-changes.patch index 2cd4227,0000000..86b7bef mode 100644,000000..100644 --- a/debian/patches/packaging-changes.patch +++ b/debian/patches/packaging-changes.patch @@@ -1,115 -1,0 +1,108 @@@ - From: Debian Java Maintainers <[email protected]> - Date: Sun, 17 Jun 2012 23:28:03 +0200 - Subject: packaging-changes ++From: Markus Koschany <[email protected]> ++Date: Sun, 11 Dec 2016 01:27:08 +0100 ++Subject: packaging changes + +--- - build.xml | 31 +++++++++++++++---------------- - 1 file changed, 15 insertions(+), 16 deletions(-) ++ build.xml | 30 +++++++++++++++--------------- ++ 1 file changed, 15 insertions(+), 15 deletions(-) + +diff --git a/build.xml b/build.xml - index 20126dd..0b6c326 100644 ++index 20126dd..ae0db54 100644 +--- a/build.xml ++++ b/build.xml - @@ -18,13 +18,13 @@ - <!-- ================================================================= --> - <target name="clean" description="Clean everything"> - <delete dir="${build.dir}"/> - - <mkdir dir="${build.dir}" /> - </target> - - <!-- ================================================================= --> ++@@ -25,6 +25,7 @@ + <!-- compile --> + <!-- ================================================================= --> + <target name="compile" description="Compile all sources files"> ++ <mkdir dir="${build.dir}" /> + <mkdir dir="${build.classes.dir}" /> + <depend srcDir="${src.main.dir}" + destDir="${build.classes.dir}" - @@ -44,7 +44,8 @@ ++@@ -44,7 +45,8 @@ + source="${targetJvm}" + target="${targetJvm}" + includes="**" +- classpathref="project.classpath"> ++ classpathref="project.classpath" - + encoding="ISO-8859-1"> +++ encoding="ISO-8859-1"> + </javac> + <javac srcdir="${src.javahl.dir}" + destdir="${build.classes.dir}" - @@ -52,7 +53,8 @@ ++@@ -52,7 +54,8 @@ + source="${targetJvm}" + target="${targetJvm}" + includes="**" +- classpathref="project.classpath"> ++ classpathref="project.classpath" - + encoding="ISO-8859-1"> +++ encoding="ISO-8859-1"> + </javac> + <javac srcdir="${src.svnkit.dir}" + destdir="${build.classes.dir}" - @@ -60,7 +62,8 @@ ++@@ -60,7 +63,8 @@ + source="${targetJvm}" + target="${targetJvm}" + includes="**" +- classpathref="project.classpath"> ++ classpathref="project.classpath" - + encoding="ISO-8859-1"> +++ encoding="ISO-8859-1"> + </javac> + <javac srcdir="${src.cmdline.dir}" + destdir="${build.classes.dir}" - @@ -68,7 +71,8 @@ ++@@ -68,7 +72,8 @@ + source="${targetJvm}" + target="${targetJvm}" + includes="**" +- classpathref="project.classpath"> ++ classpathref="project.classpath" - + encoding="ISO-8859-1"> +++ encoding="ISO-8859-1"> + </javac> + <copy todir="${build.classes.dir}"> + <fileset dir="${src.main.dir}"> - @@ -87,7 +91,8 @@ ++@@ -87,7 +92,8 @@ + destdir="${build.javadoc.dir}" + packagenames="org.*" + windowtitle="svnClientAdapter API" +- doctitle="svnClientAdapter"> ++ doctitle="svnClientAdapter" ++ encoding="ISO-8859-1"> + </javadoc> + </target> + - @@ -97,7 +102,7 @@ ++@@ -97,7 +103,7 @@ + <target name="svnClientAdapter.jar" depends="compile" description="Generate svnClientAdapter.jar"> + <tstamp/> + <mkdir dir="${build.lib.dir}" /> +- <jar jarfile="${build.lib.dir}/svnClientAdapter.jar" ++ <jar jarfile="${build.lib.dir}/svnClientAdapter-${svnClientAdapter.version}.jar" + basedir="${build.classes.dir}" + includes="**/*" + excludes="**/*Test*.class"> - @@ -119,17 +124,10 @@ ++@@ -119,17 +125,10 @@ + <delete dir="${build.distrib.dir}"/> + <mkdir dir="${build.distrib.dir}"/> + <mkdir dir="${build.distrib.dir}/lib"/> +- <copy file="${build.lib.dir}/svnClientAdapter.jar" todir="${build.distrib.dir}/lib"/> ++ <copy file="${build.lib.dir}/svnClientAdapter-${svnClientAdapter.version}.jar" todir="${build.distrib.dir}/lib"/> + <copy file="readme.txt" todir="${build.distrib.dir}"/> + <copy file="license.txt" todir="${build.distrib.dir}"/> + <copy file="changelog.txt" todir="${build.distrib.dir}"/> +- <!-- required libs --> +- <copy file="${svnjavahl.jar}" todir="${build.distrib.dir}/lib"/> +- <copy file="${lib.dir}/JAVAHL-LICENSE" todir="${build.distrib.dir}/lib"/> +- <!-- SVNKit files --> +- <copy todir="${build.distrib.dir}/lib"> +- <fileset dir="${lib.dir}/svnkit"/> +- </copy> + <!-- Javadoc files --> + <copy todir="${build.distrib.dir}/javadoc"> + <fileset dir="${build.javadoc.dir}"/> - @@ -213,7 +211,8 @@ ++@@ -213,7 +212,8 @@ + <javac srcdir="${src.tests.dir}" + destdir="${build.testClasses.dir}" + debug="${debug}" +- includes="**"> ++ includes="**" ++ encoding="ISO-8859-1"> + <classpath> + <pathelement location="${build.classes.dir}"/> + <path refid="project.classpath"/> diff --cc debian/patches/series index 22fe3b9,0000000..a1276ca mode 100644,000000..100644 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,3 -1,0 +1,1 @@@ +packaging-changes.patch - subclipse-load-nativelib-from-single-bundle.patch - disable-cmdline-wrapper.patch diff --cc debian/svnclientadapter-get-orig-source index d5d82a1,0000000..33bfa5d mode 100755,000000..100755 --- a/debian/svnclientadapter-get-orig-source +++ b/debian/svnclientadapter-get-orig-source @@@ -1,51 -1,0 +1,51 @@@ +#!/bin/sh + +# This script is used to download the upstream source for svnclientadapter +# and generate it into an orig source tarball for Debian. + +# Common variables used to ease maintenance of this script - SVNCLIENTADAPTER_VERSION="0.9.100" - SVN_REVISION="4767" ++SVNCLIENTADAPTER_VERSION="1.10.12" ++SVN_REVISION="6002" + +USAGE="\n\ +This script is used to generate the orig tarball used in building\n\ +Debian packages for svnclientadapter-$SVNCLIENTADAPTER_VERSION.\n\ +Usage: svnclientadapter-get-orig-source [OPTION]\n\ +\n\ + -h, --help Display this help message.\n\ + --remove-upstream-source Remove the upstream source.\n" + +while [ "$#" -gt "0" ] +do + case "$1" in + --remove-upstream-tarball) + REMOVE_UPSTREAM_TARBALL=1 + shift + ;; + -h|--help|*) + echo "${USAGE}" + exit 1 + ;; + esac +done + +make_current_tarball() { + # Download the source if it's not available in the current directory + [ -d svnclientadapter-$SVNCLIENTADAPTER_VERSION ] || \ - svn export -r $SVN_REVISION http://subclipse.tigris.org/svn/subclipse/tags/subclipse/1.6.16/svnClientAdapter \ ++ svn export -r $SVN_REVISION http://subclipse.tigris.org/svn/subclipse/tags/subclipse/1.10.12/svnClientAdapter \ + svnclientadapter-$SVNCLIENTADAPTER_VERSION --username guest --password "" + + rm -rf svnclientadapter-${SVNCLIENTADAPTER_VERSION}/lib + rm -rf svnclientadapter-${SVNCLIENTADAPTER_VERSION}/test/lib + tar --exclude-vcs -czf svnclientadapter_${SVNCLIENTADAPTER_VERSION}.orig.tar.gz \ + svnclientadapter-${SVNCLIENTADAPTER_VERSION}/ + jh_repack --upstream-version ${SVNCLIENTADAPTER_VERSION} svnclientadapter_${SVNCLIENTADAPTER_VERSION}.orig.tar.gz + + if [ $REMOVE_UPSTREAM_TARBALL ]; then + echo -n "Removing upstream source..." + rm svnclientadapter-$SVNCLIENTADAPTER_VERSION + echo "done." + fi +} + +make_current_tarball -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/svnclientadapter.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
