[pkg-java] r10909 - trunk/libgroboutils-java/debian

Damien Raude-Morvan drazzib at alioth.debian.org
Mon Oct 26 00:02:14 UTC 2009


Author: drazzib
Date: 2009-10-26 00:01:55 +0000 (Mon, 26 Oct 2009)
New Revision: 10909

Added:
   trunk/libgroboutils-java/debian/orig-tar.exclude
   trunk/libgroboutils-java/debian/orig-tar.sh
Modified:
   trunk/libgroboutils-java/debian/control
   trunk/libgroboutils-java/debian/copyright
   trunk/libgroboutils-java/debian/libgroboutils-java.install
   trunk/libgroboutils-java/debian/rules
   trunk/libgroboutils-java/debian/watch
Log:
Fix copyright and cleanup orig tarball

Modified: trunk/libgroboutils-java/debian/control
===================================================================
--- trunk/libgroboutils-java/debian/control	2009-10-25 21:02:58 UTC (rev 10908)
+++ trunk/libgroboutils-java/debian/control	2009-10-26 00:01:55 UTC (rev 10909)
@@ -2,8 +2,9 @@
 Section: java
 Priority: optional
 Maintainer: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk, quilt
-Build-Depends-Indep: ant-optional, junit4 (>= 4.5), liblog4j1.2-java, libeasymock-java, libbcel-java
+Build-Depends: libgroboutils-java, ant, cdbs, debhelper (>= 7), default-jdk, quilt
+Build-Depends-Indep: ant-optional, junit4 (>= 4.5), liblog4j1.2-java,
+ libeasymock-java, libbcel-java
 Standards-Version: 3.8.3
 Homepage: http://groboutils.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libgroboutils-java/

Modified: trunk/libgroboutils-java/debian/copyright
===================================================================
--- trunk/libgroboutils-java/debian/copyright	2009-10-25 21:02:58 UTC (rev 10908)
+++ trunk/libgroboutils-java/debian/copyright	2009-10-26 00:01:55 UTC (rev 10909)
@@ -1,47 +1,81 @@
-This package was debianized by Damien Raude-Morvan <drazzib at debian.org> on
-Mon, 23 Mar 2009 15:04:25 +0100.
+Name: GroboUtils
+Maintainer: Matt Albrech <groboclown at users.sourceforge.net>,
+  Keith Johnston <kjohnston at users.sourceforge.net>
+Source: http://groboutils.sourceforge.net/downloads.html
 
-It was downloaded from <http://groboutils.sourceforge.net/downloads.html>
+Files: *
+Copyright: Copyright (C) 2002-2003 Matt Albrecht
+Licence: BSD
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
 
-Upstream Authors:
-    Matt Albrech <groboclown at users.sourceforge.net>
-    Keith Johnston <kjohnston at users.sourceforge.net>
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
 
-Copyright:
-    Copyright (C) 2002-2003 Matt Albrecht
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
 
