[SCM] eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package. branch, master, updated. upstream/8.0.1-66-g2640f17

[Jakub Adam]

The following commit has been merged in the master branch:
commit 2640f17dc9b8cb0b3c0707c82bc9816d7f9de4b9
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Nov 6 12:28:09 2011 +0100

    Split package into eclipse-cdt and arch-dependent eclipse-cdt-jni

diff --git a/debian/control b/debian/control
index 260d20e..98dde8e 100644
--- a/debian/control
+++ b/debian/control
@@ -18,14 +18,14 @@ Vcs-Browser: http://git.debian.org/?p=pkg-java/eclipse-cdt.git
 Homepage: http://www.eclipse.org/cdt/
 
 Package: eclipse-cdt
-Architecture: any
+Architecture: all
 Depends: eclipse-platform (>= 3.7~exp),
-		 eclipse-rse,
+         eclipse-rse,
+         eclipse-cdt-jni (>= ${source:Version}),
          gcc,
          make,
          ${misc:Depends},
-         ${orbit:Depends},
-         ${shlibs:Depends}
+         ${orbit:Depends}
 Suggests: g++
 Description: C/C++ Development Tools for Eclipse
  The eclipse-cdt package contains Eclipse features and plugins that are
@@ -41,3 +41,26 @@ Description: C/C++ Development Tools for Eclipse
   * Search Engine
   * Content Assist Provider
   * Makefile generator
+
+Package: eclipse-cdt-jni
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Description: C/C++ Development Tools for Eclipse
+ The eclipse-cdt package contains Eclipse features and plugins that are
+ useful for C and C++ development.
+ .
+ The current release function includes:
+  * C/C++ Editor (basic functionality, syntax highlighting, code completion,
+    etc.)
+  * C/C++ Debugger (APIs & Default implementation, using GDB)
+  * C/C++ Launcher (APIs & Default implementation, launches and external
+    application)
+  * Parser
+  * Search Engine
+  * Content Assist Provider
+  * Makefile generator
+ .
+ This package contains architecture specific JNI libraries
+
diff --git a/debian/rules b/debian/rules
index ea43690..b00583e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,14 +45,11 @@ override_jh_compilefeatures:
 
 jnidir := /usr/lib/$(DEB_HOST_MULTIARCH)/jni
 override_dh_install:
-	dh_install -peclipse-cdt $(BUILD_DIR)/org.eclipse.cdt.core.linux.$(ECLIPSE_BUILD_ARCH)/os/linux/$(ECLIPSE_BUILD_ARCH)/*.so $(jnidir)
+	dh_install -peclipse-cdt-jni $(BUILD_DIR)/org.eclipse.cdt.core.linux.$(ECLIPSE_BUILD_ARCH)/os/linux/$(ECLIPSE_BUILD_ARCH)/*.so $(jnidir)
 	dh_install --remaining-packages
 
 override_jh_installeclipse:
 	jh_installeclipse
-	mkdir -p debian/eclipse-cdt/usr/share/eclipse/dropins
-	mv debian/eclipse-cdt/usr/lib/eclipse/dropins/cdt debian/eclipse-cdt/usr/share/eclipse/dropins
-	rm -rf debian/eclipse-cdt/usr/lib/eclipse
 	rm -f debian/eclipse-cdt/usr/share/eclipse/dropins/cdt/eclipse/plugins/org.eclipse.cdt.launch.remote.source*.jar
 
 get-orig-source:

-- 
eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package.