Author: varun Date: 2009-08-10 06:38:41 +0000 (Mon, 10 Aug 2009) New Revision: 9918
Added: trunk/libjdic-java/debian/patches/Tray.diff Modified: trunk/libjdic-java/debian/changelog trunk/libjdic-java/debian/control trunk/libjdic-java/debian/copyright trunk/libjdic-java/debian/patches/series Log: * Add patches/Tray.diff to: - Add support for more architectures - Fix libawt.so load path * debian/control: set Architecture to any for libjdic-bin, attempt to build on all archs Modified: trunk/libjdic-java/debian/changelog =================================================================== --- trunk/libjdic-java/debian/changelog 2009-08-10 04:45:35 UTC (rev 9917) +++ trunk/libjdic-java/debian/changelog 2009-08-10 06:38:41 UTC (rev 9918) @@ -1,3 +1,13 @@ +libjdic-java (0.9.5-4) unstable; urgency=low + + * Add patches/Tray.diff to: + - Add support for more architectures + - Fix libawt.so load path + * debian/control: set Architecture to any for libjdic-bin, attempt + to build on all archs + + -- Varun Hiremath <[email protected]> Mon, 10 Aug 2009 02:00:40 -0400 + libjdic-java (0.9.5-3) unstable; urgency=low * Switch to OpenJDK. Modified: trunk/libjdic-java/debian/control =================================================================== --- trunk/libjdic-java/debian/control 2009-08-10 04:45:35 UTC (rev 9917) +++ trunk/libjdic-java/debian/control 2009-08-10 06:38:41 UTC (rev 9918) @@ -1,12 +1,13 @@ Source: libjdic-java -Section: libs +Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Varun Hiremath <[email protected]>, Torsten Werner <[email protected]> Build-Depends: cdbs, debhelper (>= 5), quilt, ant, pkg-config, - libgnome2-dev, libgtk2.0-dev, libxt-dev, xulrunner-dev, libx11-dev + libgnome2-dev, libgtk2.0-dev, libxt-dev, xulrunner-dev, libx11-dev, + openjdk-6-jre-headless Build-Depends-Indep: openjdk-6-jdk, libnetx-java -Standards-Version: 3.8.0 +Standards-Version: 3.8.2 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/ @@ -30,10 +31,10 @@ type associations, creating JNLP installer packages, etc. Package: libjdic-bin -Architecture: i386 amd64 +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: libjdic-java (= ${source:Version}) -Description: JDesktop Integration Components +Description: JDesktop Integration Components (shared libraries) The JDesktop Integration Components (JDIC) project aims to make Java technology-based applications ("Java applications") first-class citizens of current desktop platforms without sacrificing platform Modified: trunk/libjdic-java/debian/copyright =================================================================== --- trunk/libjdic-java/debian/copyright 2009-08-10 04:45:35 UTC (rev 9917) +++ trunk/libjdic-java/debian/copyright 2009-08-10 06:38:41 UTC (rev 9918) @@ -6,8 +6,8 @@ Upstream Author: Sun Microsystems, Inc. Copyright: -(c) 2004 Sun Microsystems, Inc. All rights reserved. -(c) 2003 mozilla.org +© 2004 Sun Microsystems, Inc. All rights reserved. +© 2003 mozilla.org License: This package is free software; you can redistribute it and/or @@ -97,8 +97,8 @@ Conrad Carlen <[email protected]> Copyright: -Copyright (C) 1998-2002 Netscape Communications Corporation. All Rights Reserved. -Copyright (C) 2001 Christopher Blizzard <[email protected]>. All Rights Reserved. +Copyright © 1998-2002 Netscape Communications Corporation. All Rights Reserved. +Copyright © 2001 Christopher Blizzard <[email protected]>. All Rights Reserved. License: The following files are tri licensed in MPL 1.1 | GPL 2.0 | LGPL 2.1: @@ -219,7 +219,7 @@ sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof). - (c) the licenses granted in this Section 2.1(a) and (b) are + © the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License. @@ -249,7 +249,7 @@ Modifications made by that Contributor with its Contributor Version (or portions of such combination). - (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + © the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code. @@ -323,7 +323,7 @@ are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. - (c) Representations. + © Representations. Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or @@ -570,7 +570,7 @@ The Original Code is ______________________________________. The Initial Developer of the Original Code is ________________________. - Portions created by ______________________ are Copyright (C) ______ + Portions created by ______________________ are Copyright © ______ _______________________. All Rights Reserved. Contributor(s): ______________________________________. @@ -652,7 +652,7 @@ VI. Litigation. Notwithstanding the limitations of Section 11 above, the - provisions regarding litigation in Section 11(a), (b) and (c) of + provisions regarding litigation in Section 11(a), (b) and © of the License shall apply to all disputes relating to this License. EXHIBIT A-Netscape Public License. @@ -672,7 +672,7 @@ The Initial Developer of the Original Code is Netscape Communications Corporation. Portions created by Netscape are - Copyright (C) 1998-1999 Netscape Communications Corporation. All + Copyright © 1998-1999 Netscape Communications Corporation. All Rights Reserved. Contributor(s): ______________________________________. @@ -691,5 +691,5 @@ ----- -The Debian packaging is (C) 2007, Varun Hiremath <[email protected]> and +The Debian packaging is © 2007, Varun Hiremath <[email protected]> and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. Added: trunk/libjdic-java/debian/patches/Tray.diff =================================================================== --- trunk/libjdic-java/debian/patches/Tray.diff (rev 0) +++ trunk/libjdic-java/debian/patches/Tray.diff 2009-08-10 06:38:41 UTC (rev 9918) @@ -0,0 +1,44 @@ +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 @@ + static void *awtHandle = NULL; + + #ifdef __linux__ +-#define LIBARCH "i386" ++# if defined(__x86_64__) ++# define LIBARCH "amd64" ++# elif defined(__i386__) ++# define LIBARCH "i386" ++# elif defined(__alpha__) ++# define LIBARCH "alpha" ++# elif defined(__ia64__) ++# define LIBARCH "ia64" ++# elif defined(__arm__) ++# define LIBARCH "arm" ++# elif defined(__mips__) ++# define LIBARCH "mips" ++# elif defined(__MIPSEL__) ++# define LIBARCH "mipsel" ++# elif defined(__powerpc__) ++# define LIBARCH "ppc" ++# elif defined(__sparc__) ++# define LIBARCH "sparc" ++# elif defined(__s390__) ++# define LIBARCH "s390" ++# else ++# error "Unknown arch, please edit "__FILE__ ++# endif + #else + #ifdef __i386 + #define LIBARCH "i386" +@@ -717,7 +739,7 @@ + awtHandle = dlopen(awtPath, RTLD_LAZY); + if (awtHandle == NULL) { + /* must be JDK try JDK location */ +- sprintf(awtPath,"%s/jre/lib/%s/libawt.so",java_home, LIBARCH); ++ sprintf(awtPath,"%s/lib/%s/libawt.so",java_home, LIBARCH); + dprintf("JDK - %s\n",awtPath); + awtHandle = dlopen(awtPath, RTLD_LAZY); + Property changes on: trunk/libjdic-java/debian/patches/Tray.diff ___________________________________________________________________ Added: svn:mergeinfo + Modified: trunk/libjdic-java/debian/patches/series =================================================================== --- trunk/libjdic-java/debian/patches/series 2009-08-10 04:45:35 UTC (rev 9917) +++ trunk/libjdic-java/debian/patches/series 2009-08-10 06:38:41 UTC (rev 9918) @@ -1,3 +1,4 @@ +Tray.diff jnlp.diff demos_README.diff build.diff _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
