[SCM] Debian packaging for swt-gtk. branch, master, updated. debian/3.7-1-2-g0b99169

[Ahmed El-Mahmoudy]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Debian packaging for swt-gtk.".

The branch, master has been updated
       via  0b99169d5f89d6ba45863d5e4a7ca4f75d9eb1ad (commit)
       via  e22d320f8de35c029e0ebe4b069cedd18fe3d568 (commit)
      from  c9610d94d1bf58abe08ab401258633ac2ef602a4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0b99169d5f89d6ba45863d5e4a7ca4f75d9eb1ad
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Fri Jul 15 20:10:26 2011 +0200

    Release 3.7-2

commit e22d320f8de35c029e0ebe4b069cedd18fe3d568
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Wed Jul 13 17:54:13 2011 +0200

    Disable xulrunner support and enable webkit (patch from Ubuntu)
    
    + debian/control:
      - Remove xulrunner-dev from Build-Deps
      - Remove libswt-mozilla-gtk-3-jni package
    + debian/Makefile: do not build mozilla/xpcom/xulrunner extensions
    + debian/rules: do not call dh_xulrunner
    + remove debian/libswt-mozilla-gtk-3-jni.install

-----------------------------------------------------------------------

Summary of changes:
 debian/Makefile                         |    2 +-
 debian/changelog                        |   13 +++++++++++++
 debian/control                          |   14 +-------------
 debian/libswt-mozilla-gtk-3-jni.install |    3 ---
 debian/rules                            |    3 ---
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/debian/Makefile b/debian/Makefile
index 1622ee2..6da5ccd 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -8,7 +8,7 @@ RM=rm -f
 
 all: $(JAVA)
 	$(MAKE) -f make_linux.mak make_atk make_awt make_cairo make_glx \
-		make_gnome make_mozilla make_swt make_xpcominit make_xulrunner make_webkit
+		make_gnome make_swt make_webkit
 
 clean distclean:
 	$(RM) $(CLEANFILES)
diff --git a/debian/changelog b/debian/changelog
index 5a02c15..13a23d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+swt-gtk (3.7-2) unstable; urgency=low
+
+  * Disable xulrunner support and enable webkit (Closes: #631048)
+    + debian/control:
+      - Remove xulrunner-dev from Build-Deps
+      - Remove libswt-mozilla-gtk-3-jni package
+    + debian/Makefile: do not build mozilla/xpcom/xulrunner extensions
+    + debian/rules: do not call dh_xulrunner
+    + remove debian/libswt-mozilla-gtk-3-jni.install
+    (Patch from Ubuntu)
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>  Wed, 13 Jul 2011 17:57:26 +0200
+
 swt-gtk (3.7-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index dff036f..a859566 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Adrian Perez <blackxored at debian.org>,
            أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
 DM-Upload-Allowed: yes
 Build-Depends: default-jdk, gcj-native-helper, libgnomeui-dev, libxtst-dev,
- xulrunner-dev, libxcb-render-util0-dev, libxt-dev,
+ libxcb-render-util0-dev, libxt-dev,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
  fastjar, cdbs, patchutils, debhelper (>= 8), libwebkit-dev
 Standards-Version: 3.9.2
@@ -50,17 +50,6 @@ Description: Standard Widget Toolkit for GTK+ GNOME JNI library
  .
  This package includes the GNOME JNI library.
 
-Package: libswt-mozilla-gtk-3-jni
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Standard Widget Toolkit for GTK+ Mozilla JNI library
- The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java
- programming language. SWT provides efficient, portable and fast access to
- native controls and user interface facilities on the platforms where it has
- been implemented.
- .
- This package includes the Mozilla JNI libraries.
-
 Package: libswt-cairo-gtk-3-jni
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -102,7 +91,6 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
 	  libswt-glx-gtk-3-jni (= ${binary:Version}),
 	  libswt-gnome-gtk-3-jni (= ${binary:Version}),
 	  libswt-gtk-3-jni (= ${binary:Version}),
-	  libswt-mozilla-gtk-3-jni (= ${binary:Version}),
 	  libswt-webkit-gtk-3-jni (= ${binary:Version})
 Description: Standard Widget Toolkit for GTK+ native library
  The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java
diff --git a/debian/libswt-mozilla-gtk-3-jni.install b/debian/libswt-mozilla-gtk-3-jni.install
deleted file mode 100644
index 8c94b6f..0000000
--- a/debian/libswt-mozilla-gtk-3-jni.install
+++ /dev/null
@@ -1,3 +0,0 @@
-libswt-mozilla-*[0-9].so usr/lib/jni
-libswt-xulrunner-*[0-9].so usr/lib/jni
-libswt-xpcominit-*[0-9].so usr/lib/jni
diff --git a/debian/rules b/debian/rules
index ae3f064..b9d7123 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,3 @@ ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
 common-binary-post-install-arch::
 	dh_nativejava -a
 endif
-
-common-binary-predeb-arch::
-	dh_xulrunner


hooks/post-receive
-- 
Debian packaging for swt-gtk.