[SCM] gammaray packaging branch, master, updated. debian/1.3.0-1-30-g8272acb
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Sat Jan 18 23:09:17 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=8690ec5
The following commit has been merged in the master branch:
commit 8690ec5e9f374894d620b35cf3832b27b3aed33a
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Thu Jan 16 18:49:15 2014 +0100
Revert "Install into multiarch location"
This reverts commit 94d461e541feb307d3b3cbecec3e33a3fda3fd7f.
Conflicts:
debian/gammaray-probe-qt5.install
debian/gammaray.install
---
debian/gammaray-dev.install | 2 +-
debian/gammaray-plugin-kjobtracker.install | 2 +-
debian/gammaray-plugin-objectvisualizer.install | 2 +-
debian/gammaray-probe-qt4.install | 52 +++++++++++------------
debian/gammaray.install | 55 ++++++++++++-------------
debian/patches/debian-multiarch.patch | 21 ----------
debian/patches/series | 1 -
7 files changed, 56 insertions(+), 79 deletions(-)
diff --git a/debian/gammaray-dev.install b/debian/gammaray-dev.install
index fde2cdb..ff46386 100644
--- a/debian/gammaray-dev.install
+++ b/debian/gammaray-dev.install
@@ -1,2 +1,2 @@
usr/include
-usr/lib/*/libgammaray*.so
+usr/lib/libgammaray*.so
diff --git a/debian/gammaray-plugin-kjobtracker.install b/debian/gammaray-plugin-kjobtracker.install
index ac469f9..22119c6 100644
--- a/debian/gammaray-plugin-kjobtracker.install
+++ b/debian/gammaray-plugin-kjobtracker.install
@@ -1 +1 @@
-usr/lib/*/gammaray/*/qt*/gammaray_kjobtracker*
+usr/lib/gammaray/*/qt*/gammaray_kjobtracker*
diff --git a/debian/gammaray-plugin-objectvisualizer.install b/debian/gammaray-plugin-objectvisualizer.install
index 96116c7..4b4284e 100644
--- a/debian/gammaray-plugin-objectvisualizer.install
+++ b/debian/gammaray-plugin-objectvisualizer.install
@@ -1 +1 @@
-usr/lib/*/gammaray/*/qt*/gammaray_objectvisualizer*
+usr/lib/gammaray/*/qt*/gammaray_objectvisualizer*
diff --git a/debian/gammaray-probe-qt4.install b/debian/gammaray-probe-qt4.install
index ec683f8..f60244c 100644
--- a/debian/gammaray-probe-qt4.install
+++ b/debian/gammaray-probe-qt4.install
@@ -1,27 +1,27 @@
-usr/lib/*/libgammaray*qt4*.so.*
-usr/lib/*/gammaray/*/qt4*/gammaray_actioninspector.desktop
-usr/lib/*/gammaray/*/qt4*/gammaray_actioninspector_plugin.so
-usr/lib/*/gammaray/*/qt4*/gammaray_codecbrowser.desktop
-usr/lib/*/gammaray/*/qt4*/gammaray_codecbrowser_plugin.so
-usr/lib/*/gammaray/*/qt4*/gammaray_fontbrowser.desktop
-usr/lib/*/gammaray/*/qt4*/gammaray_fontbrowser_plugin.so
-usr/lib/*/gammaray/*/qt4*/gammaray_inprocessui.so
-usr/lib/*/gammaray/*/qt4*/gammaray_probe.so
-usr/lib/*/gammaray/*/qt4*/gammaray_sceneinspector.desktop
-usr/lib/*/gammaray/*/qt4*/gammaray_sceneinspector_plugin.so
-usr/lib/*/gammaray/*/qt4*/gammaray_scriptenginedebugger.desktop
-usr/lib/*/gammaray/*/qt4*/gammaray_scriptenginedebugger_plugin.so
-usr/lib/*/gammaray/*/qt4*/gammaray_selectionmodelinspector.desktop
-usr/lib/*/gammaray/*/qt4*/gammaray_selectionmodelinspector_plugin.so
-usr/lib/*/gammaray/*/qt4*/gammaray_statemachineviewer.desktop
-usr/lib/*/gammaray/*/qt4*/gammaray_statemachineviewer_plugin.so
-usr/lib/*/gammaray/*/qt4*/gammaray_styleinspector.desktop
-usr/lib/*/gammaray/*/qt4*/gammaray_styleinspector_plugin.so
-usr/lib/*/gammaray/*/qt4*/gammaray_timertop.desktop
-usr/lib/*/gammaray/*/qt4*/gammaray_timertop_plugin.so
-usr/lib/*/gammaray/*/qt4*/gammaray_webinspector.desktop
-usr/lib/*/gammaray/*/qt4*/gammaray_webinspector_plugin.so
-usr/lib/*/gammaray/*/qt4*/gammaray_widgetinspector.desktop
-usr/lib/*/gammaray/*/qt4*/gammaray_widgetinspector_plugin.so
-usr/lib/*/gammaray/*/qt4*/libgammaray_widget_export_actions.so
+usr/lib/libgammaray*qt4*.so.*
+usr/lib/gammaray/*/qt4*/gammaray_actioninspector.desktop
+usr/lib/gammaray/*/qt4*/gammaray_actioninspector_plugin.so
+usr/lib/gammaray/*/qt4*/gammaray_codecbrowser.desktop
+usr/lib/gammaray/*/qt4*/gammaray_codecbrowser_plugin.so
+usr/lib/gammaray/*/qt4*/gammaray_fontbrowser.desktop
+usr/lib/gammaray/*/qt4*/gammaray_fontbrowser_plugin.so
+usr/lib/gammaray/*/qt4*/gammaray_inprocessui.so
+usr/lib/gammaray/*/qt4*/gammaray_probe.so
+usr/lib/gammaray/*/qt4*/gammaray_sceneinspector.desktop
+usr/lib/gammaray/*/qt4*/gammaray_sceneinspector_plugin.so
+usr/lib/gammaray/*/qt4*/gammaray_scriptenginedebugger.desktop
+usr/lib/gammaray/*/qt4*/gammaray_scriptenginedebugger_plugin.so
+usr/lib/gammaray/*/qt4*/gammaray_selectionmodelinspector.desktop
+usr/lib/gammaray/*/qt4*/gammaray_selectionmodelinspector_plugin.so
+usr/lib/gammaray/*/qt4*/gammaray_statemachineviewer.desktop
+usr/lib/gammaray/*/qt4*/gammaray_statemachineviewer_plugin.so
+usr/lib/gammaray/*/qt4*/gammaray_styleinspector.desktop
+usr/lib/gammaray/*/qt4*/gammaray_styleinspector_plugin.so
+usr/lib/gammaray/*/qt4*/gammaray_timertop.desktop
+usr/lib/gammaray/*/qt4*/gammaray_timertop_plugin.so
+usr/lib/gammaray/*/qt4*/gammaray_webinspector.desktop
+usr/lib/gammaray/*/qt4*/gammaray_webinspector_plugin.so
+usr/lib/gammaray/*/qt4*/gammaray_widgetinspector.desktop
+usr/lib/gammaray/*/qt4*/gammaray_widgetinspector_plugin.so
+usr/lib/gammaray/*/qt4*/libgammaray_widget_export_actions.so
diff --git a/debian/gammaray.install b/debian/gammaray.install
index bcf9a51..e9d879f 100644
--- a/debian/gammaray.install
+++ b/debian/gammaray.install
@@ -1,31 +1,30 @@
usr/bin
-usr/lib/*/libgammaray*qt5*.so.*
-usr/lib/*/gammaray/libexec
-usr/lib/*/gammaray/*/qt5*/*_ui.desktop
-usr/lib/*/gammaray/*/qt5*/*_ui_plugin.so
-usr/lib/*/gammaray/*/qt5*/gammaray_actioninspector.desktop
-usr/lib/*/gammaray/*/qt5*/gammaray_actioninspector_plugin.so
-usr/lib/*/gammaray/*/qt5*/gammaray_codecbrowser.desktop
-usr/lib/*/gammaray/*/qt5*/gammaray_codecbrowser_plugin.so
-usr/lib/*/gammaray/*/qt5*/gammaray_fontbrowser.desktop
-usr/lib/*/gammaray/*/qt5*/gammaray_fontbrowser_plugin.so
-usr/lib/*/gammaray/*/qt5*/gammaray_inprocessui.so
-usr/lib/*/gammaray/*/qt5*/gammaray_probe.so
-usr/lib/*/gammaray/*/qt5*/gammaray_sceneinspector.desktop
-usr/lib/*/gammaray/*/qt5*/gammaray_sceneinspector_plugin.so
-usr/lib/*/gammaray/*/qt5*/gammaray_scriptenginedebugger.desktop
-usr/lib/*/gammaray/*/qt5*/gammaray_scriptenginedebugger_plugin.so
-usr/lib/*/gammaray/*/qt5*/gammaray_selectionmodelinspector.desktop
-usr/lib/*/gammaray/*/qt5*/gammaray_selectionmodelinspector_plugin.so
-usr/lib/*/gammaray/*/qt5*/gammaray_statemachineviewer.desktop
-usr/lib/*/gammaray/*/qt5*/gammaray_statemachineviewer_plugin.so
-usr/lib/*/gammaray/*/qt5*/gammaray_styleinspector.desktop
-usr/lib/*/gammaray/*/qt5*/gammaray_styleinspector_plugin.so
-usr/lib/*/gammaray/*/qt5*/gammaray_timertop.desktop
-usr/lib/*/gammaray/*/qt5*/gammaray_timertop_plugin.so
-usr/lib/*/gammaray/*/qt5*/gammaray_widgetinspector.desktop
-usr/lib/*/gammaray/*/qt5*/gammaray_widgetinspector_plugin.so
-usr/lib/*/gammaray/*/qt5*/libgammaray_widget_export_actions.so
-usr/lib/*/qt5/plugins/*
+usr/lib/libgammaray*qt5*.so.*
+usr/lib/gammaray/libexec
+usr/lib/gammaray/*/qt5*/*_ui.desktop
+usr/lib/gammaray/*/qt5*/*_ui_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_actioninspector.desktop
+usr/lib/gammaray/*/qt5*/gammaray_actioninspector_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_codecbrowser.desktop
+usr/lib/gammaray/*/qt5*/gammaray_codecbrowser_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_fontbrowser.desktop
+usr/lib/gammaray/*/qt5*/gammaray_fontbrowser_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_inprocessui.so
+usr/lib/gammaray/*/qt5*/gammaray_probe.so
+usr/lib/gammaray/*/qt5*/gammaray_sceneinspector.desktop
+usr/lib/gammaray/*/qt5*/gammaray_sceneinspector_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_scriptenginedebugger.desktop
+usr/lib/gammaray/*/qt5*/gammaray_scriptenginedebugger_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_selectionmodelinspector.desktop
+usr/lib/gammaray/*/qt5*/gammaray_selectionmodelinspector_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_statemachineviewer.desktop
+usr/lib/gammaray/*/qt5*/gammaray_statemachineviewer_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_styleinspector.desktop
+usr/lib/gammaray/*/qt5*/gammaray_styleinspector_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_timertop.desktop
+usr/lib/gammaray/*/qt5*/gammaray_timertop_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_widgetinspector.desktop
+usr/lib/gammaray/*/qt5*/gammaray_widgetinspector_plugin.so
+usr/lib/gammaray/*/qt5*/libgammaray_widget_export_actions.so
usr/share
diff --git a/debian/patches/debian-multiarch.patch b/debian/patches/debian-multiarch.patch
deleted file mode 100644
index 4bece15..0000000
--- a/debian/patches/debian-multiarch.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Tue, 31 Dec 2013 01:31:41 +0100
-Subject: debian-multiarch
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7d808cc..430caeb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -152,7 +152,7 @@ endif()
-
- set(BIN_INSTALL_DIR "bin")
- set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
--set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
-+set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}/${CMAKE_LIBRARY_ARCHITECTURE}")
- set(INCLUDE_INSTALL_DIR "include/gammaray")
- if(WIN32)
- set(PLUGIN_INSTALL_DIR "plugins")
diff --git a/debian/patches/series b/debian/patches/series
index dc4eccd..73cb43e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
use-empty-rpath.patch
find-qt5-webkit-5.1.patch
-debian-multiarch.patch
--
gammaray packaging
More information about the pkg-kde-commits
mailing list