-License:
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
+Files: codecoverage/sources/dev/net/sourceforge/groboutils/codecoverage/v2/ant/zip/*
+Copyright: Copyright 2001,2004 The Apache Software Foundation
+Licence: Apache-2.0
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+ 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
+ On Debian systems the full text of the Apache License, Version 2.0
+ License can be found in the `/usr/share/common-licenses/Apache-2.0'
+ file.
 
 
-License change:
+Files: codecoverage/sources/ut/net/sourceforge/groboutils/codecoverage/v2/IAnalysisModuleUTestI.java,
+ codecoverage/sources/ut/net/sourceforge/groboutils/codecoverage/v2/IChannelLoggerUTestI.java,
+ codecoverage/sources/ut/net/sourceforge/groboutils/codecoverage/v2/IChannelLogReaderUTestI.java,
+ codecoverage/sources/ut/net/sourceforge/groboutils/codecoverage/v2/IChannelLoggerFactoryUTestI.java,
+ codecoverage/sources/ut/net/sourceforge/groboutils/codecoverage/v2/IChannelLogRecordUTestI.java,
+ codecoverage/sources/ut/net/sourceforge/groboutils/codecoverage/v2/IClassChannelLogReaderUTestI.java,
+ util-io/sources/dev/net/sourceforge/groboutils/util/io/v1/MimeOutputStream.java,
+ util-io/sources/dev/net/sourceforge/groboutils/util/io/v1/MimeInputStream.java
+Copyright: Copyright (C) 2002-2003 Matt Albrecht
+Licence: LGPL-2.1
+   This program 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 program 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 program; if not, write to the Free Software Foundation, Inc.
+   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-  Originally, GroboUtils was released under the LGPL. However, due to hard-to-read
-  language included in the LGPL, and many people's concerns over the possible viral
-  nature of the LGPL (and the Free Software Foundation's comments that covering Java
-  code under the LGPL is the same as putting it under the GPL), the author moved the
-  license over to the MIT license on February 10, 2003. 
+ On Debian systems the full text of the GNU Library General
+ License can be found in the `/usr/share/common-licenses/LGPL-2'
+ file.
 
-  Matt Albrech <groboclown at users.sourceforge.net>
-
-
-The Debian packaging is:
-    Copyright (C) 2009 Damien Raude-Morvan <drazzib at debian.org>
-and is licensed under BSD licence,
-see `/usr/share/common-licenses/BSD'.
+Files: debian/*
+Copyright: 2009, Damien Raude-Morvan <drazzib at debian.org>
+License: BSD
+   Copying and distribution of this package, with or without
+   modification, are permitted in any medium without royalty
+   provided the copyright notice and this notice are
+   preserved.

Modified: trunk/libgroboutils-java/debian/libgroboutils-java.install
===================================================================
--- trunk/libgroboutils-java/debian/libgroboutils-java.install	2009-10-25 21:02:58 UTC (rev 10908)
+++ trunk/libgroboutils-java/debian/libgroboutils-java.install	2009-10-26 00:01:55 UTC (rev 10909)
@@ -11,5 +11,7 @@
 util-classes/groboutils-classes-1.0.0-core.jar /usr/share/java
 
 codecoverage/groboutils-codecoverage-1.1.0-core.jar /usr/share/java
+codecoverage/groboutils-codecoverage-1.1.0-ant.jar /usr/share/java
+codecoverage/groboutils-codecoverage-1.1.0-runtime.jar /usr/share/java
 pmti/groboutils-pmti-1.0.0alpha3-core.jar /usr/share/java
 uicapture/groboutils-uicapture-1.0.0alpha2-core.jar /usr/share/java

Added: trunk/libgroboutils-java/debian/orig-tar.exclude
===================================================================
--- trunk/libgroboutils-java/debian/orig-tar.exclude	                        (rev 0)
+++ trunk/libgroboutils-java/debian/orig-tar.exclude	2009-10-26 00:01:55 UTC (rev 10909)
@@ -0,0 +1,12 @@
+# License ?
+website/import/Belief.jar
+codecoverage/sources/example1/*
+codecoverage/sources/example2/*
+testing-junit/sources/iut/net/sourceforge/groboutils/junit/v1/iftc/Sample*
+# Binary ?
+_shared/bootstrap/*
+# Cruft ?
+_shared/3rdparty/ant/1.6beta/bin/*
+_shared/3rdparty/ant/1.6beta/etc/*
+out.log
+*.old

Added: trunk/libgroboutils-java/debian/orig-tar.sh
===================================================================
--- trunk/libgroboutils-java/debian/orig-tar.sh	                        (rev 0)
+++ trunk/libgroboutils-java/debian/orig-tar.sh	2009-10-26 00:01:55 UTC (rev 10909)
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+# $2 = version
+# $3 = file
+DIR=libgroboutils-java-$2.orig
+TAR=libgroboutils-java_$2.orig.tar.gz
+
+# clean up the upstream tarball
+mkdir $DIR
+tar -C $DIR -z -x -f $3
+GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR
+rm -rf $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+  . .svn/deb-layout
+  mv $TAR $origDir
+  echo "moved $TAR to $origDir"
+fi


Property changes on: trunk/libgroboutils-java/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/libgroboutils-java/debian/rules
===================================================================
--- trunk/libgroboutils-java/debian/rules	2009-10-25 21:02:58 UTC (rev 10908)
+++ trunk/libgroboutils-java/debian/rules	2009-10-26 00:01:55 UTC (rev 10909)
@@ -7,7 +7,10 @@
 JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME := /usr/share/ant
 
-DEB_JARS := ant-junit junit4 ant-nodeps log4j-1.2 easymock ant-trax bcel ant-apache-bcel
+DEB_JARS := groboutils-testingautodoc-core groboutils-codecoverage-runtime \
+            groboutils-codecoverage-core groboutils-codecoverage-ant \
+            junit4 log4j-1.2 easymock bcel \
+            ant-apache-bcel ant-junit ant-nodeps ant-trax
 
 DEB_ANT_BUILD_TARGET := main
 DEB_ANT_CHECK_TARGET := test-all
@@ -18,7 +21,7 @@
 binary-post-install/libgroboutils-java::
 	for jar in $(ALL_JARS); do \
 		BASE_NAME=`basename $$jar`; \
-		CLEAN_NAME=`basename $$jar -core.jar | cut -d '-' -f '1,2'`; \
+		CLEAN_NAME=`basename $$jar .jar | cut -d '-' -f '1,2,4'`; \
 		dh_link usr/share/java/$$BASE_NAME usr/share/java/$$CLEAN_NAME.jar; \
 	done
 

Modified: trunk/libgroboutils-java/debian/watch
===================================================================
--- trunk/libgroboutils-java/debian/watch	2009-10-25 21:02:58 UTC (rev 10908)
+++ trunk/libgroboutils-java/debian/watch	2009-10-26 00:01:55 UTC (rev 10909)
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/groboutils/GroboUtils-(.*)-src\.tar\.gz
+http://sf.net/groboutils/GroboUtils-(.*)-src\.tar\.gz debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list