[pkg-java] r6657 - in trunk/libjdic-java/debian: . patches
varun at alioth.debian.org
varun at alioth.debian.org
Tue Jul 8 21:18:08 UTC 2008
Author: varun
Date: 2008-07-08 21:18:07 +0000 (Tue, 08 Jul 2008)
New Revision: 6657
Added:
trunk/libjdic-java/debian/watch
Modified:
trunk/libjdic-java/debian/README.Debian-source
trunk/libjdic-java/debian/changelog
trunk/libjdic-java/debian/control
trunk/libjdic-java/debian/orig-tar.sh
trunk/libjdic-java/debian/orig.exclude
trunk/libjdic-java/debian/patches/build.diff
trunk/libjdic-java/debian/patches/demos_README.diff
trunk/libjdic-java/debian/patches/jnlp.diff
trunk/libjdic-java/debian/patches/packager.diff
trunk/libjdic-java/debian/rules
Log:
* New upstream release
* Build-Depends: Replace libxul-dev with xulrunner-dev, and
sun-java5-jdk with sun-java6-jdk (Closes: 489498)
* Bump Standards-Version to 3.8.0
* Update all the patches
* Update README.Debian-source file
* Update watch, orig-tar.sh and orig.exclude files
Modified: trunk/libjdic-java/debian/README.Debian-source
===================================================================
--- trunk/libjdic-java/debian/README.Debian-source 2008-07-08 21:09:23 UTC (rev 6656)
+++ trunk/libjdic-java/debian/README.Debian-source 2008-07-08 21:18:07 UTC (rev 6657)
@@ -6,17 +6,8 @@
exists. Therefore, the upstream sources were modified to comply with
the Debian Free Software Guidelines.
-gtkmozembed.h, gtkmozembed_internal.h are removed from the upstream
-sources because they are licensed only under MPL license upstream,
-where as the same files provided by libxul-dev are tri licensed under
-LGPL|GPL|MPL:
-/usr/include/xulrunner/gtkembedmoz/gtkmozembed.h
-/usr/include/xulrunner/gtkembedmoz/gtkmozembed_internal.h
-
-So the files provided by libxul-dev are being used to build the package.
-
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> Mon, 27 Aug 2007 23:44:06 +0530
+ -- Varun Hiremath <varun at debian.org>, Tue, 8 Jul 2008 17:24:34 +0530
Modified: trunk/libjdic-java/debian/changelog
===================================================================
--- trunk/libjdic-java/debian/changelog 2008-07-08 21:09:23 UTC (rev 6656)
+++ trunk/libjdic-java/debian/changelog 2008-07-08 21:18:07 UTC (rev 6657)
@@ -1,3 +1,15 @@
+libjdic-java (0.9.5-1) unstable; urgency=low
+
+ * New upstream release
+ * Build-Depends: Replace libxul-dev with xulrunner-dev, and
+ sun-java5-jdk with sun-java6-jdk (Closes: 489498)
+ * Bump Standards-Version to 3.8.0
+ * Update all the patches
+ * Update README.Debian-source file
+ * Update watch, orig-tar.sh and orig.exclude files
+
+ -- Varun Hiremath <varun at debian.org> Wed, 09 Jul 2008 02:46:41 +0530
+
libjdic-java (0.0.20060613-8) unstable; urgency=low
* libjdic-bin: install JNI libraries into /usr/lib/jni
Modified: trunk/libjdic-java/debian/control
===================================================================
--- trunk/libjdic-java/debian/control 2008-07-08 21:09:23 UTC (rev 6656)
+++ trunk/libjdic-java/debian/control 2008-07-08 21:18:07 UTC (rev 6657)
@@ -4,9 +4,9 @@
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,
- libgnome2-dev, libgtk2.0-dev, libxt-dev, libxul-dev, libx11-dev
-Build-Depends-Indep: sun-java5-jdk, libnetx-java
-Standards-Version: 3.7.3
+ libgnome2-dev, libgtk2.0-dev, libxt-dev, xulrunner-dev, libx11-dev
+Build-Depends-Indep: sun-java6-jdk, libnetx-java
+Standards-Version: 3.8.0
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/
@@ -14,7 +14,7 @@
Package: libjdic-java
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends},
- sun-java5-jre | java1-runtime | java2-runtime, libjdic-bin (>= ${source:Version})
+ sun-java6-jre | java1-runtime | java2-runtime, libjdic-bin (>= ${source:Version})
Description: JDesktop Integration Components
The JDesktop Integration Components (JDIC) project aims to make Java
technology-based applications ("Java applications") first-class
Modified: trunk/libjdic-java/debian/orig-tar.sh
===================================================================
--- trunk/libjdic-java/debian/orig-tar.sh 2008-07-08 21:09:23 UTC (rev 6656)
+++ trunk/libjdic-java/debian/orig-tar.sh 2008-07-08 21:18:07 UTC (rev 6657)
@@ -4,13 +4,15 @@
TAR=../libjdic-java_$1.orig.tar.gz
DIR=libjdic-java-$1.orig
ZIP=jdic-$1-src.zip
+URL=https://jdic.dev.java.net/files/documents/880/98882/
-wget -O $ZIP \
- https://jdic.dev.java.net/files/documents/880/36262/jdic-20060613-src.zip
+wget $URL/$ZIP
# clean up the upstream tarball
unzip $ZIP
-mv src $DIR
+mv jdic-$1-src $DIR
+FILE=classes/org/jdesktop/jdic/init/NativeExtractor.java
+cp $DIR/jdic/src/share_applet/$FILE $DIR/jdic/src/share/$FILE
GZIP=--best tar -c -z -f $TAR -X debian/orig.exclude $DIR
rm -rf $DIR $ZIP
Modified: trunk/libjdic-java/debian/orig.exclude
===================================================================
--- trunk/libjdic-java/debian/orig.exclude 2008-07-08 21:09:23 UTC (rev 6656)
+++ trunk/libjdic-java/debian/orig.exclude 2008-07-08 21:18:07 UTC (rev 6657)
@@ -1,7 +1,7 @@
*CVS*
+*.so
+*.o
*.class
*.jar
*win32*
*incubator*
-*gtkmozembed.h
-*gtkmozembed_internal.h
Modified: trunk/libjdic-java/debian/patches/build.diff
===================================================================
--- trunk/libjdic-java/debian/patches/build.diff 2008-07-08 21:09:23 UTC (rev 6656)
+++ trunk/libjdic-java/debian/patches/build.diff 2008-07-08 21:18:07 UTC (rev 6657)
@@ -1,131 +1,261 @@
-Index: libjdic-java-20060613/packager/build.xml
+Index: libjdic-java-0.9.5/packager/build.xml
===================================================================
---- libjdic-java-20060613.orig/packager/build.xml 2005-08-15 17:06:58.000000000 +0530
-+++ libjdic-java-20060613/packager/build.xml 2007-08-27 00:37:51.000000000 +0530
+--- libjdic-java-0.9.5.orig/packager/build.xml 2007-07-16 17:02:52.000000000 +0530
++++ libjdic-java-0.9.5/packager/build.xml 2008-07-08 18:06:38.000000000 +0530
@@ -43,7 +43,7 @@
-
- <!-- <property name="dist.dir" value="dist" /> -->
-
-- <property name="jar.file" value="packager.jar" />
-+ <property name="jar.file" value="jdic.jar" />
-
- <!-- the distribution version and release of this build -->
- <!-- which is only used in javadoc target -->
-Index: libjdic-java-20060613/jdic/src/unix/native/jni/WebBrowserUtil.cpp
+
+ <!-- <property name="dist.dir" value="dist" /> -->
+
+- <property name="jar.file" value="packager.jar" />
++ <property name="jar.file" value="jdic.jar" />
+
+ <!-- the distribution version and release of this build -->
+ <!-- which is only used in javadoc target -->
+Index: libjdic-java-0.9.5/jdic/src/unix/native/jni/WebBrowserUtil.cpp
===================================================================
---- libjdic-java-20060613.orig/jdic/src/unix/native/jni/WebBrowserUtil.cpp 2005-09-30 13:32:22.000000000 +0530
-+++ libjdic-java-20060613/jdic/src/unix/native/jni/WebBrowserUtil.cpp 2007-08-27 00:37:51.000000000 +0530
+--- libjdic-java-0.9.5.orig/jdic/src/unix/native/jni/WebBrowserUtil.cpp 2005-06-14 08:50:08.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/native/jni/WebBrowserUtil.cpp 2008-07-08 18:06:38.000000000 +0530
@@ -23,6 +23,7 @@
- #include <X11/Xlib.h>
- #include "WebBrowserUtil.h"
- #include <stdlib.h>
-+#include <string.h>
- #include <limits.h>
-
- #include <sys/stat.h>
-Index: libjdic-java-20060613/jdic/src/unix/native/mozilla/Makefile
+ #include <X11/Xlib.h>
+ #include "WebBrowserUtil.h"
+ #include <stdlib.h>
++#include <string.h>
+ #include <limits.h>
+
+ #include <sys/stat.h>
+Index: libjdic-java-0.9.5/jdic/src/unix/native/mozilla/Makefile
===================================================================
---- libjdic-java-20060613.orig/jdic/src/unix/native/mozilla/Makefile 2006-03-08 17:33:18.000000000 +0530
-+++ libjdic-java-20060613/jdic/src/unix/native/mozilla/Makefile 2007-08-27 00:37:51.000000000 +0530
+--- libjdic-java-0.9.5.orig/jdic/src/unix/native/mozilla/Makefile 2005-05-19 14:18:22.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/native/mozilla/Makefile 2008-07-08 18:07:07.000000000 +0530
@@ -47,8 +47,8 @@
- # For Gecko SDK 1.6 or ealier, enable USING_GECKO_SDK_1_4. Or else, enable
- # USING_GECKO_SDK_1_7.
- #
--USING_GECKO_SDK_1_4 = 1
--#USING_GECKO_SDK_1_7 = 1
-+#USING_GECKO_SDK_1_4 = 1
-+USING_GECKO_SDK_1_7 = 1
-
- # set gtk version
- #
-@@ -120,13 +120,13 @@
- endif
-
- ifdef MOZ_ENABLE_GTK
--CPPFLAGS += -DMOZ_WIDGET_GTK
-+CPPFLAGS += -DMOZ_WIDGET_GTK -DXPCOM_GLUE_USE_NSPR
- LIBS += -lgtksuperwin
- LIBS_PROG += -lgtksuperwin
- endif
-
- ifdef MOZ_ENABLE_GTK2
--CPPFLAGS += -DMOZ_WIDGET_GTK2
-+CPPFLAGS += -DMOZ_WIDGET_GTK2 -DXPCOM_GLUE_USE_NSPR
- # XXX need to get these from pkg-config perhaps?
- LIBS += $(XLDFLAGS) $(XLIBS)
- endif
-@@ -156,7 +156,7 @@
- $(NULL)
- LIBS += \
- -L$(GECKO_SDK)/embedstring/bin -lembedstring \
-- -L$(GECKO_SDK)/xpcom/bin -lxpcomglue_s -lxpcom \
-+ -L$(GECKO_SDK)/xpcom/bin -lxpcomglue \
- -L$(GECKO_SDK)/nspr/bin -lnspr4 -lplds4 -lplc4 \
- $(NULL)
- endif
-@@ -165,9 +165,10 @@
- -DUSING_GECKO_SDK_1_7 \
- -include $(GECKO_SDK)/include/mozilla-config.h \
- -I$(GECKO_SDK)/include \
-+ -I/usr/include/xulrunner/gtkembedmoz \
- $(NULL)
- LIBS += \
-- -L$(GECKO_SDK)/lib -lxpcomglue_s \
-+ -L$(GECKO_SDK)/lib -lxpcomglue \
- -L$(GECKO_SDK)/bin -lxpcom -lnspr4 -lplds4 -lplc4 \
- $(NULL)
- endif
-Index: libjdic-java-20060613/jdic/src/unix/native/mozilla/MozEmbed.cpp
+ # For Gecko SDK 1.6 or ealier, enable USING_GECKO_SDK_1_4. Or else, enable
+ # USING_GECKO_SDK_1_7.
+ #
+-USING_GECKO_SDK_1_4 = 1
+-#USING_GECKO_SDK_1_7 = 1
++#USING_GECKO_SDK_1_4 = 1
++USING_GECKO_SDK_1_7 = 1
+
+ # set gtk version
+ #
+@@ -106,7 +106,7 @@
+
+ # link against the version of gtkembedmoz included with a
+ # mozilla distribution
+-LIBS = -L$(MOZILLA_DIST) -lgtkembedmoz
++LIBS = -L$(GECKO_SDK)/lib -lxul -lplds4 -lplc4 -lnspr4 -lpthread -ldl
+
+ # libembedstring.a from the 1.4.2 gecko sdk requires __ctype_tolower,
+ # but for some reason that isn't available from the version of glibc
+@@ -118,16 +118,16 @@
+ endif
+
+ ifdef MOZ_ENABLE_GTK
+-CPPFLAGS += -DMOZ_WIDGET_GTK
++CPPFLAGS += -DMOZ_WIDGET_GTK -DXPCOM_GLUE_USE_NSPR
+ LIBS += -lgtksuperwin
+-LIBS_PROG += -L$(MOZILLA_DIST) -lgtkembedmoz -lxpcom -lgtksuperwin
++LIBS_PROG += -L$(GECKO_SDK)/lib -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl -lgtksuperwin
+ endif
+
+ ifdef MOZ_ENABLE_GTK2
+-CPPFLAGS += -DMOZ_WIDGET_GTK2
++CPPFLAGS += -DMOZ_WIDGET_GTK2 -DXPCOM_GLUE_USE_NSPR
+ # XXX need to get these from pkg-config perhaps?
+ LIBS += $(XLDFLAGS) $(XLIBS)
+-LIBS_PROG += -L$(MOZILLA_DIST) -lgtkembedmoz -lxpcom
++LIBS_PROG += -L$(GECKO_SDK)/lib -lxul -lplds4 -lplc4 -lnspr4 -lpthread -ldl -lxpcom
+ endif
+
+ CPPFLAGS += \
+@@ -153,7 +153,7 @@
+ $(NULL)
+ LIBS += \
+ -L$(GECKO_SDK)/embedstring/bin -lembedstring \
+- -L$(GECKO_SDK)/xpcom/bin -lxpcomglue_s -lxpcom \
++ -L$(GECKO_SDK)/xpcom/bin -lxpcomglue \
+ -L$(GECKO_SDK)/nspr/bin -lnspr4 -lplds4 -lplc4 \
+ $(NULL)
+ endif
+@@ -164,7 +164,7 @@
+ -I$(GECKO_SDK)/include \
+ $(NULL)
+ LIBS += \
+- -L$(GECKO_SDK)/lib -lxpcomglue_s \
++ -L$(GECKO_SDK)/lib -lxpcomglue \
+ -L$(GECKO_SDK)/bin -lxpcom -lnspr4 -lplds4 -lplc4 \
+ $(NULL)
+ endif
+Index: libjdic-java-0.9.5/jdic/src/unix/native/mozilla/MozEmbed.cpp
===================================================================
---- libjdic-java-20060613.orig/jdic/src/unix/native/mozilla/MozEmbed.cpp 2005-08-17 11:19:50.000000000 +0530
-+++ libjdic-java-20060613/jdic/src/unix/native/mozilla/MozEmbed.cpp 2007-08-27 00:37:51.000000000 +0530
+--- libjdic-java-0.9.5.orig/jdic/src/unix/native/mozilla/MozEmbed.cpp 2005-05-19 09:11:22.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/native/mozilla/MozEmbed.cpp 2008-07-08 18:06:38.000000000 +0530
@@ -43,6 +43,7 @@
-
- // These are included from the Gecko SDK
- #include "prenv.h"
-+#include "prlock.h"
- #include "prthread.h"
- #include "nsXPCOM.h"
- #include "nsEmbedString.h"
-Index: libjdic-java-20060613/jdic/src/unix/native/jni/Makefile
+
+ // These are included from the Gecko SDK
+ #include "prenv.h"
++#include "prlock.h"
+ #include "prthread.h"
+ #include "nsXPCOM.h"
+ #include "nsEmbedString.h"
+Index: libjdic-java-0.9.5/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeTrayIconService.java
===================================================================
---- libjdic-java-20060613.orig/jdic/src/unix/native/jni/Makefile 2005-10-14 10:42:22.000000000 +0530
-+++ libjdic-java-20060613/jdic/src/unix/native/jni/Makefile 2007-08-27 00:37:51.000000000 +0530
-@@ -86,7 +86,7 @@
- -L$(JAVA_HOME)/jre/lib/i386 \
- -L$(JAVA_HOME)/jre/lib/amd64 \
- -L$(JAVA_HOME)/jre/lib/ia64 \
-- -ljawt
-+
-
- TRAY_LIBS = -L$(X11LIB) -lXt -lX11
-
-Index: libjdic-java-20060613/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeTrayIconService.java
-===================================================================
---- libjdic-java-20060613.orig/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeTrayIconService.java 2005-06-27 11:42:14.000000000 +0530
-+++ libjdic-java-20060613/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeTrayIconService.java 2007-08-27 00:37:51.000000000 +0530
+--- libjdic-java-0.9.5.orig/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeTrayIconService.java 2005-06-01 09:23:40.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeTrayIconService.java 2008-07-08 18:06:38.000000000 +0530
@@ -66,7 +66,8 @@
-
- initListeners();
-
-- popupMenuParent = new JDialog(frame, "JDIC Tray Icon");
-+ //popupMenuParent = new JDialog(frame, "JDIC Tray Icon");
-+ popupMenuParent = new JDialog();
- popupMenuParent.setUndecorated(true);
- }
-
-Index: libjdic-java-20060613/jdic/src/unix/native/mozilla/MozEmbed.h
+
+ initListeners();
+
+- popupMenuParent = new JDialog(frame, "JDIC Tray Icon");
++ //popupMenuParent = new JDialog(frame, "JDIC Tray Icon");
++ popupMenuParent = new JDialog();
+ popupMenuParent.setUndecorated(true);
+ }
+
+Index: libjdic-java-0.9.5/jdic/build.xml
===================================================================
---- libjdic-java-20060613.orig/jdic/src/unix/native/mozilla/MozEmbed.h 2007-08-27 00:38:25.000000000 +0530
-+++ libjdic-java-20060613/jdic/src/unix/native/mozilla/MozEmbed.h 2007-08-27 00:38:38.000000000 +0530
-@@ -43,8 +43,8 @@
- #include <stdlib.h>
- #include <gdk/gdkx.h>
- #include <gtk/gtk.h>
--#include "gtkmozembed.h"
--#include "gtkmozembed_internal.h"
-+#include <gtkmozembed.h>
-+#include <gtkmozembed_internal.h>
- #include "nsCOMPtr.h"
- #include "nsIWebBrowser.h"
- #include "nsIWebBrowserFocus.h"
+--- libjdic-java-0.9.5.orig/jdic/build.xml 2008-03-13 19:59:19.000000000 +0530
++++ libjdic-java-0.9.5/jdic/build.xml 2008-07-08 18:06:38.000000000 +0530
+@@ -301,8 +301,8 @@
+
+ <!-- !!! As an additional operation, copy defmailer.properties file
+ defining the default mailer location to the same location !!! -->
+- <copy file="${unix.classes.defmailer.dir}/defmailer.properties"
+- todir="${dist.dir}" />
++<!-- <copy file="${unix.classes.defmailer.dir}/defmailer.properties" -->
++<!-- todir="${dist.dir}" /> -->
+ </target>
+
+ <!-- *** Build BSD native JNI code *** -->
+Index: libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIProfileInternal.h
+===================================================================
+--- libjdic-java-0.9.5.orig/jdic/src/share/native/mozilla/nsIProfileInternal.h 2004-10-09 08:10:58.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIProfileInternal.h 2008-07-08 18:06:38.000000000 +0530
+@@ -34,7 +34,7 @@
+ class NS_NO_VTABLE nsIProfileInternal : public nsIProfile {
+ public:
+
+- NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPROFILEINTERNAL_IID)
++ NS_DECLARE_STATIC_IID_ACCESSOR(NS_IPROFILEINTERNAL_IID)
+
+ /**
+ * Starts up the profile manager
+@@ -168,6 +168,8 @@
+
+ };
+
++ NS_DEFINE_STATIC_IID_ACCESSOR(nsIProfileInternal, NS_IPROFILEINTERNAL_IID)
++
+ /* Use this macro when declaring classes that implement this interface. */
+ #define NS_DECL_NSIPROFILEINTERNAL \
+ NS_IMETHOD StartupWithArgs(nsICmdLineService *cmdLine, PRBool canInteract); \
+Index: libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIProfileInternalOld.h
+===================================================================
+--- libjdic-java-0.9.5.orig/jdic/src/share/native/mozilla/nsIProfileInternalOld.h 2004-10-09 08:10:59.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIProfileInternalOld.h 2008-07-08 18:06:38.000000000 +0530
+@@ -49,7 +49,7 @@
+ class NS_NO_VTABLE nsIProfileInternalOld : public nsIProfile {
+ public:
+
+- NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPROFILEINTERNAL_IID)
++ NS_DECLARE_STATIC_IID_ACCESSOR(NS_IPROFILEINTERNAL_IID)
+
+ /**
+ * Starts up the profile manager
+@@ -180,6 +180,8 @@
+
+ };
+
++ NS_DEFINE_STATIC_IID_ACCESSOR(nsIProfileInternalOld, NS_IPROFILEINTERNAL_IID)
++
+ /* Use this macro when declaring classes that implement this interface. */
+ #define NS_DECL_NSIPROFILEINTERNAL \
+ NS_IMETHOD StartupWithArgs(nsICmdLineService *cmdLine, PRBool canInteract); \
+Index: libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIProxiedProtocolHandler.h
+===================================================================
+--- libjdic-java-0.9.5.orig/jdic/src/share/native/mozilla/nsIProxiedProtocolHandler.h 2004-10-09 08:10:59.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIProxiedProtocolHandler.h 2008-07-08 18:06:38.000000000 +0530
+@@ -31,7 +31,7 @@
+ class NS_NO_VTABLE nsIProxiedProtocolHandler : public nsIProtocolHandler {
+ public:
+
+- NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPROXIEDPROTOCOLHANDLER_IID)
++ NS_DECLARE_STATIC_IID_ACCESSOR(NS_IPROXIEDPROTOCOLHANDLER_IID)
+
+ /** Create a new channel with the given proxyInfo
+ *
+@@ -41,6 +41,8 @@
+
+ };
+
++ NS_DEFINE_STATIC_IID_ACCESSOR(nsIProxiedProtocolHandler, NS_IPROXIEDPROTOCOLHANDLER_IID)
++
+ /* Use this macro when declaring classes that implement this interface. */
+ #define NS_DECL_NSIPROXIEDPROTOCOLHANDLER \
+ NS_IMETHOD NewProxiedChannel(nsIURI *uri, nsIProxyInfo *proxyInfo, nsIChannel **_retval);
+Index: libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIHttpProtocolHandler.h
+===================================================================
+--- libjdic-java-0.9.5.orig/jdic/src/share/native/mozilla/nsIHttpProtocolHandler.h 2004-10-09 08:10:58.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/share/native/mozilla/nsIHttpProtocolHandler.h 2008-07-08 18:06:38.000000000 +0530
+@@ -25,7 +25,7 @@
+ class NS_NO_VTABLE nsIHttpProtocolHandler : public nsIProxiedProtocolHandler {
+ public:
+
+- NS_DEFINE_STATIC_IID_ACCESSOR(NS_IHTTPPROTOCOLHANDLER_IID)
++ NS_DECLARE_STATIC_IID_ACCESSOR(NS_IHTTPPROTOCOLHANDLER_IID)
+
+ /**
+ * Get the HTTP advertised user agent string.
+@@ -126,6 +126,8 @@
+
+ };
+
++ NS_DEFINE_STATIC_IID_ACCESSOR(nsIHttpProtocolHandler, NS_IHTTPPROTOCOLHANDLER_IID)
++
+ /* Use this macro when declaring classes that implement this interface. */
+ #define NS_DECL_NSIHTTPPROTOCOLHANDLER \
+ NS_IMETHOD GetUserAgent(nsACString & aUserAgent); \
+Index: libjdic-java-0.9.5/jdic/src/unix/native/mozilla/nsIStringStream.h
+===================================================================
+--- libjdic-java-0.9.5.orig/jdic/src/unix/native/mozilla/nsIStringStream.h 2004-10-09 08:11:01.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/native/mozilla/nsIStringStream.h 2008-07-08 18:06:38.000000000 +0530
+@@ -31,7 +31,7 @@
+ class NS_NO_VTABLE nsIStringInputStream : public nsIInputStream {
+ public:
+
+- NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISTRINGINPUTSTREAM_IID)
++ NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISTRINGINPUTSTREAM_IID)
+
+ /**
+ * SetData - assign data to the input stream (copied on assignment).
+@@ -73,6 +73,8 @@
+
+ };
+
++ NS_DEFINE_STATIC_IID_ACCESSOR(nsIStringInputStream, NS_ISTRINGINPUTSTREAM_IID)
++
+ /* Use this macro when declaring classes that implement this interface. */
+ #define NS_DECL_NSISTRINGINPUTSTREAM \
+ NS_IMETHOD SetData(const char *data, PRInt32 dataLen); \
+Index: libjdic-java-0.9.5/jdic/src/unix/native/mozilla/nsIWebNavigation.h
+===================================================================
+--- libjdic-java-0.9.5.orig/jdic/src/unix/native/mozilla/nsIWebNavigation.h 2004-10-09 08:11:01.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/unix/native/mozilla/nsIWebNavigation.h 2008-07-08 18:06:38.000000000 +0530
+@@ -35,7 +35,7 @@
+ class NS_NO_VTABLE nsIWebNavigation : public nsISupports {
+ public:
+
+- NS_DEFINE_STATIC_IID_ACCESSOR(NS_IWEBNAVIGATION_IID)
++ NS_DECLARE_STATIC_IID_ACCESSOR(NS_IWEBNAVIGATION_IID)
+
+ /**
+ * Indicates if the object can go back. If true this indicates that
+@@ -211,6 +211,8 @@
+
+ };
+
++ NS_DEFINE_STATIC_IID_ACCESSOR(nsIWebNavigation, NS_IWEBNAVIGATION_IID)
++
+ /* Use this macro when declaring classes that implement this interface. */
+ #define NS_DECL_NSIWEBNAVIGATION \
+ NS_IMETHOD GetCanGoBack(PRBool *aCanGoBack); \
Modified: trunk/libjdic-java/debian/patches/demos_README.diff
===================================================================
--- trunk/libjdic-java/debian/patches/demos_README.diff 2008-07-08 21:09:23 UTC (rev 6656)
+++ trunk/libjdic-java/debian/patches/demos_README.diff 2008-07-08 21:18:07 UTC (rev 6657)
@@ -3,23 +3,17 @@
--- libjdic-java-0.0.20060613.orig/jdic/demo/README 2004-09-30 18:09:50.000000000 +0530
+++ libjdic-java-0.0.20060613/jdic/demo/README 2007-11-28 17:21:30.000000000 +0530
@@ -4,13 +4,7 @@
- Run the demos using the following instructions (assuming java command
- is under your PATH):
-
--Windows
--
-- java -classpath ..\..\jdic.jar;. -Djava.library.path=..\..\ <class name>
--
--Unix
--
-- java -classpath ../../jdic.jar:. -Djava.library.path=../../ <class name>
-+ java -classpath /usr/share/java/jdic.jar: -Djava.library.path=/usr/lib/libjdic-java/ <class name>
-
- where <class name> is the same as the application's name, such as FileExplorer,
- FileChooser, FileTypes, SimpleBrowser, Browser, and Tray.
-@@ -103,3 +97,5 @@
-
- For Windows platforms, the tray icon is created in the System Tray Area.
- For Unix platforms, it's created in the Notification Area.
-+
-+ -- Varun Hiremath <varunhiremath at gmail.com>, Wed, 28 Nov 2007 17:21:30 +0530
+ Run the demos using the following instructions (assuming java command
+ is under your PATH):
+
+-Windows
+-
+- java -classpath ..\..\jdic.jar;. -Djava.library.path=..\..\ <class name>
+-
+-Unix
+-
+- java -classpath ../../jdic.jar:. -Djava.library.path=../../ <class name>
++ java -classpath /usr/share/java/jdic.jar: -Djava.library.path=/usr/lib/jni/ <class name>
+
+ where <class name> is the same as the application's name, such as FileExplorer,
+ FileChooser, FileTypes, SimpleBrowser, Browser, and Tray.
Modified: trunk/libjdic-java/debian/patches/jnlp.diff
===================================================================
--- trunk/libjdic-java/debian/patches/jnlp.diff 2008-07-08 21:09:23 UTC (rev 6656)
+++ trunk/libjdic-java/debian/patches/jnlp.diff 2008-07-08 21:18:07 UTC (rev 6657)
@@ -1,13 +1,13 @@
-Index: libjdic-java-0.0.20060613/jdic/src/share/classes/org/jdesktop/jdic/init/JdicManager.java
+Index: libjdic-java-0.9.5/jdic/src/share/classes/org/jdesktop/jdic/init/JdicManager.java
===================================================================
---- libjdic-java-0.0.20060613.orig/jdic/src/share/classes/org/jdesktop/jdic/init/JdicManager.java 2007-11-17 02:59:58.000000000 +0530
-+++ libjdic-java-0.0.20060613/jdic/src/share/classes/org/jdesktop/jdic/init/JdicManager.java 2007-11-17 03:00:31.000000000 +0530
-@@ -30,7 +30,7 @@
+--- libjdic-java-0.9.5.orig/jdic/src/share/classes/org/jdesktop/jdic/init/JdicManager.java 2008-07-08 02:29:12.000000000 +0530
++++ libjdic-java-0.9.5/jdic/src/share/classes/org/jdesktop/jdic/init/JdicManager.java 2008-07-08 02:29:49.000000000 +0530
+@@ -25,7 +25,7 @@
+ import java.net.URLClassLoader;
import org.jdesktop.jdic.browser.internal.WebBrowserUtil;
-
-import com.sun.jnlp.JNLPClassLoader;
+import netx.jnlp.runtime.JNLPClassLoader;
-
- /**
- * Initialization manager for JDIC to set the environment variables or
+ import java.io.IOException;
+ import java.security.AccessController;
+ import java.security.PrivilegedActionException;
Modified: trunk/libjdic-java/debian/patches/packager.diff
===================================================================
--- trunk/libjdic-java/debian/patches/packager.diff 2008-07-08 21:09:23 UTC (rev 6656)
+++ trunk/libjdic-java/debian/patches/packager.diff 2008-07-08 21:18:07 UTC (rev 6657)
@@ -1,43 +1,43 @@
-Index: libjdic-java-0.0.20060613/build.xml
+Index: libjdic-java-0.9.5/build.xml
===================================================================
---- libjdic-java-0.0.20060613.orig/build.xml 2007-11-17 03:58:20.000000000 +0530
-+++ libjdic-java-0.0.20060613/build.xml 2007-11-17 04:01:41.000000000 +0530
+--- libjdic-java-0.9.5.orig/build.xml 2004-10-09 14:10:46.000000000 +0530
++++ libjdic-java-0.9.5/build.xml 2008-07-08 02:42:06.000000000 +0530
@@ -66,7 +66,7 @@
- <ant dir="jdic" target="buildall"/>
-
- <!-- Build a JDIC Packager distribution -->
-- <ant dir="packager" target="buildall"/>
-+<!-- <ant dir="packager" target="buildall"/> -->
-
- <!-- Copy JDIC API distribution files into the distribution directory -->
- <copy todir="${dist.dir}">
+ <ant dir="jdic" target="buildall"/>
+
+ <!-- Build a JDIC Packager distribution -->
+- <ant dir="packager" target="buildall"/>
++<!-- <ant dir="packager" target="buildall"/> -->
+
+ <!-- Copy JDIC API distribution files into the distribution directory -->
+ <copy todir="${dist.dir}">
@@ -79,13 +79,13 @@
- <chmod dir="${dist.dir}" perm="+x" includes="*mozembed-*-gtk*" />
-
- <!-- Copy JDIC Packager distribution files -->
-- <copy todir="${dist.dir}" failonerror="false">
-- <fileset dir="packager/${dist.dir}" casesensitive="false" >
-- <include name="*.jar"/>
-- <include name="*.dll"/>
-- <include name="jnlp2*"/>
-- </fileset>
-- </copy>
-+<!-- <copy todir="${dist.dir}" failonerror="false"> -->
-+<!-- <fileset dir="packager/${dist.dir}" casesensitive="false" > -->
-+<!-- <include name="*.jar"/> -->
-+<!-- <include name="*.dll"/> -->
-+<!-- <include name="jnlp2*"/> -->
-+<!-- </fileset> -->
-+<!-- </copy> -->
-
- <!-- Unix Note: the executable permission of jnlp2rpm or jnlp2pkg
- files are not retained using Ant Copy, add executable mode.
+ <chmod dir="${dist.dir}" perm="+x" includes="*mozembed-*-gtk*" />
+
+ <!-- Copy JDIC Packager distribution files -->
+- <copy todir="${dist.dir}">
+- <fileset dir="packager/${dist.dir}" casesensitive="false" >
+- <include name="*.jar"/>
+- <include name="*.dll"/>
+- <include name="jnlp2*"/>
+- </fileset>
+- </copy>
++<!-- <copy todir="${dist.dir}"> -->
++<!-- <fileset dir="packager/${dist.dir}" casesensitive="false" > -->
++<!-- <include name="*.jar"/> -->
++<!-- <include name="*.dll"/> -->
++<!-- <include name="jnlp2*"/> -->
++<!-- </fileset> -->
++<!-- </copy> -->
+
+ <!-- Unix Note: the executable permission of jnlp2rpm or jnlp2pkg
+ files are not retained using Ant Copy, add executable mode.
@@ -109,7 +109,7 @@
- <ant dir="jdic" target="clean"/>
-
- <!-- Clean the JDIC Packager distribution -->
-- <ant dir="packager" target="clean"/>
-+<!-- <ant dir="packager" target="clean"/> -->
- </target>
-
- </project>
+ <ant dir="jdic" target="clean"/>
+
+ <!-- Clean the JDIC Packager distribution -->
+- <ant dir="packager" target="clean"/>
++<!-- <ant dir="packager" target="clean"/> -->
+ </target>
+
+ </project>
Modified: trunk/libjdic-java/debian/rules
===================================================================
--- trunk/libjdic-java/debian/rules 2008-07-08 21:09:23 UTC (rev 6656)
+++ trunk/libjdic-java/debian/rules 2008-07-08 21:18:07 UTC (rev 6657)
@@ -1,18 +1,17 @@
#!/usr/bin/make -f
-export MOZILLA_DIST=/usr/lib/mozilla
-export GECKO_SDK=/usr/lib/xulrunner/sdk
+export GECKO_SDK=/usr/lib/xulrunner-devel-1.9
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/libjdic-java
+DEB_SHLIBDEPS_INCLUDE := debian/libjdic-bin/usr/lib/jni
DEB_DH_SHLIBDEPS_ARGS_ALL := --dpkg-shlibdeps-params=--ignore-missing-info
common-binary-indep:: debian/stamp-binary-indep
debian/stamp-binary-indep:
- JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun CLASSPATH=/usr/share/java/netx.jar \
+ JAVA_HOME=/usr/lib/jvm/java-6-sun CLASSPATH=/usr/share/java/netx.jar \
ant -f jdic/build.xml buildunixjar javadoc builddemo
touch $@
Added: trunk/libjdic-java/debian/watch
===================================================================
--- trunk/libjdic-java/debian/watch (rev 0)
+++ trunk/libjdic-java/debian/watch 2008-07-08 21:18:07 UTC (rev 6657)
@@ -0,0 +1,2 @@
+version=3
+https://jdic.dev.java.net/servlets/ProjectDocumentList .*jdic-([0-9].*).*
More information about the pkg-java-commits
mailing list