[pkg-java] r11565 - in trunk/libjdic-java/debian: . patches source

[Varun Hiremath]

Author: varun
Date: 2010-02-11 20:55:42 +0000 (Thu, 11 Feb 2010)
New Revision: 11565

Added:
   trunk/libjdic-java/debian/source/
   trunk/libjdic-java/debian/source/format
Modified:
   trunk/libjdic-java/debian/changelog
   trunk/libjdic-java/debian/compat
   trunk/libjdic-java/debian/control
   trunk/libjdic-java/debian/patches/Tray.diff
   trunk/libjdic-java/debian/rules
Log:
* Update patches/Tray.diff, add support for Renesas SH(sh4), thanks
  to Nobuhiro Iwamatsu <iwamatsu at nigauri.org> (Closes: #568965)
* Switch to source format 3.0

Modified: trunk/libjdic-java/debian/changelog
===================================================================
--- trunk/libjdic-java/debian/changelog	2010-02-11 20:54:07 UTC (rev 11564)
+++ trunk/libjdic-java/debian/changelog	2010-02-11 20:55:42 UTC (rev 11565)
@@ -1,3 +1,11 @@
+libjdic-java (0.9.5-7) unstable; urgency=low
+
+  * Update patches/Tray.diff, add support for Renesas SH(sh4), thanks
+    to Nobuhiro Iwamatsu <iwamatsu at nigauri.org> (Closes: #568965)
+  * Switch to source format 3.0
+
+ -- Varun Hiremath <varun at debian.org>  Thu, 11 Feb 2010 15:49:53 -0500
+
 libjdic-java (0.9.5-6) unstable; urgency=low
 
   * debian/rules: Set GECKO_SDK to version 1.9.1 (Closes: #551219)

Modified: trunk/libjdic-java/debian/compat
===================================================================
--- trunk/libjdic-java/debian/compat	2010-02-11 20:54:07 UTC (rev 11564)
+++ trunk/libjdic-java/debian/compat	2010-02-11 20:55:42 UTC (rev 11565)
@@ -1 +1 @@
-5
+7

Modified: trunk/libjdic-java/debian/control
===================================================================
--- trunk/libjdic-java/debian/control	2010-02-11 20:54:07 UTC (rev 11564)
+++ trunk/libjdic-java/debian/control	2010-02-11 20:55:42 UTC (rev 11565)
@@ -3,10 +3,10 @@
 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>
-Build-Depends: cdbs, debhelper (>= 5), quilt, ant, pkg-config,
+Build-Depends: cdbs, debhelper (>= 7), ant, pkg-config,
  libgnome2-dev, libgtk2.0-dev, libxt-dev, xulrunner-dev, libx11-dev,
  openjdk-6-jre-headless, openjdk-6-jdk, libnetx-java
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: https://jdic.dev.java.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjdic-java/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/libjdic-java/

Modified: trunk/libjdic-java/debian/patches/Tray.diff
===================================================================
--- trunk/libjdic-java/debian/patches/Tray.diff	2010-02-11 20:54:07 UTC (rev 11564)
+++ trunk/libjdic-java/debian/patches/Tray.diff	2010-02-11 20:55:42 UTC (rev 11565)
@@ -1,8 +1,6 @@
-Index: libjdic-java-0.9.5/jdic/src/unix/native/jni/Tray.c
-===================================================================
---- libjdic-java-0.9.5.orig/jdic/src/unix/native/jni/Tray.c	2005-01-08 21:57:21.000000000 -0500
-+++ libjdic-java-0.9.5/jdic/src/unix/native/jni/Tray.c	2009-08-10 01:52:43.000000000 -0400
-@@ -74,7 +74,29 @@
+--- a/jdic/src/unix/native/jni/Tray.c	2010-01-09 10:31:24.000000000 +0000
++++ b/jdic/src/unix/native/jni/Tray.c	2010-01-09 10:34:50.000000000 +0000
+@@ -74,7 +74,31 @@
  static void *awtHandle = NULL;
  
  #ifdef __linux__
@@ -27,13 +25,15 @@
 +#    define LIBARCH "sparc"
 +#  elif defined(__s390__)
 +#    define LIBARCH "s390"
++#  elif defined(__sh__)
++#    define LIBARCH "sh"
 +#  else
 +#    error "Unknown arch, please edit "__FILE__
 +#  endif
  #else
  #ifdef __i386
  #define LIBARCH "i386"
-@@ -717,7 +739,7 @@
+@@ -717,7 +741,7 @@
      awtHandle = dlopen(awtPath, RTLD_LAZY);
      if (awtHandle == NULL) {
          /* must be JDK try JDK location */

Modified: trunk/libjdic-java/debian/rules
===================================================================
--- trunk/libjdic-java/debian/rules	2010-02-11 20:54:07 UTC (rev 11564)
+++ trunk/libjdic-java/debian/rules	2010-02-11 20:55:42 UTC (rev 11565)
@@ -4,7 +4,6 @@
 export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_COMPRESS_EXCLUDE      := .java .class
 DEB_SHLIBDEPS_INCLUDE     := debian/libjdic-bin/usr/lib/jni

Added: trunk/libjdic-java/debian/source/format
===================================================================
--- trunk/libjdic-java/debian/source/format	                        (rev 0)
+++ trunk/libjdic-java/debian/source/format	2010-02-11 20:55:42 UTC (rev 11565)
@@ -0,0 +1 @@
+3.0 (quilt)