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

twerner at alioth.debian.org twerner at alioth.debian.org
Sun Dec 16 19:28:42 UTC 2007


Author: twerner
Date: 2007-12-16 19:28:41 +0000 (Sun, 16 Dec 2007)
New Revision: 5073

Removed:
   trunk/libjdic-java/debian/patches/demos_README.diff
Modified:
   trunk/libjdic-java/debian/changelog
   trunk/libjdic-java/debian/control
   trunk/libjdic-java/debian/libjdic-bin.install
   trunk/libjdic-java/debian/orig-tar.sh
   trunk/libjdic-java/debian/patches/build.diff
   trunk/libjdic-java/debian/patches/jnlp.diff
   trunk/libjdic-java/debian/patches/packager.diff
   trunk/libjdic-java/debian/patches/series
   trunk/libjdic-java/debian/rules
Log:
UNRELEASED
* new upstream release
* Refresh the patches.
* Install JNI libraries into /usr/lib/jni.
* Change Standards-Version: 3.7.3.
* Remove execute permissions from examples.

Modified: trunk/libjdic-java/debian/changelog
===================================================================
--- trunk/libjdic-java/debian/changelog	2007-12-16 18:39:32 UTC (rev 5072)
+++ trunk/libjdic-java/debian/changelog	2007-12-16 19:28:41 UTC (rev 5073)
@@ -1,3 +1,14 @@
+libjdic-java (0.9.3-1) unstable; urgency=low
+
+  UNRELEASED
+  * new upstream release
+  * Refresh the patches.
+  * Install JNI libraries into /usr/lib/jni.
+  * Change Standards-Version: 3.7.3.
+  * Remove execute permissions from examples.
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 16 Dec 2007 20:20:59 +0100
+
 libjdic-java (0.0.20060613-7) unstable; urgency=low
 
   * Set JAVA_HOME only for build-indep.

Modified: trunk/libjdic-java/debian/control
===================================================================
--- trunk/libjdic-java/debian/control	2007-12-16 18:39:32 UTC (rev 5072)
+++ trunk/libjdic-java/debian/control	2007-12-16 19:28:41 UTC (rev 5073)
@@ -6,7 +6,7 @@
 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.2
+Standards-Version: 3.7.3
 Homepage: https://jdic.dev.java.net/
 Vcs-Svn: https://bollin.googlecode.com/svn/libjdic-java/
 Vcs-Browser: http://bollin.googlecode.com/svn/libjdic-java/

Modified: trunk/libjdic-java/debian/libjdic-bin.install
===================================================================
--- trunk/libjdic-java/debian/libjdic-bin.install	2007-12-16 18:39:32 UTC (rev 5072)
+++ trunk/libjdic-java/debian/libjdic-bin.install	2007-12-16 19:28:41 UTC (rev 5073)
@@ -1,2 +1,2 @@
-jdic/dist/*/*.so  /usr/lib/libjdic-java/
-jdic/dist/*/mozembed-linux-gtk2 /usr/lib/libjdic-java/
+jdic/dist/*/*.so                /usr/lib/jni/
+jdic/dist/*/mozembed-linux-gtk2 /usr/lib/jni/

Modified: trunk/libjdic-java/debian/orig-tar.sh
===================================================================
--- trunk/libjdic-java/debian/orig-tar.sh	2007-12-16 18:39:32 UTC (rev 5072)
+++ trunk/libjdic-java/debian/orig-tar.sh	2007-12-16 19:28:41 UTC (rev 5073)
@@ -2,15 +2,14 @@
 # $1 = version
 
 TAR=../libjdic-java_$1.orig.tar.gz
-DIR=libjdic-java-$1.orig
+DIR=jdic-$1-src
 ZIP=jdic-$1-src.zip
+URL=https://jdic.dev.java.net/files/documents/880/62103
 
-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
 GZIP=--best tar -c -z -f $TAR -X debian/orig.exclude $DIR
 rm -rf $DIR $ZIP
 

Modified: trunk/libjdic-java/debian/patches/build.diff
===================================================================
--- trunk/libjdic-java/debian/patches/build.diff	2007-12-16 18:39:32 UTC (rev 5072)
+++ trunk/libjdic-java/debian/patches/build.diff	2007-12-16 19:28:41 UTC (rev 5073)
@@ -1,131 +1,118 @@
-Index: libjdic-java-20060613/packager/build.xml
+Index: libjdic-java-0.9.3/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.3.orig/packager/build.xml	2007-07-16 12:32:52.000000000 +0200
++++ libjdic-java-0.9.3/packager/build.xml	2007-12-16 20:08:53.000000000 +0100
 @@ -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.3/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.3.orig/jdic/src/unix/native/jni/WebBrowserUtil.cpp	2005-06-14 05:20:08.000000000 +0200
++++ libjdic-java-0.9.3/jdic/src/unix/native/jni/WebBrowserUtil.cpp	2007-12-16 20:08:53.000000000 +0100
 @@ -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.3/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.3.orig/jdic/src/unix/native/mozilla/Makefile	2005-05-19 10:48:22.000000000 +0200
