This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository libcsv-java.

commit 97eba9df86c59b364e186f22c6a482f91fe3ecd9
Merge: 3df9b29 5d6ef76
Author: Markus Koschany <a...@debian.org>
Date:   Mon Oct 17 18:25:46 2016 +0200

    Import Debian patch 2.1-1

 build.xml                        |  4 ++-
 debian/changelog                 | 15 +++++++++
 debian/compat                    |  2 +-
 debian/control                   | 37 ++++++++++++++-------
 debian/copyright                 | 69 ++++++++++++++++++++--------------------
 debian/rules                     |  9 ++++--
 javadoc.xml                      |  2 +-
 src/AllTests.java                | 69 ++++++++++++++++++++++++++++++++--------
 src/com/csvreader/CsvWriter.java | 27 +++++++++-------
 9 files changed, 157 insertions(+), 77 deletions(-)

diff --cc debian/changelog
index 43d2a46,0000000..60ad7e2
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,82 -1,0 +1,97 @@@
++libcsv-java (2.1-1) unstable; urgency=medium
++
++  * Team upload.
++  * New upstream version 2.1.
++  * Switch to compat level 10.
++  * Declare compliance with Debian Policy 3.9.8.
++  * wrap-and-sort -sa.
++  * Use only Build-Depends field.
++  * Remove Matthew Johnson from Uploaders. He has retired. (Closes: #762570)
++  * Add get-orig-source target.
++  * Update debian/copyright and switch to copyright format 1.0.
++  * Move the package to Git.
++
++ -- Markus Koschany <a...@debian.org>  Mon, 17 Oct 2016 18:25:46 +0200
++
 +libcsv-java (2.0-12) unstable; urgency=low
 +
 +  * Team upload.
 +  * Add missing Breaks+Replaces: libcsv-java (<< 2.0-11)
 +    - Thank you to Andreas Beckmann.  (Closes: #694357)
 +
 + -- tony mancill <tmanc...@debian.org>  Mon, 26 Nov 2012 19:55:24 -0800
 +
 +libcsv-java (2.0-11) unstable; urgency=low
 +
 +  * Split javadoc into separate package and add the javacsv.jar symlink
 +    to match the upstream jar name.
 +  * Update standards version.
 +  * Fix lintian warning about recommending default-jdk-doc.
 +  * Change maintainer to Debian Java Maintainers.
 +  * Switched source format to 3.0 (quilt).
 +
 + -- Andrew Ross <ubu...@rossfamily.co.uk>  Thu, 06 Jan 2011 23:15:58 +0000
 +
 +libcsv-java (2.0-10) unstable; urgency=low
 +
 +  * Change to default-jdk-doc from classpath-doc (Closes: #567280)
 +  * Fix some lintian warnings 
 +
 + -- Matthew Johnson <mj...@debian.org>  Sat, 20 Mar 2010 13:26:53 +0000
 +
 +libcsv-java (2.0-9) unstable; urgency=low
 +
 +  * Change to using javahelper instead of dh_javadoc
 +
 + -- Matthew Johnson <mj...@debian.org>  Sat, 12 Dec 2009 10:05:00 +0000
 +
 +libcsv-java (2.0-8) unstable; urgency=low
 +
 +  * Build-depend on gjdoc as it is now not part of default-jdk 
 +  * Build with default-jdk
 +
 + -- Matthew Johnson <mj...@debian.org>  Thu, 13 Aug 2009 00:01:27 +0100
 +
 +libcsv-java (2.0-7) unstable; urgency=low
 +
 +  * Change to using dh 7 as a test for the javahelper module 
 +
 + -- Matthew Johnson <mj...@debian.org>  Fri, 17 Jul 2009 19:42:15 +0100
 +
 +libcsv-java (2.0-6) unstable; urgency=low
 +
 +  * Change to section java 
 +
 + -- Matthew Johnson <mj...@debian.org>  Sun, 15 Mar 2009 18:14:36 +0000
 +
 +libcsv-java (2.0-5) unstable; urgency=low
 +
 +  * Bump Standards-Version
 +
 + -- Matthew Johnson <mj...@debian.org>  Tue, 05 Feb 2008 09:28:03 +0000
 +
 +libcsv-java (2.0-4) unstable; urgency=low
 +
 +  * Add watch file
 +
 + -- Matthew Johnson <mj...@debian.org>  Tue, 25 Dec 2007 11:40:56 +0000
 +
 +libcsv-java (2.0-3) unstable; urgency=low
 +
 +  * Move to priority optional 
 +
 + -- Matthew Johnson <mj...@debian.org>  Sat,  8 Dec 2007 00:06:41 +0000
 +
 +libcsv-java (2.0-2) unstable; urgency=low
 +
 +  * Update maintainer address 
 +
 + -- Matthew Johnson <mj...@debian.org>  Wed, 05 Dec 2007 10:26:17 +0000
 +
 +libcsv-java (2.0-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #421431)
 +  * Update to new policy
 +
 + -- Matthew Johnson <deb...@matthew.ath.cx>  Wed, 30 May 2007 01:36:08 +0100
 +
diff --cc debian/compat
index 7f8f011,0000000..f599e28
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 7
++10
diff --cc debian/control
index fab6273,0000000..ea88ccc
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,34 -1,0 +1,47 @@@
 +Source: libcsv-java
 +Section: java
 +Priority: optional
 +Maintainer: Debian Java Maintainers 
<pkg-java-maintain...@lists.alioth.debian.org>
- Uploaders: Matthew Johnson <mj...@debian.org>, Andrew Ross 
<ubu...@rossfamily.co.uk>
- Build-Depends: debhelper (>= 7.0.50~), javahelper (>=0.32~)
- Build-Depends-Indep: default-jdk, fastjar, default-jdk-doc
- Standards-Version: 3.9.1
- Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcsv-java
- Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcsv-java/
++Uploaders:
++ Andrew Ross <ubu...@rossfamily.co.uk>
++Build-Depends:
++ debhelper (>= 10),
++ default-jdk,
++ default-jdk-doc,
++ fastjar,
++ javahelper
++Standards-Version: 3.9.8
++Vcs-Git: https://anonscm.debian.org/git/pkg-java/libcsv-java.git
++Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libcsv-java.git
 +Homepage: http://sourceforge.net/projects/javacsv/
 +
 +Package: libcsv-java
 +Architecture: all
- Depends: ${java:Depends}, ${misc:Depends}
- Recommends: ${java:Recommends}
++Depends:
++ ${java:Depends},
++ ${misc:Depends}
++Recommends:
++ ${java:Recommends}
 +Description: CSV IO library for Java
 + Java CSV is a small fast open source java library for reading and writing CSV
 + and plain delimited text files. All kinds of CSV files can be handled, text
 + qualified, Excel formatted, etc.
 +
 +Package: libcsv-java-doc
 +Section: doc
 +Architecture: all
- Depends: ${java:Depends}, ${misc:Depends}
- Recommends: ${java:Recommends}
- Breaks: libcsv-java (<< 2.0-11)
- Replaces: libcsv-java (<< 2.0-11)
++Depends:
++ ${java:Depends},
++ ${misc:Depends}
++Recommends:
++ ${java:Recommends}
++Breaks:
++ libcsv-java (<< 2.0-11)
++Replaces:
++ libcsv-java (<< 2.0-11)
 +Description: CSV IO library for Java (documentation)
 + Java CSV is a small fast open source java library for reading and writing CSV
 + and plain delimited text files. All kinds of CSV files can be handled, text
 + qualified, Excel formatted, etc.
 + .
 + This package contains the documentation.
diff --cc debian/copyright
index f62238f,0000000..58e9f61
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,37 -1,0 +1,36 @@@
- This package was debianized by Matthew Johnson <deb...@matthew.ath.cx> on
- Fri, 27 Apr 2007 15:24:36 +0100.
- 
- The Debian packaging was updated by Andrew Ross <ubu...@rossfamily.co.uk> on
- Thu, 06 Jan 2011 23:15:58 +0000.
- 
- It was downloaded from http://sourceforge.net/projects/javacsv/
- 
- Upstream Author: Bruce Dunwiddie <shr...@users.sourceforge.net>
- 
- Copyright: 2006 Bruce Dunwiddie
- 
- License:
- 
-     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 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'.
- 
- 
- The Debian packaging is Copyright (C) 2007, Matthew Johnson 
- <deb...@matthew.ath.cx> and is licensed under the GPL version 2, 
- see `/usr/share/common-licenses/GPL-2'.
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Source: http://sourceforge.net/projects/javacsv/
++Files-Excluded:
++ *.jar
++ doc/*
++
++Files: *
++Copyright: Bruce Dunwiddie <shr...@users.sourceforge.net>
++License: LGPL-2.1+
++
++Files: debian/*
++Copyright: 2007-2010,  Matthew Johnson <deb...@matthew.ath.cx>
++           2011,       Andrew Ross <ubu...@rossfamily.co.uk>
++           2012,       tony mancill <tmanc...@debian.org>
++           2016,       Markus Koschany <a...@debian.org>
++License: LGPL-2.1+
++
++License: LGPL-2.1+
++ 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'.
 +
 +
diff --cc debian/rules
index 76d98ba,0000000..08b468b
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,17 -1,0 +1,20 @@@
 +#!/usr/bin/make -f
 +
- JAVA_HOME=/usr/lib/jvm/default-java
++export JAVA_HOME=/usr/lib/jvm/default-java
 +
 +%:
 +      dh $@ --with javahelper
 +
 +override_dh_auto_clean:
-       true
++      # Leave empty to avoid a FTBFS
++
 +override_dh_auto_build:
-       true
++      # Leave empty to avoid a FTBFS
 +
 +# add a symlink from javacsv.jar to csv.jar
 +override_jh_installlibs:
 +      jh_installlibs
 +      dh_link usr/share/java/csv.jar usr/share/java/javacsv.jar
 +
++get-orig-source:
++      uscan --force-download --download-current-version --repack 
--compression xz

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/libcsv-java.git

_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to