[libjgroups-java] 24/38: Preparing for libjgroups-java update.
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Nov 23 12:36:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libjgroups-java.
commit d4cf9a772f0c7064b4b898fd8836a2ae7026dae7
Author: Steffen Möller <moeller at debian.org>
Date: Thu Dec 22 01:00:28 2011 +0000
Preparing for libjgroups-java update.
---
debian/changelog | 8 +++++
debian/compat | 2 +-
debian/control | 2 +-
debian/copyright | 9 +++---
debian/orig-tar.sh | 25 ++++++++++++----
.../0001-define-jg.classpath-before-using-it.patch | 35 ----------------------
debian/patches/series | 1 -
debian/rules | 14 +++++----
8 files changed, 43 insertions(+), 53 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 323517c..2e6d35d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 1fda8ce..0e436d9 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjgroups-java/
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
diff --git a/debian/copyright b/debian/copyright
index 9f129b7..532b8b9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,8 +20,9 @@ Chris Lott <chrislott at spamcop.net>
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 @@ The following files:
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'.
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 0b09314..b032ced 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -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 @@ if [ -r .svn/deb-layout ]; then
mv $TAR $origDir
echo "moved $TAR to $origDir"
fi
+
+
+echo "[OK]"
diff --git a/debian/patches/0001-define-jg.classpath-before-using-it.patch b/debian/patches/0001-define-jg.classpath-before-using-it.patch
deleted file mode 100644
index fe45b9a..0000000
--- a/debian/patches/0001-define-jg.classpath-before-using-it.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Sun, 28 Feb 2010 11:09:15 +0100
-Subject: [PATCH] define jg.classpath before using it
-
----
- build.xml | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index 596e909..20baae7 100644
---- a/build.xml
-+++ b/build.xml
-@@ -41,10 +41,6 @@
- <property name="threadcount" value="false"/>
- <property name="test.verbose" value="0"/>
-
--
-- <taskdef resource="testngtasks" classpathref="jg.classpath"/>
--
--
- <path id="jg.classpath">
- <pathelement location="${compile.dir}"/>
- <pathelement location="${conf.dir}"/>
-@@ -54,6 +50,10 @@
- </fileset>
- </path>
-
-+
-+ <taskdef resource="testngtasks" classpathref="jg.classpath"/>
-+
-+
- <!-- patternsets used to define test sets -->
- <patternset id="flush.tests">
- <include name="org/jgroups/tests/FlushTest*"/>
---
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 58bf356..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-define-jg.classpath-before-using-it.patch
diff --git a/debian/rules b/debian/rules
index ecfc06c..461fc7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,15 @@ DEB_ANT_BUILD_TARGET := jar
#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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjgroups-java.git
More information about the pkg-java-commits
mailing list