++++ libjdic-java-0.9.3/jdic/src/unix/native/mozilla/Makefile	2007-12-16 20:09:40.000000000 +0100
 @@ -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
+ #
+@@ -118,13 +118,13 @@
+ 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
+ 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
+@@ -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
+@@ -162,9 +162,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-0.9.3/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.3.orig/jdic/src/unix/native/mozilla/MozEmbed.cpp	2005-05-19 05:41:22.000000000 +0200
++++ libjdic-java-0.9.3/jdic/src/unix/native/mozilla/MozEmbed.cpp	2007-12-16 20:08:53.000000000 +0100
 @@ -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.3/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.3.orig/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeTrayIconService.java	2005-06-01 05:53:40.000000000 +0200
++++ libjdic-java-0.9.3/jdic/src/unix/classes/org/jdesktop/jdic/tray/internal/impl/GnomeTrayIconService.java	2007-12-16 20:08:53.000000000 +0100
 @@ -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.3/jdic/src/unix/native/mozilla/MozEmbed.h
 ===================================================================
---- 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
+--- libjdic-java-0.9.3.orig/jdic/src/unix/native/mozilla/MozEmbed.h	2004-08-26 09:28:48.000000000 +0200
++++ libjdic-java-0.9.3/jdic/src/unix/native/mozilla/MozEmbed.h	2007-12-16 20:08:53.000000000 +0100
 @@ -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"
+ #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"

Deleted: trunk/libjdic-java/debian/patches/demos_README.diff
===================================================================
--- trunk/libjdic-java/debian/patches/demos_README.diff	2007-12-16 18:39:32 UTC (rev 5072)
+++ trunk/libjdic-java/debian/patches/demos_README.diff	2007-12-16 19:28:41 UTC (rev 5073)
@@ -1,25 +0,0 @@
-Index: libjdic-java-0.0.20060613/jdic/demo/README
-===================================================================
---- 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

Modified: trunk/libjdic-java/debian/patches/jnlp.diff
===================================================================
--- trunk/libjdic-java/debian/patches/jnlp.diff	2007-12-16 18:39:32 UTC (rev 5072)
+++ trunk/libjdic-java/debian/patches/jnlp.diff	2007-12-16 19:28:41 UTC (rev 5073)
@@ -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.3/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
+--- libjdic-java-0.9.3.orig/jdic/src/share/classes/org/jdesktop/jdic/init/JdicManager.java	2007-07-13 16:16:25.000000000 +0200
++++ libjdic-java-0.9.3/jdic/src/share/classes/org/jdesktop/jdic/init/JdicManager.java	2007-12-16 20:02:38.000000000 +0100
 @@ -30,7 +30,7 @@
- 
- 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 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

Modified: trunk/libjdic-java/debian/patches/packager.diff
===================================================================
--- trunk/libjdic-java/debian/patches/packager.diff	2007-12-16 18:39:32 UTC (rev 5072)
+++ trunk/libjdic-java/debian/patches/packager.diff	2007-12-16 19:28:41 UTC (rev 5073)
@@ -1,43 +1,38 @@
-Index: libjdic-java-0.0.20060613/build.xml
+Index: libjdic-java-0.9.3/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.3.orig/build.xml	2004-10-09 09:40:45.000000000 +0200
++++ libjdic-java-0.9.3/build.xml	2007-12-16 20:11:54.000000000 +0100
 @@ -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}">
-@@ -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.
-@@ -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="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,6 +79,7 @@
+     <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"/>
+@@ -86,6 +87,7 @@
+         <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 +111,7 @@
+     <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/patches/series
===================================================================
--- trunk/libjdic-java/debian/patches/series	2007-12-16 18:39:32 UTC (rev 5072)
+++ trunk/libjdic-java/debian/patches/series	2007-12-16 19:28:41 UTC (rev 5073)
@@ -1,4 +1,3 @@
 jnlp.diff
-demos_README.diff
 build.diff
 packager.diff

Modified: trunk/libjdic-java/debian/rules
===================================================================
--- trunk/libjdic-java/debian/rules	2007-12-16 18:39:32 UTC (rev 5072)
+++ trunk/libjdic-java/debian/rules	2007-12-16 19:28:41 UTC (rev 5073)
@@ -25,6 +25,10 @@
 	install -D -m 644 jdic/dist/*/jdic.jar debian/libjdic-java/usr/share/java/jdic-$(DEB_UPSTREAM_VERSION).jar
 	dh_link /usr/share/java/jdic-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jdic.jar
 
+binary-install/libjdic-java::
+	find debian/libjdic-java/usr/share/doc/libjdic-java/examples -type f \
+	  -exec chmod -x '{}' \;
+
 clean::
 	ant -f jdic/build.xml clean
 	$(RM) debian/stamp-*




More information about the pkg-java-commits mailing list