[pkg-java] r15576 - trunk/libjgroups-java/debian

Thu Dec 22 01:00:28 UTC 2011

Author: moeller
Date: 2011-12-22 01:00:28 +0000 (Thu, 22 Dec 2011)
New Revision: 15576

Removed:
   trunk/libjgroups-java/debian/patches/
Modified:
   trunk/libjgroups-java/debian/changelog
   trunk/libjgroups-java/debian/compat
   trunk/libjgroups-java/debian/control
   trunk/libjgroups-java/debian/copyright
   trunk/libjgroups-java/debian/orig-tar.sh
   trunk/libjgroups-java/debian/rules
Log:
Preparing for libjgroups-java update.


Modified: trunk/libjgroups-java/debian/changelog
===================================================================

--- trunk/libjgroups-java/debian/changelog	2011-12-21 22:56:23 UTC (rev 15575)
+++ trunk/libjgroups-java/debian/changelog	2011-12-22 01:00:28 UTC (rev 15576)
@@ -1,3 +1,11 @@
+libjgroups-java (2.12.2.Final-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Added Red Hat to copyright list
+  * Patch no longer required
+
+ -- Brian Thomason <brian.thomason at eucalyptus.com>  Tue, 06 Dec 2011 22:43:17 +0000
+
 libjgroups-java (2.7.0.GA-4) unstable; urgency=low
 
   * Team upload.

Modified: trunk/libjgroups-java/debian/compat
===================================================================
--- trunk/libjgroups-java/debian/compat	2011-12-21 22:56:23 UTC (rev 15575)
+++ trunk/libjgroups-java/debian/compat	2011-12-22 01:00:28 UTC (rev 15576)
@@ -1 +1 @@
-5
+7

Modified: trunk/libjgroups-java/debian/control
===================================================================
--- trunk/libjgroups-java/debian/control	2011-12-21 22:56:23 UTC (rev 15575)
+++ trunk/libjgroups-java/debian/control	2011-12-22 01:00:28 UTC (rev 15576)
@@ -14,7 +14,7 @@
 
 Package: libjgroups-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre-headless | java5-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Toolkit for Reliable Multicast Communication
  JGroups is a toolkit for reliable multicast communication.  (Note
  that this doesn't necessarily mean IP Multicast, JGroups can also use

Modified: trunk/libjgroups-java/debian/copyright
===================================================================
--- trunk/libjgroups-java/debian/copyright	2011-12-21 22:56:23 UTC (rev 15575)
+++ trunk/libjgroups-java/debian/copyright	2011-12-22 01:00:28 UTC (rev 15576)
@@ -20,8 +20,9 @@
 Chris Mills <chris.mills at jboss.com>
 
 Copyright:
-(C) 2005 JBoss Inc., Chris Mills <millsy at jboss.com>
-(C) 2002 Filip Hanik and Bela Ban
+Copyright 2006 Red Hat, Inc.
+Copyright 2005 JBoss Inc., Chris Mills <millsy at jboss.com>
+Copyright 2002 Filip Hanik and Bela Ban
 
 License:
   This library is free software; you can redistribute it and/or
@@ -42,10 +43,10 @@
 src/org/jgroups/annotations/GuardedBy.java
 src/org/jgroups/annotations/Immutable.java
 
-Copyright: (c) 2008 Torsten Werner
+Copyright: 2008 Torsten Werner
 
 License: same license as jgroups (LGPL, see above)
 
 -------
-The Debian packaging is (C) 2007, Varun Hiremath <varunhiremath at gmail.com> and
+The Debian packaging is Copyright 2007, Varun Hiremath <varunhiremath at gmail.com> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

Modified: trunk/libjgroups-java/debian/orig-tar.sh
===================================================================
--- trunk/libjgroups-java/debian/orig-tar.sh	2011-12-21 22:56:23 UTC (rev 15575)
+++ trunk/libjgroups-java/debian/orig-tar.sh	2011-12-22 01:00:28 UTC (rev 15576)
@@ -1,17 +1,29 @@
 #!/bin/sh -e
 
 # called by uscan with '--upstream-version' <version> <file>
-TAR=libjgroups-java_$2.orig.tar.gz
-DIR=libjgroups-java-$2.orig
+VER=`echo $2|sed -e 's/\_/\./g'`
+TAR=../libjgroups-java_$VER.orig.tar.gz
+DIR=libjgroups-java-$VER.orig
 
 # clean up the upstream tarball
-unzip $3
-mv JGroups-* $DIR
+if [ -r "$3" ]; then
+	echo "Found existing tarball - presumably from get-orig-soruce/uscan - fixing it"
+	tar xfz $3
+fi
+if find . -type d -a -name "belaban*"; then
+	echo "Renaming belaban* to '$DIR'"
+	mv belaban* $DIR
+fi
 
 # replace CC licensed files by my own simple implementation
 cp -f debian/annotations/* $DIR/src/org/jgroups/annotations/
 
-tar -c -z -f $TAR --exclude '*.jar' --exclude '*/out/*' --exclude '*/lib/*' $DIR
+if GZIP="-9n" tar -c -z -f $TAR --exclude '*.jar' --exclude '*/out/*' --exclude '*/lib/*' $DIR; then
+	echo "Created tar file in '$TAR'."
+else
+	echo "Error packing directory '$DIR' to '$TAR'"
+	exit
+fi
 rm -rf $3 $DIR
 
 # move to directory 'tarballs'
@@ -20,3 +32,6 @@
   mv $TAR $origDir
   echo "moved $TAR to $origDir"
 fi
+
+
+echo "[OK]"

Modified: trunk/libjgroups-java/debian/rules
===================================================================
--- trunk/libjgroups-java/debian/rules	2011-12-21 22:56:23 UTC (rev 15575)
+++ trunk/libjgroups-java/debian/rules	2011-12-22 01:00:28 UTC (rev 15576)
@@ -10,13 +10,15 @@
 #DEB_ANT_CHECK_TARGET := -Djgroups.bind_addr=`hostname` all-tests
 DEB_JARS             := xalan2 serializer junit log4j-1.2 bsh commons-logging bcprov glassfish-javaee ant-junit \
                         testng
-ANT_OPTS	     := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
+ANT_OPTS	     := -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6
 
 install/libjgroups-java::
-	mh_installpom -plibjgroups-java jgroups-pom.xml
-	mh_installjar -plibjgroups-java jgroups-pom.xml -l dist/jgroups-core.jar
-	install -m 644 -D dist/jgroups-all.jar $(DEB_DESTDIR)/usr/share/java/jgroups-all-$(DEB_UPSTREAM_VERSION).jar
-	dh_link /usr/share/java/jgroups-all-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jgroups-all.jar
+	mh_installpom -plibjgroups-java pom.xml
+	mh_installjar -plibjgroups-java pom.xml -l dist/jgroups-2.12.2.Final.jar
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --debug --download-version `echo $(DEB_UPSTREAM_VERSION) | sed -e 's/\./_/g'` --force-download --rename
+
+clean::
+	rm -rf debian/.mh
+	rm -f build.properties


