DEB tdegraphics: Fix empty libkscan-trinity-dev package.

Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 0a8ae6fc0eb3115ae4ba96cbe7c9c08d275d4f23)

12 files changed, 18 insertions, 15 deletions

diff --git a/debian/_base/core/tdegraphics/debian/control b/debian/_base/core/tdegraphics/debian/control
index c8f05c829..760fa0869 100644
--- a/debian/_base/core/tdegraphics/debian/control
+++ b/debian/_base/core/tdegraphics/debian/control
@@ -75,7 +75,7 @@ Package: tdegraphics-trinity-dev
 Section: devel
 Architecture: any
 Replaces: kdegraphics-trinity-dev (<< 4:14.0.0~)
-Breaks: kdegraphics-trinity-dev (<< 4:14.0.0~)
+Breaks: kdegraphics-trinity-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.12~)
 Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs14-trinity-dev
 Description: development files for the TDE graphics module
  This package contains headers and other development files for the TDE
@@ -375,8 +375,8 @@ Description: generic framework for viewer applications in Trinity
 Package: libkscan-trinity-dev
 Section: libdevel
 Architecture: any
-Replaces: libkscan-trinity-dev (<< 4:14.0.0~)
-Breaks: libkscan-trinity-dev (<< 4:14.0.0~)
+Replaces: libkscan-trinity-dev (<< 4:14.0.0~), tdegraphics-trinity-dev (<< 4:14.0.12~)
+Breaks: libkscan-trinity-dev (<< 4:14.0.0~), tdegraphics-trinity-dev (<< 4:14.0.12~)
 Depends: libkscan1-trinity (= ${binary:Version}), tdelibs14-trinity-dev
 Description: development files for the Trinity scanner library
  This package contains development files for Trinity's scanner library.
diff --git a/debian/_base/core/tdegraphics/debian/libkscan-dev-trinity.install b/debian/_base/core/tdegraphics/debian/libkscan-dev-trinity.install
deleted file mode 100644
index 29764eb5d..000000000
--- a/debian/_base/core/tdegraphics/debian/libkscan-dev-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/opt/trinity/lib/libkscan.so
diff --git a/debian/_base/core/tdegraphics/debian/libkscan-trinity-dev.install b/debian/_base/core/tdegraphics/debian/libkscan-trinity-dev.install
new file mode 100644
index 000000000..2aff7e3a2
--- /dev/null
+++ b/debian/_base/core/tdegraphics/debian/libkscan-trinity-dev.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libkscan.so
+debian/tmp/opt/trinity/share/cmake/libkscan.cmake
diff --git a/debian/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install b/debian/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install
index f5f48fee4..cf86e92ab 100644
--- a/debian/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install
+++ b/debian/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install
@@ -194,4 +194,4 @@ debian/tmp/opt/trinity/lib/libksvg.so
 debian/tmp/opt/trinity/lib/libtext2path.la
 debian/tmp/opt/trinity/lib/libtext2path.so
 
-debian/tmp/opt/trinity/share/cmake
+debian/tmp/opt/trinity/share/cmake/kviewshell.cmake
diff --git a/dilos/core/tdegraphics/debian/control b/dilos/core/tdegraphics/debian/control
index b9e2824f5..fa7773eef 100644
--- a/dilos/core/tdegraphics/debian/control
+++ b/dilos/core/tdegraphics/debian/control
@@ -75,7 +75,7 @@ Package: tdegraphics-trinity-dev
 Section: devel
 Architecture: any
 Replaces: kdegraphics-trinity-dev (<< 4:14.0.0~)
-Breaks: kdegraphics-trinity-dev (<< 4:14.0.0~)
+Breaks: kdegraphics-trinity-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.12~)
 Depends: kghostview-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs14-trinity-dev
 Description: development files for the TDE graphics module
  This package contains headers and other development files for the TDE
@@ -379,8 +379,8 @@ Description: generic framework for viewer applications in Trinity
 Package: libkscan-trinity-dev
 Section: libdevel
 Architecture: any
-Replaces: libkscan-trinity-dev (<< 4:14.0.0~)
-Breaks: libkscan-trinity-dev (<< 4:14.0.0~)
+Replaces: libkscan-trinity-dev (<< 4:14.0.0~), tdegraphics-trinity-dev (<< 4:14.0.12~)
+Breaks: libkscan-trinity-dev (<< 4:14.0.0~), tdegraphics-trinity-dev (<< 4:14.0.12~)
 Depends: libkscan1-trinity (= ${binary:Version}), tdelibs14-trinity-dev
 Description: development files for the Trinity scanner library
  This package contains development files for Trinity's scanner library.
