[pkg-java] r10452 - in trunk/libjboss-remoting-java/debian: . patches

Luke Cycon lcycon-guest at alioth.debian.org
Thu Sep 17 22:47:37 UTC 2009 

Author: lcycon-guest
Date: 2009-09-17 22:47:37 +0000 (Thu, 17 Sep 2009)
New Revision: 10452

Added:
   trunk/libjboss-remoting-java/debian/README.source
   trunk/libjboss-remoting-java/debian/patches/tomcat6-fix.diff
Removed:
   trunk/libjboss-remoting-java/debian/README.Debian-source
Modified:
   trunk/libjboss-remoting-java/debian/changelog
   trunk/libjboss-remoting-java/debian/control
   trunk/libjboss-remoting-java/debian/copyright
   trunk/libjboss-remoting-java/debian/patches/concurrent.diff
   trunk/libjboss-remoting-java/debian/patches/series
Log:
* Bump Standards-Version to 3.8.3
 - Added debian/README.source (Including debian/README.Debian-source)
 - Updated debian copyright in debian/copyright
* Change package section to java
* New patch tomcat6-fix.diff (Closes: #534134)
 - Fix problems created by API mixup/change
* Added patch descriptions to both current patches
* Added myself to uploaders

Deleted: trunk/libjboss-remoting-java/debian/README.Debian-source
===================================================================
--- trunk/libjboss-remoting-java/debian/README.Debian-source	2009-09-17 21:14:18 UTC (rev 10451)
+++ trunk/libjboss-remoting-java/debian/README.Debian-source	2009-09-17 22:47:37 UTC (rev 10452)
@@ -1,13 +0,0 @@
-libjboss-remoting-java
-======================
-
-The upstream supplied source package contains binary jar files.
-Currently no clean source distribution exists. Therefore, the upstream
-sources were modified to comply with the Debian Free Software
-Guidelines.
-
-Use the rules/get-orig-source target to create the orig.tar.gz.
-For more details on repackaging of upstream sources please see the 
-debian/orig-tar.sh file.
-
- -- Varun Hiremath <varunhiremath at gmail.com>, Fri,  2 Nov 2007 12:04:42 +0530

Added: trunk/libjboss-remoting-java/debian/README.source
===================================================================
--- trunk/libjboss-remoting-java/debian/README.source	                        (rev 0)
+++ trunk/libjboss-remoting-java/debian/README.source	2009-09-17 22:47:37 UTC (rev 10452)
@@ -0,0 +1,69 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
+
+libjboss-remoting-java
+======================
+
+The upstream supplied source package contains binary jar files.
+Currently no clean source distribution exists. Therefore, the upstream
+sources were modified to comply with the Debian Free Software
+Guidelines.
+
+Use the rules/get-orig-source target to create the orig.tar.gz.
+For more details on repackaging of upstream sources please see the 
+debian/orig-tar.sh file.


Property changes on: trunk/libjboss-remoting-java/debian/README.source
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/libjboss-remoting-java/debian/changelog
===================================================================
--- trunk/libjboss-remoting-java/debian/changelog	2009-09-17 21:14:18 UTC (rev 10451)
+++ trunk/libjboss-remoting-java/debian/changelog	2009-09-17 22:47:37 UTC (rev 10452)
@@ -1,6 +1,17 @@
 libjboss-remoting-java (2.5.1-1) unstable; urgency=low
 
-  UNRELEASED
+  [ Luke Cycon ]
+  * Bump Standards-Version to 3.8.3
+   - Added debian/README.source (Including debian/README.Debian-source)
+   - Updated debian copyright in debian/copyright
+  * Change package section to java
+  * New patch tomcat6-fix.diff (Closes: #534134)
+   - Fix problems created by API mixup/change
+  * Added patch descriptions to both current patches
+  * Added myself to uploaders
+
+  [ Torsten Werner ]
+    UNRELEASED
   * New upstream release
   * Refresh patch concurrent.diff.
   * Lock debian/watch to version 2.x because 3.x is still beta.
@@ -8,7 +19,7 @@
   * Disable compiler warnings.
   * Switch to default-java.
 
- -- Torsten Werner <twerner at debian.org>  Sun, 23 Aug 2009 22:48:02 +0200
+ -- Luke Cycon <lcycon at gmail.com>  Tue, 15 Sep 2009 18:21:15 -0700
 
 libjboss-remoting-java (2.4.0.SP1+dak1-1) unstable; urgency=low
 

Modified: trunk/libjboss-remoting-java/debian/control
===================================================================
--- trunk/libjboss-remoting-java/debian/control	2009-09-17 21:14:18 UTC (rev 10451)
+++ trunk/libjboss-remoting-java/debian/control	2009-09-17 22:47:37 UTC (rev 10452)
@@ -1,13 +1,13 @@
 Source: libjboss-remoting-java
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
+Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>, Luke Cycon <lcycon at gmail.com>
 Build-Depends: cdbs, debhelper (>= 5), quilt
 Build-Depends-Indep: ant, default-jdk, libtomcat6-java, libjboss-common-java,
  libjboss-serialization-java, libservlet2.5-java, libjboss-jmx-java, liblog4j1.2-java,
  libcommons-httpclient-java, libjboss-naming-java, libconcurrent-java
-Standards-Version: 3.8.0
+Standards-Version: 3.8.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/copyright
===================================================================
--- trunk/libjboss-remoting-java/debian/copyright	2009-09-17 21:14:18 UTC (rev 10451)
+++ trunk/libjboss-remoting-java/debian/copyright	2009-09-17 22:47:37 UTC (rev 10452)
@@ -82,5 +82,5 @@
     OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-The Debian packaging is (C) 2007, Varun Hiremath <varunhiremath at gmail.com> and
+The Debian packaging is copyright (C) 2007, Varun Hiremath <varunhiremath at gmail.com> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

Modified: trunk/libjboss-remoting-java/debian/patches/concurrent.diff
===================================================================
--- trunk/libjboss-remoting-java/debian/patches/concurrent.diff	2009-09-17 21:14:18 UTC (rev 10451)
+++ trunk/libjboss-remoting-java/debian/patches/concurrent.diff	2009-09-17 22:47:37 UTC (rev 10452)
@@ -1,3 +1,4 @@
+A patch to transition to the official Java concurrent packages
 Index: libjboss-remoting-java-2.5.1/src/org/jboss/remoting/LeasePinger.java
 ===================================================================
 --- libjboss-remoting-java-2.5.1.orig/src/org/jboss/remoting/LeasePinger.java	2009-06-15 21:03:16.000000000 +0200

Modified: trunk/libjboss-remoting-java/debian/patches/series
===================================================================
--- trunk/libjboss-remoting-java/debian/patches/series	2009-09-17 21:14:18 UTC (rev 10451)
+++ trunk/libjboss-remoting-java/debian/patches/series	2009-09-17 22:47:37 UTC (rev 10452)
@@ -1 +1,2 @@
 concurrent.diff
+tomcat6-fix.diff

Added: trunk/libjboss-remoting-java/debian/patches/tomcat6-fix.diff
===================================================================
--- trunk/libjboss-remoting-java/debian/patches/tomcat6-fix.diff	                        (rev 0)
+++ trunk/libjboss-remoting-java/debian/patches/tomcat6-fix.diff	2009-09-17 22:47:37 UTC (rev 10452)
@@ -0,0 +1,16 @@
+A patch by to fix compile errors caused by a tomcat API update
+Patch by Luke Cycon <lcycon at gmail.com>
+--- a/src/org/jboss/remoting/transport/coyote/OutputBuffer.java
++++ b/src/org/jboss/remoting/transport/coyote/OutputBuffer.java
+@@ -607,8 +607,9 @@
+ 
+       // The following has been updated to conform to jbossweb 2.1.
+       cb.setChars(c, off, len);
+-      while (cb.getLength() > 0) { 
+-          conv.convert(cb, bb);
++      while (cb.getLength() > 0) {
++	  conv.setByteChunk(bb);
++	  conv.convert(cb.getChars(), 0, cb.getLength());
+           if (cb.getLength() > 0) {
+               bb.flushBuffer();
+           }


Property changes on: trunk/libjboss-remoting-java/debian/patches/tomcat6-fix.diff
___________________________________________________________________
Added: svn:executable
   + *

More information about the pkg-java-commits mailing list