r2202 - trunk/eclipse/debian

[Michael Koch]

Author: mkoch
Date: 2006-06-19 05:45:32 +0000 (Mon, 19 Jun 2006)
New Revision: 2202

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/control
   trunk/eclipse/debian/control.in
   trunk/eclipse/debian/rules
Log:
* debian/control.in: libswt3.1-gtk-java: Make @MOZILLA_DEP@ a Recommends.
  libswt3.1-gtk-jni: Make dependencies on GNOME and Mozilla a Recommends.
  Closes: #361696, #368705.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2006-06-18 17:58:54 UTC (rev 2201)
+++ trunk/eclipse/debian/changelog	2006-06-19 05:45:32 UTC (rev 2202)
@@ -3,8 +3,11 @@
   * debian/rules: Added support to build with xulrunner. Made it the default.
     Closes: #352184.
   * debian/patches/eclipse-libswt-xulrunner.dpatch: New file.
+  * debian/control.in: libswt3.1-gtk-java: Make @MOZILLA_DEP@ a Recommends.
+    libswt3.1-gtk-jni: Make dependencies on GNOME and Mozilla a Recommends.
+    Closes: #361696, #368705.
 
- -- Michael Koch <konqueror at gmx.de>  Sun, 21 May 2006 15:47:27 +0000
+ -- Michael Koch <konqueror at gmx.de>  Mon, 19 Jun 2006 05:38:10 +0000
 
 eclipse (3.1.2-2) unstable; urgency=low
 

Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control	2006-06-18 17:58:54 UTC (rev 2201)
+++ trunk/eclipse/debian/control	2006-06-19 05:45:32 UTC (rev 2202)
@@ -233,7 +233,8 @@
 
 Package: libswt3.1-gtk-java
 Architecture: any
-Depends: libswt3.1-gtk-jni (= ${Source-Version}), mozilla-browser (>= 2:1.7.0), java-common
+Depends: libswt3.1-gtk-jni (= ${Source-Version}), java-common
+Recommends: mozilla-browser (>= 2:1.7.0)
 Replaces: libswt2.1-gtk2-java, libswt-gtk3-java, eclipse-rcp (<< 3.1.2-2)
 Conflicts: libswt2.1-gtk2-java, libswt-gtk3-java, libswt-gtk-3.1-java
 Recommends: libswt3.1-gtk-gcj
@@ -259,6 +260,7 @@
 Package: libswt3.1-gtk-jni
 Architecture: any
 Depends: libswt3.1-gtk-java (= ${Source-Version}), ${shlibs:Depends}
+Recommends: ${shlibs:Recommends}
 Replaces: libswt2.1-gtk2-jni, libswt-gtk3-jni
 Conflicts: libswt2.1-gtk2-jni, libswt-gtk3-jni, libswt-gtk-3.1-jni, libswt-gnome-gtk-3.1-jni, libswt-mozilla-gtk-3.1-jni
 Description: Platform dependent files for libswt3.1-gtk-java

Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in	2006-06-18 17:58:54 UTC (rev 2201)
+++ trunk/eclipse/debian/control.in	2006-06-19 05:45:32 UTC (rev 2202)
@@ -233,7 +233,8 @@
 
 Package: libswt3.1-gtk-java
 Architecture: any
-Depends: libswt3.1-gtk-jni (= ${Source-Version}), @MOZILLA_DEP@, java-common
+Depends: libswt3.1-gtk-jni (= ${Source-Version}), java-common
+Recommends: @MOZILLA_DEP@
 Replaces: libswt2.1-gtk2-java, libswt-gtk3-java, eclipse-rcp (<< 3.1.2-2)
 Conflicts: libswt2.1-gtk2-java, libswt-gtk3-java, libswt-gtk-3.1-java
 Recommends: libswt3.1-gtk-gcj
@@ -259,6 +260,7 @@
 Package: libswt3.1-gtk-jni
 Architecture: any
 Depends: libswt3.1-gtk-java (= ${Source-Version}), ${shlibs:Depends}
+Recommends: ${shlibs:Recommends}
 Replaces: libswt2.1-gtk2-jni, libswt-gtk3-jni
 Conflicts: libswt2.1-gtk2-jni, libswt-gtk3-jni, libswt-gtk-3.1-jni, libswt-gnome-gtk-3.1-jni, libswt-mozilla-gtk-3.1-jni
 Description: Platform dependent files for libswt3.1-gtk-java

Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules	2006-06-18 17:58:54 UTC (rev 2201)
+++ trunk/eclipse/debian/rules	2006-06-19 05:45:32 UTC (rev 2202)
@@ -604,7 +604,18 @@
 	
 	dh_strip -a
 	dh_compress -a
-	dh_shlibdeps -a
+	dpkg-shlibdeps \
+		-dDepends \
+			debian/libswt3.1-gtk-jni/usr/lib/jni/libswt-gtk-3139.so \
+			debian/libswt3.1-gtk-jni/usr/lib/jni/libswt-atk-gtk-3139.so \
+			debian/libswt3.1-gtk-jni/usr/lib/jni/libswt-awt-gtk-3139.so \
+			debian/libswt3.1-gtk-jni/usr/lib/jni/libswt-cairo-gtk-3139.so \
+			debian/libswt3.1-gtk-jni/usr/lib/jni/libswt-pi-gtk-3139.so \
+		-dRecommends \
+			debian/libswt3.1-gtk-jni/usr/lib/jni/libswt-gnome-gtk-3139.so \
+			debian/libswt3.1-gtk-jni/usr/lib/jni/libswt-mozilla-gtk-3139.so \
+		-Tdebian/libswt3.1-gtk-jni.substvars
+	dh_shlibdeps -a -Nlibswt3.1-gtk-jni
 	dh_makeshlibs -a
 	dh_installdeb -a
 	dh_gencontrol -a