[pkg-java] r16614 - in trunk/jcifs/debian: . patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Fri May 10 14:51:29 UTC 2013
Author: ebourg-guest
Date: 2013-05-10 14:51:28 +0000 (Fri, 10 May 2013)
New Revision: 16614
Added:
trunk/jcifs/debian/README.source
Removed:
trunk/jcifs/debian/README.Debian-source
trunk/jcifs/debian/libjcifs-java.examples
Modified:
trunk/jcifs/debian/changelog
trunk/jcifs/debian/control
trunk/jcifs/debian/copyright
trunk/jcifs/debian/libjcifs-java-doc.docs
trunk/jcifs/debian/patches/0001-fix-index.html.patch
trunk/jcifs/debian/patches/0002-remove-path-to-nonexistant-compiler.patch
trunk/jcifs/debian/rules
Log:
New upstream release (1.3.17)
Updated Standards-Version to 3.9.4
Build-Depends on libservlet3.0-java instead of libservlet2.5-java
Removed the dependency on the JRE (not required for libraries)
The upstream changelog is now included in the package
Removed the examples from the libjcifs-java package
Removed Michael Koch from the Uploaders list (Closes: #654033)
debian/copyright: Updated to the Copyright Format 1.0
Deleted: trunk/jcifs/debian/README.Debian-source
===================================================================
--- trunk/jcifs/debian/README.Debian-source 2013-05-09 17:00:39 UTC (rev 16613)
+++ trunk/jcifs/debian/README.Debian-source 2013-05-10 14:51:28 UTC (rev 16614)
@@ -1,10 +0,0 @@
-jcifs for Debian
-----------
-
-The upstream supplied tar.gz package contains prebuild libraries. So,
-the orig-tar.sh script is used to automate rebuilding the tarball.
-
-For step-by-step information on how the orig.tar.sh is obtained,
-please look at the orig-tar.sh present in this directory.
-
- -- Kumar Appaiah <akumar at ee.iitm.ac.in>, Thu, 8 Nov 2007 23:02:10 +0530
Copied: trunk/jcifs/debian/README.source (from rev 16613, trunk/jcifs/debian/README.Debian-source)
===================================================================
--- trunk/jcifs/debian/README.source (rev 0)
+++ trunk/jcifs/debian/README.source 2013-05-10 14:51:28 UTC (rev 16614)
@@ -0,0 +1,10 @@
+jcifs for Debian
+----------------
+
+The upstream supplied tar.gz package contains prebuild libraries. So,
+the orig-tar.sh script is used to automate rebuilding the tarball.
+
+For step-by-step information on how the orig.tar.sh is obtained,
+please look at the orig-tar.sh present in this directory.
+
+ -- Kumar Appaiah <akumar at ee.iitm.ac.in>, Thu, 8 Nov 2007 23:02:10 +0530
Modified: trunk/jcifs/debian/changelog
===================================================================
--- trunk/jcifs/debian/changelog 2013-05-09 17:00:39 UTC (rev 16613)
+++ trunk/jcifs/debian/changelog 2013-05-10 14:51:28 UTC (rev 16614)
@@ -1,3 +1,17 @@
+jcifs (1.3.17-1) unstable; urgency=low
+
+ * Team upload.
+ * New upstream release
+ * Updated Standards-Version to 3.9.4
+ * Build-Depends on libservlet3.0-java instead of libservlet2.5-java
+ * Removed the dependency on the JRE (not required for libraries)
+ * The upstream changelog is now included in the package
+ * Removed the examples from the libjcifs-java package
+ * Removed Michael Koch from the Uploaders list (Closes: #654033)
+ * debian/copyright: Updated to the Copyright Format 1.0
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 10 May 2013 16:45:39 +0200
+
jcifs (1.3.16-1) unstable; urgency=low
* Team upload
Modified: trunk/jcifs/debian/control
===================================================================
--- trunk/jcifs/debian/control 2013-05-09 17:00:39 UTC (rev 16613)
+++ trunk/jcifs/debian/control 2013-05-10 14:51:28 UTC (rev 16614)
@@ -2,19 +2,19 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Kumar Appaiah <akumar at ee.iitm.ac.in>, Varun Hiremath <varun at debian.org>, Michael Koch <konqueror at gmx.de>
+Uploaders: Kumar Appaiah <akumar at ee.iitm.ac.in>, Varun Hiremath <varun at debian.org>, Emmanuel Bourg <ebourg at apache.org>
Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant
-Build-Depends-Indep: libservlet2.5-java
-Standards-Version: 3.8.3
+Build-Depends-Indep: libservlet3.0-java
+Standards-Version: 3.9.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jcifs
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jcifs
Homepage: http://jcifs.samba.org
Package: libjcifs-java
Architecture: all
-Depends: default-jre | java1-runtime | java2-runtime, ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: libjcifs-java-doc
-Description: java library for the CIFS/SMB networking protocol
+Description: Java library for the CIFS/SMB networking protocol
JCIFS is an Open Source client library that implements the CIFS/SMB
networking protocol in 100% Java. CIFS is the standard file sharing
protocol on the Microsoft Windows platform (e.g. Map Network Drive ...).
@@ -24,7 +24,7 @@
Architecture: all
Depends: ${misc:Depends}
Suggests: libjcifs-java
-Description: Documentation for libjcifs-java (CIFS/SMB library for java)
+Description: Documentation for libjcifs-java (CIFS/SMB library for Java)
JCIFS is an Open Source client library that implements the CIFS/SMB
networking protocol in 100% Java. CIFS is the standard file sharing
protocol on the Microsoft Windows platform (e.g. Map Network Drive ...).
Modified: trunk/jcifs/debian/copyright
===================================================================
--- trunk/jcifs/debian/copyright 2013-05-09 17:00:39 UTC (rev 16613)
+++ trunk/jcifs/debian/copyright 2013-05-10 14:51:28 UTC (rev 16614)
@@ -1,85 +1,86 @@
-This package was debianized by Wolfgang Baer <WBaer at gmx.de> on
-Fri, 11 Feb 2005 14:58:19 +0100.
-
-It was downloaded from <http://jcifs.samba.org>
-
-Copyright: (C) 2002 - 2007, Michael B. Allen <jcifs at samba.org>
- (C) 2003, Eric Glass <jcifs at samba.org>
- (C) 1996, Jef Poskanzer <jef at acme.com>
- (C) 1996, Wolfgang Platzer <wplatzer at iaik.tu-graz.ac.at>
- (C) 1996 Widget Workshop, Inc.
-
-Upstream Authors:
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: JCIFS
+Source: http://jcifs.samba.org
+Comment:
+ Upstream Authors:
Michael B. Allen <jcifs at samba.org> (Chief author)
Eric Glass <jcifs at samba.org>
Jef Poskanzer
Wolfgang Platzer
Other contributors to the JCIFS project
-License:
+Files: *
+Copyright: 2002-2007, Michael B. Allen <jcifs at samba.org>
+ 2003, Eric Glass <jcifs at samba.org>
+ 1996, Jef Poskanzer <jef at acme.com>
+ 1996, Wolfgang Platzer <wplatzer at iaik.tu-graz.ac.at>
+ 1996, Widget Workshop, Inc.
+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; version 2.1 dated February 1999.
-
- 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.
+Files: src/jcifs/util/DES.java
+Copyright: 1996, Widget Workshop, Inc.
+ 1996, Jef Poskanzer <jef at acme.com>
+ 1996, Wolfgang Platzer <wplatzer at iaik.tu-graz.ac.at>
+License: other, and BSD-2-Clause
+ The meat of this code is by Dave Zimmerman <dzimm at widget.com>, and is
+ licensed as follows:
+ .
+ Permission to use, copy, modify, and distribute this software
+ and its documentation for NON-COMMERCIAL or COMMERCIAL purposes and
+ without fee is hereby granted, provided that this copyright notice is kept
+ intact.
+ .
+ WIDGET WORKSHOP MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY
+ OF THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ PARTICULAR PURPOSE, OR NON-INFRINGEMENT. WIDGET WORKSHOP SHALL NOT BE LIABLE
+ FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+ DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.
+ .
+ THIS SOFTWARE IS NOT DESIGNED OR INTENDED FOR USE OR RESALE AS ON-LINE
+ CONTROL EQUIPMENT IN HAZARDOUS ENVIRONMENTS REQUIRING FAIL-SAFE
+ PERFORMANCE, SUCH AS IN THE OPERATION OF NUCLEAR FACILITIES, AIRCRAFT
+ NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL, DIRECT LIFE
+ SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH THE FAILURE OF THE
+ SOFTWARE COULD LEAD DIRECTLY TO DEATH, PERSONAL INJURY, OR SEVERE
+ PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH RISK ACTIVITIES"). WIDGET WORKSHOP
+ SPECIFICALLY DISCLAIMS ANY EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR
+ HIGH RISK ACTIVITIES.
+ .
+ .
+ The rest is licences as:
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
- 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'.
+Files: debian/*
+Copyright: 2005-2006, Wolfgang Baer <wbaer at gmx.de>
+ 2007, Kumar Appaiah <akumar at ee.iitm.ac.in>
+ 2008, Varun Hiremath <varun at debian.org>
+ 2009, Michael Koch <konqueror at gmx.de>
+ 2011, Torsten Werner <twerner at debian.org>
+License: LGPL-2.1
-Licence for DES.java:
- The meat of this code is by Dave Zimmerman <dzimm at widget.com>, and is
- licensed as follows:
-
- Permission to use, copy, modify, and distribute this software
- and its documentation for NON-COMMERCIAL or COMMERCIAL purposes and
- without fee is hereby granted, provided that this copyright notice is kept
- intact.
-
- WIDGET WORKSHOP MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY
- OF THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
- TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- PARTICULAR PURPOSE, OR NON-INFRINGEMENT. WIDGET WORKSHOP SHALL NOT BE LIABLE
- FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.
-
- THIS SOFTWARE IS NOT DESIGNED OR INTENDED FOR USE OR RESALE AS ON-LINE
- CONTROL EQUIPMENT IN HAZARDOUS ENVIRONMENTS REQUIRING FAIL-SAFE
- PERFORMANCE, SUCH AS IN THE OPERATION OF NUCLEAR FACILITIES, AIRCRAFT
- NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL, DIRECT LIFE
- SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH THE FAILURE OF THE
- SOFTWARE COULD LEAD DIRECTLY TO DEATH, PERSONAL INJURY, OR SEVERE
- PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH RISK ACTIVITIES"). WIDGET WORKSHOP
- SPECIFICALLY DISCLAIMS ANY EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR
- HIGH RISK ACTIVITIES.
-
-
- The rest is licences as:
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
+
+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'.
Modified: trunk/jcifs/debian/libjcifs-java-doc.docs
===================================================================
--- trunk/jcifs/debian/libjcifs-java-doc.docs 2013-05-09 17:00:39 UTC (rev 16613)
+++ trunk/jcifs/debian/libjcifs-java-doc.docs 2013-05-10 14:51:28 UTC (rev 16614)
@@ -1,4 +1,3 @@
-README.txt
docs/*.html
docs/api
examples
Deleted: trunk/jcifs/debian/libjcifs-java.examples
===================================================================
--- trunk/jcifs/debian/libjcifs-java.examples 2013-05-09 17:00:39 UTC (rev 16613)
+++ trunk/jcifs/debian/libjcifs-java.examples 2013-05-10 14:51:28 UTC (rev 16614)
@@ -1 +0,0 @@
-examples/*
Modified: trunk/jcifs/debian/patches/0001-fix-index.html.patch
===================================================================
--- trunk/jcifs/debian/patches/0001-fix-index.html.patch 2013-05-09 17:00:39 UTC (rev 16613)
+++ trunk/jcifs/debian/patches/0001-fix-index.html.patch 2013-05-10 14:51:28 UTC (rev 16614)
@@ -6,11 +6,9 @@
docs/index.html | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
-diff --git a/docs/index.html b/docs/index.html
-index 1d43867..8f66c46 100644
--- a/docs/index.html
+++ b/docs/index.html
-@@ -88,28 +88,26 @@ JCIFS is an <a href="http://www.opensource.org/docs/definition_plain.php">Open S
+@@ -88,28 +88,26 @@
<TR>
<TD valign="top" width="350" class="leftpane">
<h1>Links</h1>
@@ -48,7 +46,7 @@
<br>
<a href="http://www.gnu.org/licenses/lgpl-2.1.txt">JCIFS is Licensed Under the LGPL</a>
<br>
-@@ -210,7 +208,7 @@ JCIFS is an <a href="http://www.opensource.org/docs/definition_plain.php">Open S
+@@ -210,7 +208,7 @@
<br>
<a href="src/src/jcifs/">Browse the Source</a>
<br>
@@ -57,4 +55,3 @@
<br>
<a href="http://www.gnu.org/">http://www.gnu.org/</a>
<br>
---
Modified: trunk/jcifs/debian/patches/0002-remove-path-to-nonexistant-compiler.patch
===================================================================
--- trunk/jcifs/debian/patches/0002-remove-path-to-nonexistant-compiler.patch 2013-05-09 17:00:39 UTC (rev 16613)
+++ trunk/jcifs/debian/patches/0002-remove-path-to-nonexistant-compiler.patch 2013-05-10 14:51:28 UTC (rev 16614)
@@ -6,11 +6,9 @@
build.xml | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
-diff --git a/build.xml b/build.xml
-index cb68a72..19da040 100644
--- a/build.xml
+++ b/build.xml
-@@ -52,7 +52,6 @@ dependencies: Checks that all class dependencies are met.
+@@ -52,7 +52,6 @@
source="1.5"
target="1.5"
fork="yes"
@@ -18,4 +16,3 @@
compiler="javac1.5"
debug="on">
<!--
---
Modified: trunk/jcifs/debian/rules
===================================================================
--- trunk/jcifs/debian/rules 2013-05-09 17:00:39 UTC (rev 16613)
+++ trunk/jcifs/debian/rules 2013-05-10 14:51:28 UTC (rev 16614)
@@ -6,10 +6,11 @@
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := servlet-api-2.5
+DEB_JARS := servlet-api-3.0
DEB_ANT_BUILD_TARGET := jar javadoc
DEB_ANT_CLEAN_TARGET := clean
DEB_COMPRESS_EXCLUDE := *.c *.java
+DEB_INSTALL_CHANGELOGS_ALL := README.txt
clean::
-$(RM) *.jar
More information about the pkg-java-commits
mailing list