[SCM] eclipse-cdt-qt packaging branch, master, updated. upstream/1.6.1-9-ga20afb4

2012-01-17 Thread Jakub Adam
The following commit has been merged in the master branch:
commit 160ef9a1b06dabe969efc347d4cd072f1ba8e4b5
Author: Jakub Adam jakub.a...@ktknet.cz
Date:   Tue Jan 17 20:16:36 2012 +0100

Add d/README.Debian

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 000..76966da
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,26 @@
+During packaging for Debian, these bigger changes were made:
+
+* Preview in Qt integration relies on private API of Qt Designer that
+  can change at any time and requires private headers of designer for
+  compilation.
+
+  With current Qt Designer and headers shipped with 1.6.1 Qt integration,
+  JNI library does not compile, so I decided to remove this functionality.
+
+* Also integration with QtJambi Eclipse plugin requires now uncompilable
+  private headers. If we don't decide to package this plugin (which is
+  unlikely as its development has been abandoned for some time already),
+  this removal won't have any impact on plugin's features.
+
+* These architecture specific bundles are not created:
+
+   com.trolltech.qtcpp.linux.arch
+   com.trolltech.qtcppdesigner.linux.arch
+   com.trolltech.qtcppdesignerplugins.linux.arch
+
+  Native libraries they contained are installed to /usr/lib/arch/jni, where
+  JVM can always find them, and java sources were merged into respective
+  non-native bundles (com.trolltech.qtcpp ...).
+
+  This layout should make compilation on additional archs straightforward,
+  not requiring to create arch bundles for each new architecture.

-- 
eclipse-cdt-qt packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] eclipse-cdt-qt packaging branch, master, updated. upstream/1.6.1-9-ga20afb4

2012-01-17 Thread Jakub Adam
The following commit has been merged in the master branch:
commit 141695dfed18b2174921bcc05e9c5ee0fea955ce
Author: Jakub Adam jakub.a...@ktknet.cz
Date:   Tue Jan 17 21:14:36 2012 +0100

Run dh_makeshlibs with -n to left postinst/postrm scripts unmodified

diff --git a/debian/rules b/debian/rules
index 091ac55..5da6a0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ override_dh_install:
 
 override_dh_makeshlibs:
# Do not call ldconfig in postinst and postrm
+   dh_makeshlibs -n
 
 override_dh_clean:
dh_clean

-- 
eclipse-cdt-qt packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] eclipse-cdt-qt packaging branch, master, updated. upstream/1.6.1-9-ga20afb4

2012-01-17 Thread Jakub Adam
The following commit has been merged in the master branch:
commit a20afb4872ce4c128643b1f30bd0ec5a0420cf09
Author: Jakub Adam jakub.a...@ktknet.cz
Date:   Tue Jan 17 21:20:35 2012 +0100

eclipse-cdt-qt-jni: pre-depend on substitution variable ${misc:Pre-Depends}

diff --git a/debian/control b/debian/control
index fcac4f5..b038662 100644
--- a/debian/control
+++ b/debian/control
@@ -31,6 +31,7 @@ Description: Qt integration for Eclipse CDT
 
 Package: eclipse-cdt-qt-jni
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: Qt integration for Eclipse CDT (native libraries)

-- 
eclipse-cdt-qt packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits