Author: varun
Date: 2008-03-19 10:08:50 +0000 (Wed, 19 Mar 2008)
New Revision: 6008

Modified:
   trunk/libjboss-remoting-java/debian/changelog
   trunk/libjboss-remoting-java/debian/control
   trunk/libjboss-remoting-java/debian/orig-tar.sh
   trunk/libjboss-remoting-java/debian/patches/concurrent.diff
   trunk/libjboss-remoting-java/debian/rules
   trunk/libjboss-remoting-java/debian/watch
Log:
* New upstream release
* Bump Standards-Version to 3.7.3
* Update concurrent.diff patch
* Add libconcurrent-java to Build-Depends
* Update watch file

Modified: trunk/libjboss-remoting-java/debian/changelog
===================================================================
--- trunk/libjboss-remoting-java/debian/changelog       2008-03-19 06:11:56 UTC 
(rev 6007)
+++ trunk/libjboss-remoting-java/debian/changelog       2008-03-19 10:08:50 UTC 
(rev 6008)
@@ -1,3 +1,13 @@
+libjboss-remoting-java (2.4.0~Beta2-1) unstable; urgency=low
+
+  * New upstream release
+  * Bump Standards-Version to 3.7.3
+  * Update concurrent.diff patch
+  * Add libconcurrent-java to Build-Depends
+  * Update watch file
+
+ -- Varun Hiremath <[EMAIL PROTECTED]>  Wed, 19 Mar 2008 15:56:52 +0530
+
 libjboss-remoting-java (2.2.0.GA-2) unstable; urgency=low
 
   * debian/control: Set section to contrib because

Modified: trunk/libjboss-remoting-java/debian/control
===================================================================
--- trunk/libjboss-remoting-java/debian/control 2008-03-19 06:11:56 UTC (rev 
6007)
+++ trunk/libjboss-remoting-java/debian/control 2008-03-19 10:08:50 UTC (rev 
6008)
@@ -2,12 +2,12 @@
 Section: contrib/libs
 Priority: optional
 Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
-Uploaders: Varun Hiremath <[EMAIL PROTECTED]>, Torsten Werner <[EMAIL 
PROTECTED]>
+Uploaders: Varun Hiremath <[EMAIL PROTECTED]>, Torsten Werner <[EMAIL 
PROTECTED]>
 Build-Depends: cdbs, debhelper (>= 5), quilt
 Build-Depends-Indep: ant, java-gcj-compat-dev, libtomcat5.5-java, 
libjboss-common-java,
  libjboss-serialization-java, libservlet2.4-java, libjboss-jmx-java, 
liblog4j1.2-java,
- libcommons-httpclient-java, libjboss-naming-java
-Standards-Version: 3.7.2
+ libcommons-httpclient-java, libjboss-naming-java, libconcurrent-java
+Standards-Version: 3.7.3
 Homepage: http://labs.jboss.com/jbossremoting/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjboss-remoting-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjboss-remoting-java

Modified: trunk/libjboss-remoting-java/debian/orig-tar.sh
===================================================================
--- trunk/libjboss-remoting-java/debian/orig-tar.sh     2008-03-19 06:11:56 UTC 
(rev 6007)
+++ trunk/libjboss-remoting-java/debian/orig-tar.sh     2008-03-19 10:08:50 UTC 
(rev 6008)
@@ -5,10 +5,10 @@
 DIR=libjboss-remoting-java-$2.orig
 
 # clean up the upstream tarball
-unzip $3
-mv JBossRemoting-* $DIR
-tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
-rm -rf $3 $DIR
+mkdir $DIR
+(cd $DIR; unzip ../$3; find -type f|xargs perl -pi -e 's/\r$//g')
+GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
+rm -rf $DIR $3
 
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then

