[pkg-java] r4829 - trunk/libjdic-java/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2007-11-24 12:34:26 +0000 (Sat, 24 Nov 2007)
New Revision: 4829

Modified:
   trunk/libjdic-java/debian/changelog
   trunk/libjdic-java/debian/control
   trunk/libjdic-java/debian/rules
Log:
* Support newer dpkg-shlibdeps by ignoring errors.
* Add Depends: libjdic-java for package libjdic-bin.
* Downgrade Depends: libjdic-bin to Recommends.



Modified: trunk/libjdic-java/debian/changelog
===================================================================
--- trunk/libjdic-java/debian/changelog	2007-11-24 12:05:41 UTC (rev 4828)
+++ trunk/libjdic-java/debian/changelog	2007-11-24 12:34:26 UTC (rev 4829)
@@ -1,10 +1,11 @@
 libjdic-java (0.0.20060613-5) unstable; urgency=low
 
   * Change Architecture: amd64 i386 for libjdic-bin.
-  * Support newer dpkg-shlibdeps by excluding our shared libraries.
+  * Support newer dpkg-shlibdeps by ignoring errors.
   * Add Depends: libjdic-java for package libjdic-bin.
+  * Downgrade Depends: libjdic-bin to Recommends.
 
- -- Torsten Werner <twerner at debian.org>  Sat, 24 Nov 2007 13:05:45 +0100
+ -- Torsten Werner <twerner at debian.org>  Sat, 24 Nov 2007 13:37:58 +0100
 
 libjdic-java (0.0.20060613-4) unstable; urgency=low
 

Modified: trunk/libjdic-java/debian/control
===================================================================
--- trunk/libjdic-java/debian/control	2007-11-24 12:05:41 UTC (rev 4828)
+++ trunk/libjdic-java/debian/control	2007-11-24 12:34:26 UTC (rev 4829)
@@ -13,8 +13,9 @@
 
 Package: libjdic-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, libjdic-bin,
+Depends: ${shlibs:Depends}, ${misc:Depends}, 
  sun-java5-jre | java1-runtime | java2-runtime
+Recommends: libjdic-bin
 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/rules
===================================================================
--- trunk/libjdic-java/debian/rules	2007-11-24 12:05:41 UTC (rev 4828)
+++ trunk/libjdic-java/debian/rules	2007-11-24 12:34:26 UTC (rev 4829)
@@ -7,14 +7,14 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-DEB_COMPRESS_EXCLUDE    := .java .class
+DEB_COMPRESS_EXCLUDE      := .java .class
+DEB_SHLIBDEPS_INCLUDE     := debian/libjdic-bin/usr/lib/libjdic-java
+DEB_DH_SHLIBDEPS_ARGS_ALL := --dpkg-shlibdeps-params=--ignore-missing-info
 
-JAVA_HOME 		:= /usr/lib/jvm/java-1.5.0-sun
-DEB_ANT_BUILD_TARGET 	:= buildall
-DEB_JARS		:= netx
+JAVA_HOME 		  := /usr/lib/jvm/java-1.5.0-sun
+DEB_ANT_BUILD_TARGET 	  := buildall
+DEB_JARS		  := netx
 
-DEB_DH_SHLIBDEPS_ARGS_ALL := -X /usr/lib/libjdic-java
-
 install/libjdic-java::
 	for i in `ls /usr/lib/libjdic-java/`; do \
 		dh_link /usr/lib/libjdic-java/$$i /usr/share/java/$$i; done