This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository statsvn.
commit efa0ca908404aa1985a2a0859196cc5b26d8ef27 Author: Emmanuel Bourg <[email protected]> Date: Thu Jun 13 21:53:24 2013 +0000 Removed the dependency on libbackport-util-concurrent-java debian/control: - Updated Standards-Version to 3.9.4 (no changes) - Use canonical URLs for the Vcs-* fields Fixed syntax and spellings errors in the manpages debian/rules: Added a get-orig-source target debian/copyright: Updated to follow the Copyright Format 1.0 --- debian/README.source | 12 +++-- debian/changelog | 13 +++++ debian/control | 10 ++-- debian/copyright | 60 ++++++---------------- debian/manpages/statsvn.1 | 6 +-- .../20-remove-backport-util-concurrent.diff | 17 ++++++ debian/patches/series | 1 + debian/rules | 3 ++ debian/statsvn.classpath | 2 +- 9 files changed, 69 insertions(+), 55 deletions(-) diff --git a/debian/README.source b/debian/README.source index 05d509e..bde1d0a 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,7 +1,13 @@ Note about the source package of statsvn -This package uses dpatch to manage all modifications to the upstream -source. See /usr/share/doc/dpatch/README.source.gz to get more information -on how to use it. +The upstream source was repackaged to remove: + * binary only jar files shipped in lib/ + * contents of the bin/ directory + * tests-src/, without 'sources' and copyrights for most + * site/ also without 'sources' and copyrights + * src/.../jtreemap-*.jar, binary library without sources + +The debian/new-upstream script from the source package was used to repackage +the upstream zip file after download. -- Vincent Fourmond <[email protected]>, Mon, 22 Jun 2009 20:20:55 +0200 diff --git a/debian/changelog b/debian/changelog index f95f9b3..269679d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +statsvn (0.7.0.dfsg-7) unstable; urgency=low + + * Team upload. + * Removed the dependency on libbackport-util-concurrent-java + * debian/control: + - Updated Standards-Version to 3.9.4 (no changes) + - Use canonical URLs for the Vcs-* fields + * Fixed syntax and spellings errors in the manpages + * debian/rules: Added a get-orig-source target + * debian/copyright: Updated to follow the Copyright Format 1.0 + + -- Emmanuel Bourg <[email protected]> Thu, 13 Jun 2013 23:33:35 +0200 + statsvn (0.7.0.dfsg-6) unstable; urgency=low * Rebuild with javahelper >= 0.36 to avoid the statsvn.jar not being a diff --git a/debian/control b/debian/control index 76883cf..3da3d79 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,13 @@ Section: vcs Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Vincent Fourmond <[email protected]> -Build-Depends: cdbs, debhelper (>= 5), ant, libbackport-util-concurrent-java, +Build-Depends: cdbs, debhelper (>= 5), ant, libjcommon-java, libjfreechart-java, statcvs (>= 1:0.5.0), default-jdk, libsvnkit-java, libjdom1-java, javahelper (>= 0.36) -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Homepage: http://www.statsvn.org/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/statsvn -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/statsvn +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/statsvn +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/statsvn Package: statsvn @@ -26,4 +26,4 @@ Description: SVN repository statistics out of the box with ViewVc, BugZilla, Chora and others. . StatSVN generates a static suite of HTML or XDoc documents containing - tables and chart images. \ No newline at end of file + tables and chart images. diff --git a/debian/copyright b/debian/copyright index 576eeef..98a4234 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,43 +1,17 @@ -This package was debianized by Vincent Fourmond <[email protected]>, Fri Jan 11 00:23:14 CET 2008 - -It was downloaded from http://www.statsvn.org - -It was repackaged to remove: - * binary only jar files shipped in lib/ - * contents of the bin/ directory - * tests-src/, without 'sources' and copyrights for most - * site/ also without 'sources' and copyrights - * src/.../jtreemap-*.jar, binary library without sources - -The debian/new-upstream script from the source package was used to repackage -the upstream zip file after download. - -Upstream Authors: Lukasz Pekacki and others - -Copyright: - 2002, Lukasz Pekacki <[email protected]> - 2005, ObjectLab Financial Ltd - 2006 Benoit Xhenseval - -Copyright: - - This package is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -On Debian systems, the complete text of the GNU Lesser General -Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. - - -The debian packaging, is copyright 2008 by Vincent Fourmond, -licensed under the same terms as statsvn itself. \ No newline at end of file +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: StatSVN +Source: http://www.statsvn.org + +Files: * +Copyright: 2002, Lukasz Pekacki <[email protected]> + 2005, ObjectLab Financial Ltd + 2006, Benoit Xhenseval +License: LGPL-2.1+ + +Files: debian/* +Copyright: 2008-2011, Vincent Fourmond <[email protected]> +License: LGPL-2.1+ + +License: LGPL-2.1+ + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. diff --git a/debian/manpages/statsvn.1 b/debian/manpages/statsvn.1 index c22f615..033261b 100644 --- a/debian/manpages/statsvn.1 +++ b/debian/manpages/statsvn.1 @@ -102,7 +102,7 @@ ignored if it doesn't match any of the patterns in .IR exclude-pattern-list . The patterns are lists of Apache Ant-style wildcard patterns, -seperated by colons or semicolons. The wildcards are: +separated by colons or semicolons. The wildcards are: * '?' matches a single character * '*' matches zero or more characters @@ -151,7 +151,7 @@ Specify a password to use when connecting to the Subversion server. Includes information about Subverison tags into the reports. Only tags matching the regular expression are included. To include all tags, add --tags '.*' to the command line. +\-tags '.*' to the command line. .B Note: \fR Unix users must put the expression in quotes, or the shell will interfere with the wildcards. @@ -166,7 +166,7 @@ version does not have to contain the tags directory. .BI -tags-dir \ <directory> Specifies the root directory from which the tags regular expression is -evaluated. The default -tags-dir is /tags/ +evaluated. The default \-tags-dir is /tags/ .TP .BI -no-developer \ <login-name> diff --git a/debian/patches/20-remove-backport-util-concurrent.diff b/debian/patches/20-remove-backport-util-concurrent.diff new file mode 100644 index 0000000..4358e16 --- /dev/null +++ b/debian/patches/20-remove-backport-util-concurrent.diff @@ -0,0 +1,17 @@ +Description: Replace the classes from backport-util-concurrent with their equivalent in the JDK +Author: Emmanuel Bourg <[email protected]> +--- a/src/net/sf/statsvn/input/SvnLogfileParser.java ++++ b/src/net/sf/statsvn/input/SvnLogfileParser.java +@@ -51,9 +51,9 @@ + + import org.xml.sax.SAXException; + +-import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService; +-import edu.emory.mathcs.backport.java.util.concurrent.Executors; +-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; ++import java.util.concurrent.ExecutorService; ++import java.util.concurrent.Executors; ++import java.util.concurrent.TimeUnit; + + /** + * Parses a Subversion logfile and does post-parse processing. A {@link Builder} diff --git a/debian/patches/series b/debian/patches/series index a9fe732..eed7154 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 10-build-xml-classpath.diff 15-build-xml-build-jar-only.diff +20-remove-backport-util-concurrent.diff diff --git a/debian/rules b/debian/rules index 3d85902..f86775a 100755 --- a/debian/rules +++ b/debian/rules @@ -22,3 +22,6 @@ print-version: echo $(DEB_UPSTREAM_VERSION) JH_INSTALLLIBS_ARGS = --upstream-version=$(VERSION) + +get-orig-source: + uscan --force-download diff --git a/debian/statsvn.classpath b/debian/statsvn.classpath index c087676..25b27f1 100644 --- a/debian/statsvn.classpath +++ b/debian/statsvn.classpath @@ -1 +1 @@ -usr/share/java/statsvn.jar /usr/share/java/backport-util-concurrent.jar /usr/share/java/statcvs.jar /usr/share/java/svnkit.jar +usr/share/java/statsvn.jar /usr/share/java/statcvs.jar /usr/share/java/svnkit.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/statsvn.git _______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
