[pkg-java] r4727 - in trunk/jcifs/debian: . patches

kumanna-guest at alioth.debian.org kumanna-guest at alioth.debian.org
Mon Nov 12 01:17:02 UTC 2007 

Author: kumanna-guest
Date: 2007-11-12 01:17:01 +0000 (Mon, 12 Nov 2007)
New Revision: 4727

Added:
   trunk/jcifs/debian/libjcifs-java.examples
   trunk/jcifs/debian/orig-tar.sh
Removed:
   trunk/jcifs/debian/patches/01_build_xml.patch
Modified:
   trunk/jcifs/debian/README.Debian-source
   trunk/jcifs/debian/changelog
   trunk/jcifs/debian/control
   trunk/jcifs/debian/copyright
   trunk/jcifs/debian/rules
Log:
* New Upstream Release
* debian/orig-tar.sh:  
  + Automate repackaging.
  + Remove example Format.java, since it is not allowed for
    commercial use.
* debian/README.Debian-source:
  + Update for new repackaging information.
* debian/libjcifs-java.examples:
  + Include upstream supplied examples.
* debian/copyright:
  + Add upstream authors, update licenses and copyrights.
  + Point to LGPL 2.1, instead of LGPL (for common-license).
  + Add Vcs-Svn and Vcs-Browser.
  + Update description.
  + Build-Depend on java-gcj-compat-dev instead of kaffe.
  + Depend on java-gcj-compat instead of kaffe.
  + Update standards version.
  + Move debhelper and cdbs to Build-Depends.
* debian/rules:
  + Use java-gcj to build.
  + Use DEB_UPSTREAM_VERSION instead of parsing the changelog.
  + Add get-orig-source rule.
  + Don't compress examples.
* debian/patches/01_build_xml.patch:
  + Removed, since not necessary with java-gcj.

Modified: trunk/jcifs/debian/README.Debian-source
===================================================================
--- trunk/jcifs/debian/README.Debian-source	2007-11-12 00:44:40 UTC (rev 4726)
+++ trunk/jcifs/debian/README.Debian-source	2007-11-12 01:17:01 UTC (rev 4727)
@@ -1,11 +1,10 @@
 jcifs for Debian
 ----------
 
-The upstream supplied tar.gz package contains prebuild libraries.
+The upstream supplied tar.gz package contains prebuild libraries. So,
+the orig-tar.sh script is used to automate rebuilding the tarball.
 
-This is a step-by-step instruction how this package
-was derived from upstream:
+For step-by-step information on how the orig.tar.sh is obtained,
+please look at the orig-tar.sh present in this directory.
 
-- rm *.jar
-
- -- Wolfgang Baer <WBaer at gmx.de>
+ -- 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	2007-11-12 00:44:40 UTC (rev 4726)
+++ trunk/jcifs/debian/changelog	2007-11-12 01:17:01 UTC (rev 4727)
@@ -1,11 +1,35 @@
-jcifs (1.2.7-2) UNRELEASED; urgency=low
+jcifs (1.2.17-1) unstable; urgency=low
 
+  * New Upstream Release
   * Add a watch file.
+  * debian/orig-tar.sh:  
+    + Automate repackaging.
+    + Remove example Format.java, since it is not allowed for
+      commercial use.
+  * debian/README.Debian-source:
+    + Update for new repackaging information.
+  * debian/libjcifs-java.examples:
+    + Include upstream supplied examples.
+  * debian/copyright:
+    + Add upstream authors, update licenses and copyrights.
+    + Point to LGPL 2.1, instead of LGPL (for common-license).
   * debian/control:
     + Add Homepage field.
-    + Add XS-Vcs-Svn and XS-Vcs-Browser.
+    + Add Vcs-Svn and Vcs-Browser.
+    + Update description.
+    + Build-Depend on java-gcj-compat-dev instead of kaffe.
+    + Depend on java-gcj-compat instead of kaffe.
+    + Update standards version.
+    + Move debhelper and cdbs to Build-Depends.
+  * debian/rules:
+    + Use java-gcj to build.
+    + Use DEB_UPSTREAM_VERSION instead of parsing the changelog.
+    + Add get-orig-source rule.
+    + Don't compress examples.
+  * debian/patches/01_build_xml.patch:
+    + Removed, since not necessary with java-gcj.
   
- -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Thu, 20 Sep 2007 20:21:34 +0530
+ -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Thu, 08 Nov 2007 22:58:49 +0530
 
 jcifs (1.2.7-1) unstable; urgency=low
 

Modified: trunk/jcifs/debian/control
===================================================================
--- trunk/jcifs/debian/control	2007-11-12 00:44:40 UTC (rev 4726)
+++ trunk/jcifs/debian/control	2007-11-12 01:17:01 UTC (rev 4727)
@@ -2,17 +2,18 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, libservlet2.3-java, ant, kaffe
-Standards-Version: 3.6.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jcifs
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jcifs
+Uploaders: Kumar Appaiah <akumar at ee.iitm.ac.in>, Varun Hiremath <varunhiremath at gmail.com>
+Build-Depends: debhelper (>= 5), cdbs
+Build-Depends-Indep: libservlet2.3-java, ant, java-gcj-compat-dev
+Standards-Version: 3.7.2
+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
 Section: libs
 Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime
+Depends: java-gcj-compat | java1-runtime | java2-runtime
 Suggests: java-virtual-machine, libjcifs-java-doc
 Description: java library for the CIFS/SMB networking protocol
  JCIFS is an Open Source client library that implements the CIFS/SMB
@@ -24,5 +25,9 @@
 Architecture: all
 Suggests: libjcifs-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 ...).
+ .
  The documentation includes the javadoc API as well as
  the html manual and several examples.

Modified: trunk/jcifs/debian/copyright
===================================================================
--- trunk/jcifs/debian/copyright	2007-11-12 00:44:40 UTC (rev 4726)
+++ trunk/jcifs/debian/copyright	2007-11-12 01:17:01 UTC (rev 4727)
@@ -3,23 +3,83 @@
 
 It was downloaded from <http://jcifs.samba.org>
 
-Copyright:
+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: various
+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:
 
-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 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.
+   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.
 
-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'.
+Public License can be found in `/usr/share/common-licenses/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.

Added: trunk/jcifs/debian/libjcifs-java.examples
===================================================================
--- trunk/jcifs/debian/libjcifs-java.examples	                        (rev 0)
+++ trunk/jcifs/debian/libjcifs-java.examples	2007-11-12 01:17:01 UTC (rev 4727)
@@ -0,0 +1 @@
+examples/*

Added: trunk/jcifs/debian/orig-tar.sh
===================================================================
--- trunk/jcifs/debian/orig-tar.sh	                        (rev 0)
+++ trunk/jcifs/debian/orig-tar.sh	2007-11-12 01:17:01 UTC (rev 4727)
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+TAR=../jcifs-$2.tgz
+DIR=jcifs-$2.orig
+
+# clean up the upstream tarball
+tar zxf $TAR
+rm -f $3 $TAR
+mv jcifs_$2 $DIR
+GZIP=--best tar czf $3 --exclude docs/api --exclude *.jar --exclude *.class --exclude examples/Format.java $DIR
+rm -rf $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+    . .svn/deb-layout
+    mv $3 $origDir
+    echo "moved $3 to $origDir"
+fi
+
+exit 0


Property changes on: trunk/jcifs/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
   + *

Deleted: trunk/jcifs/debian/patches/01_build_xml.patch
===================================================================
--- trunk/jcifs/debian/patches/01_build_xml.patch	2007-11-12 00:44:40 UTC (rev 4726)
+++ trunk/jcifs/debian/patches/01_build_xml.patch	2007-11-12 01:17:01 UTC (rev 4727)
@@ -1,11 +0,0 @@
---- build.xml.orig	2005-09-11 17:16:07.000000000 +0200
-+++ build.xml	2005-09-11 17:16:30.000000000 +0200
-@@ -47,7 +47,7 @@
- 
-     <target name="compile" depends="dependencies">
-         <mkdir dir="build"/>
--        <javac srcdir="src" destdir="build" debug="on"/>
-+        <javac srcdir="src" destdir="build" debug="on" target="1.3"/>
-         <copy file="src/jcifs/util/mime.map" tofile="build/jcifs/util/mime.map" overwrite="yes"/>
-         <copy file="src/jcifs/http/ne.css" tofile="build/jcifs/http/ne.css" overwrite="yes"/>
-     </target>

Modified: trunk/jcifs/debian/rules
===================================================================
--- trunk/jcifs/debian/rules	2007-11-12 00:44:40 UTC (rev 4726)
+++ trunk/jcifs/debian/rules	2007-11-12 01:17:01 UTC (rev 4727)
@@ -5,21 +5,25 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-export UPSTREAM_VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
-
-JAVA_HOME := /usr/lib/kaffe
+JAVA_HOME := /usr/lib/jvm/java-gcj
 ANT_HOME := /usr/share/ant
 
 DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar servlet-2.3.jar
 DEB_ANT_BUILD_TARGET := jar javadoc
 DEB_ANT_CLEAN_TARGET := clean
+DEB_COMPRESS_EXCLUDE := *.c *.java
 
 clean::
-	-rm -Rf docs/api
-	-rm *.jar
+	-$(RM) *.jar
+	-$(RM) -Rf docs/api
 
 install/libjcifs-java::
 	# remove empty generated package-lists
-	-rm -f docs/api/package-list
-	install -m 644 jcifs-$(UPSTREAM_VERSION).jar debian/libjcifs-java/usr/share/java/jcifs-$(UPSTREAM_VERSION).jar
-	ln -s jcifs-$(UPSTREAM_VERSION).jar debian/libjcifs-java/usr/share/java/jcifs.jar
+	-$(RM) -f docs/api/package-list
+	install -m 644 jcifs-$(DEB_UPSTREAM_VERSION).jar debian/libjcifs-java/usr/share/java/jcifs-$(DEB_UPSTREAM_VERSION).jar
+	ln -s jcifs-$(DEB_UPSTREAM_VERSION).jar debian/libjcifs-java/usr/share/java/jcifs.jar
+
+.PHONY: get-orig-source
+
+get-orig-source:
+	-uscan --upstream-version 0

More information about the pkg-java-commits mailing list