Modified: trunk/libjboss-remoting-java/debian/patches/concurrent.diff
===================================================================
--- trunk/libjboss-remoting-java/debian/patches/concurrent.diff 2008-03-19 
06:11:56 UTC (rev 6007)
+++ trunk/libjboss-remoting-java/debian/patches/concurrent.diff 2008-03-19 
10:08:50 UTC (rev 6008)
@@ -516,25 +516,25 @@
 --- 
libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java
        2007-11-06 09:50:23.000000000 +0100
 +++ 
libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java
     2007-11-06 09:51:41.000000000 +0100
 @@ -1,6 +1,6 @@
- package org.jboss.test.remoting.transport.socket.timeout.idle;
- 
--import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
-+import java.util.concurrent.SynchronizedInt;
- import junit.framework.TestCase;
- import org.apache.log4j.Logger;
- import org.jboss.remoting.Client;
+ package org.jboss.test.remoting.transport.socket.timeout.idle;
+ 
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
++import java.util.concurrent.SynchronizedInt;
+ import junit.framework.TestCase;
+ import org.apache.log4j.Logger;
+ import org.jboss.remoting.Client;
 Index: 
libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java
 ===================================================================
 --- 
libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java
        2007-11-06 09:50:23.000000000 +0100
 +++ 
libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java
     2007-11-06 09:51:43.000000000 +0100
 @@ -1,6 +1,6 @@
- package org.jboss.test.remoting.transport.socket.timeout.idle;
- 
--import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
-+import java.util.concurrent.SynchronizedInt;
- import junit.framework.TestCase;
- import org.apache.log4j.Logger;
- import org.jboss.remoting.Client;
+ package org.jboss.test.remoting.transport.socket.timeout.idle;
+ 
+-import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
++import java.util.concurrent.SynchronizedInt;
+ import junit.framework.TestCase;
+ import org.apache.log4j.Logger;
+ import org.jboss.remoting.Client;
 Index: 
libjboss-remoting-java-2.2.0.GA/tests/org/jboss/test/remoting/util/PortUtilTestCase.java
 ===================================================================
 --- 
libjboss-remoting-java-2.2.0.GA.orig/tests/org/jboss/test/remoting/util/PortUtilTestCase.java
      2007-11-06 09:49:30.000000000 +0100

Modified: trunk/libjboss-remoting-java/debian/rules
===================================================================
--- trunk/libjboss-remoting-java/debian/rules   2008-03-19 06:11:56 UTC (rev 
6007)
+++ trunk/libjboss-remoting-java/debian/rules   2008-03-19 10:08:50 UTC (rev 
6008)
@@ -9,7 +9,7 @@
 DEB_ANT_BUILD_TARGET   := jar
 DEB_ANT_BUILDFILE      := debian/build.xml
 DEB_JARS               := jboss-common log4j-1.2 
$(TOMCAT_LIB_DIR)/tomcat-coyote $(TOMCAT_LIB_DIR)/tomcat-util \
-                          commons-httpclient servlet-api jboss-serialization 
jboss-jmx jnpserver
+                          commons-httpclient servlet-api jboss-serialization 
jboss-jmx jnpserver concurrent
 
 install/libjboss-remoting-java::
        install -m 644 -D jboss-remoting.jar 
$(DEB_DESTDIR)/usr/share/java/jboss-remoting-$(DEB_UPSTREAM_VERSION).jar

Modified: trunk/libjboss-remoting-java/debian/watch
===================================================================
--- trunk/libjboss-remoting-java/debian/watch   2008-03-19 06:11:56 UTC (rev 
6007)
+++ trunk/libjboss-remoting-java/debian/watch   2008-03-19 10:08:50 UTC (rev 
6008)
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/_/./g" \
-http://labs.jboss.com/jbossremoting/ .*JBossRemoting-(.*)\.zip debian 
debian/orig-tar.sh
+opts="uversionmangle=s/_/./g;s/.Beta/~Beta/" \
+http://labs.jboss.com/jbossremoting/ .*jboss-remoting-(.*)\.zip debian 
debian/orig-tar.sh


_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

Reply via email to