diff --git a/dilos/core/tdegraphics/debian/libkscan-dev-trinity.install b/dilos/core/tdegraphics/debian/libkscan-dev-trinity.install
deleted file mode 100644
index e3501d75a..000000000
--- a/dilos/core/tdegraphics/debian/libkscan-dev-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*/libkscan.so
diff --git a/dilos/core/tdegraphics/debian/libkscan-trinity-dev.install b/dilos/core/tdegraphics/debian/libkscan-trinity-dev.install
new file mode 100644
index 000000000..ad0460ce2
--- /dev/null
+++ b/dilos/core/tdegraphics/debian/libkscan-trinity-dev.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/*/libkscan.so
+debian/tmp/usr/share/cmake/libkscan.cmake
diff --git a/dilos/core/tdegraphics/debian/tdegraphics-trinity-dev.install b/dilos/core/tdegraphics/debian/tdegraphics-trinity-dev.install
index e28160a1f..b603b9f83 100644
--- a/dilos/core/tdegraphics/debian/tdegraphics-trinity-dev.install
+++ b/dilos/core/tdegraphics/debian/tdegraphics-trinity-dev.install
@@ -193,4 +193,4 @@ debian/tmp/usr/lib/*/libksvg.so
 debian/tmp/usr/lib/*/libtext2path.la
 debian/tmp/usr/lib/*/libtext2path.so
 
-debian/tmp/usr/share/cmake
+debian/tmp/usr/share/cmake/kviewshell.cmake
diff --git a/ubuntu/_base/core/tdegraphics/debian/control b/ubuntu/_base/core/tdegraphics/debian/control
index e1a7e944e..bb1c7c752 100644
--- a/ubuntu/_base/core/tdegraphics/debian/control
+++ b/ubuntu/_base/core/tdegraphics/debian/control
@@ -75,7 +75,7 @@ Package: tdegraphics-trinity-dev
 Section: devel
 Architecture: any
 Replaces: kdegraphics-kde3-dev (<< 4:14.0.0~), kdegraphics-trinity-dev (<< 4:14.0.0~)
-Breaks: kdegraphics-kde3-dev (<< 4:14.0.0~), kdegraphics-trinity-dev (<< 4:14.0.0~)
+Breaks: kdegraphics-kde3-dev (<< 4:14.0.0~), kdegraphics-trinity-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.12~)
 Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs14-trinity-dev
 Description: development files for the TDE graphics module
  This package contains headers and other development files for the TDE
@@ -375,8 +375,8 @@ Description: generic framework for viewer applications in Trinity
 Package: libkscan-trinity-dev
 Section: libdevel
 Architecture: any
-Replaces: libkscan-kde3-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.0~)
-Breaks: libkscan-kde3-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.0~)
+Replaces: libkscan-kde3-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.0~), tdegraphics-trinity-dev (<< 4:14.0.12~)
+Breaks: libkscan-kde3-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.0~), tdegraphics-trinity-dev (<< 4:14.0.12~)
 Depends: libkscan1-trinity (= ${binary:Version}), tdelibs14-trinity-dev
 Description: development files for the Trinity scanner library
  This package contains development files for Trinity's scanner library.
diff --git a/ubuntu/_base/core/tdegraphics/debian/libkscan-dev-trinity.install b/ubuntu/_base/core/tdegraphics/debian/libkscan-dev-trinity.install
deleted file mode 100644
index 29764eb5d..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/libkscan-dev-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/opt/trinity/lib/libkscan.so
diff --git a/ubuntu/_base/core/tdegraphics/debian/libkscan-trinity-dev.install b/ubuntu/_base/core/tdegraphics/debian/libkscan-trinity-dev.install
new file mode 100644
index 000000000..2aff7e3a2
--- /dev/null
+++ b/ubuntu/_base/core/tdegraphics/debian/libkscan-trinity-dev.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libkscan.so
+debian/tmp/opt/trinity/share/cmake/libkscan.cmake
diff --git a/ubuntu/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install b/ubuntu/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install
index f5f48fee4..cf86e92ab 100644
--- a/ubuntu/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install
+++ b/ubuntu/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install
@@ -194,4 +194,4 @@ debian/tmp/opt/trinity/lib/libksvg.so
 debian/tmp/opt/trinity/lib/libtext2path.la
 debian/tmp/opt/trinity/lib/libtext2path.so
 
-debian/tmp/opt/trinity/share/cmake
+debian/tmp/opt/trinity/share/cmake/kviewshell.cmake