[SCM] libksane packaging branch, master, updated. debian/15.08.2-1-11-gf41eef9

Wed Jan 27 19:53:06 UTC 2016

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/libksane.git;a=commitdiff;h=9085cf4

The following commit has been merged in the master branch:
commit 9085cf43daafa7ab2b9545d674f2176c85dbd09b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Jan 18 20:31:44 2016 +0100

    Follow upstream library rename.
---
 debian/changelog                                  |  2 +-
 debian/control                                    | 34 ++++-------------------
 debian/{libksane0.acc => libkf5sane-dev.acc.in}   |  7 +++--
 debian/libkf5sane-dev.install                     |  4 +++
 debian/libkf5sane5.install                        |  2 ++
 debian/{libksane0.symbols => libkf5sane5.symbols} |  2 +-
 debian/libksane-data.install                      |  3 --
 debian/libksane-dev.install                       |  6 ----
 debian/libksane0.install                          |  2 --
 debian/rules                                      |  5 +---
 10 files changed, 18 insertions(+), 49 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f74cfe9..3667f7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libksane (4:15.12.0-1~) UNRELEASED; urgency=medium
+libkf5sane (15.12.0-1~) UNRELEASED; urgency=medium
 
   * New upstream release (15.12.0).
 
diff --git a/debian/control b/debian/control
index 3b8651a..fb11a1e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: libksane
+Source: libkf5sane
 Section: kde
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
@@ -21,11 +21,10 @@ Homepage: https://projects.kde.org/projects/kde/kdegraphics/libs/libksane
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/libksane.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/libksane.git
 
-Package: libksane0
+Package: libkf5sane5
 Section: libs
 Architecture: any
-Depends: libksane-data (>= ${source:Version}),
-         ${misc:Depends},
+Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: scanner library (runtime)
  The KDE scanner library provides an API and widgets for using scanners and
@@ -33,22 +32,10 @@ Description: scanner library (runtime)
  .
  This package contains the shared library.
 
-Package: libksane-data
-Section: libs
-Architecture: all
-Depends: ${misc:Depends}
-Breaks: kdegraphics-libs-data (<< 4:4.6.80)
-Replaces: kdegraphics-libs-data (<< 4:4.6.80)
-Description: scanner library (data files)
- The KDE scanner library provides an API and widgets for using scanners and
- other imaging devices supported by SANE.
- .
- This package contains the shared data.
-
-Package: libksane-dev
+Package: libkf5sane-dev
 Section: libdevel
 Architecture: any
-Depends: libksane0 (= ${binary:Version}),
+Depends: libkf5sane5 (= ${binary:Version}),
          ${misc:Depends},
          ${sameVersionDep:kdelibs5-dev:libksane0}
 Description: scanner library development headers
@@ -56,14 +43,3 @@ Description: scanner library development headers
  other imaging devices supported by SANE.
  .
  This package contains the scanner library development files.
-
-Package: libksane-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends: kde-runtime-dbg, libksane0 (= ${binary:Version}), ${misc:Depends}
-Replaces: kdegraphics-dbg, okular-dbg (<< 4:4.6.80)
-Breaks: kdegraphics-dbg, okular-dbg (<< 4:4.6.80)
-Description: debugging symbols for libksane
- This package contains debugging files used to investigate problems with
- binaries included in the KDE scanner library.
diff --git a/debian/libksane0.acc b/debian/libkf5sane-dev.acc.in
similarity index 50%
rename from debian/libksane0.acc
rename to debian/libkf5sane-dev.acc.in
index a757bad..2333868 100644
--- a/debian/libksane0.acc
+++ b/debian/libkf5sane-dev.acc.in
@@ -2,15 +2,16 @@
 <descriptor>
 
 <version>
-    4.11.3
+    15.12.0
 </version>
 
 <headers>
-    /usr/include/libksane
+    /usr/include/KF5/KSane/
+    /usr/include/KF5/ksane_version.h
 </headers>
 
 <libs>
-    /usr/lib/libksane.so
+    /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5Sane.so
 </libs>
 
 </descriptor>
diff --git a/debian/libkf5sane-dev.install b/debian/libkf5sane-dev.install
new file mode 100644
index 0000000..b5ed4c5
--- /dev/null
+++ b/debian/libkf5sane-dev.install
@@ -0,0 +1,4 @@
+usr/include/KF5/KSane/
+usr/include/KF5/ksane_version.h
+usr/lib/*/cmake/KF5Sane/
+usr/lib/*/libkKF5Sane.so
diff --git a/debian/libkf5sane5.install b/debian/libkf5sane5.install
new file mode 100644
index 0000000..e631579
--- /dev/null
+++ b/debian/libkf5sane5.install
@@ -0,0 +1,2 @@
+usr/lib/*/libKF5Sane.so.5
+usr/lib/*/libKF5Sane.so.5.*
diff --git a/debian/libksane0.symbols b/debian/libkf5sane5.symbols
similarity index 98%
rename from debian/libksane0.symbols
rename to debian/libkf5sane5.symbols
index 5378bc8..ed33331 100644
--- a/debian/libksane0.symbols
+++ b/debian/libkf5sane5.symbols
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 4:4.11.5 kfreebsd-amd64 kfreebsd-i386
-libksane.so.0 libksane0 #MINVER#
+libKF5Sane.so.5 libkf5sane5 #MINVER#
  _ZN10KSaneIface11KSaneWidget10currentDPIEv at Base 4:4.3.4
  _ZN10KSaneIface11KSaneWidget10getOptValsER4QMapI7QStringS2_E at Base 4:4.3.4
  _ZN10KSaneIface11KSaneWidget10imageReadyER10QByteArrayiiii at Base 4:4.3.4
diff --git a/debian/libksane-data.install b/debian/libksane-data.install
deleted file mode 100644
index 1666f7a..0000000
--- a/debian/libksane-data.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/icons/hicolor/16x16/actions/black-white.png
-usr/share/icons/hicolor/16x16/actions/color.png
-usr/share/icons/hicolor/16x16/actions/gray-scale.png
diff --git a/debian/libksane-dev.install b/debian/libksane-dev.install
deleted file mode 100644
index d5455b6..0000000
--- a/debian/libksane-dev.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/include/libksane/ksane.h
-usr/include/libksane/libksane_export.h
-usr/include/libksane/version.h
-usr/lib/cmake/KSane/KSaneConfig.cmake
-usr/lib/libksane.so
-usr/lib/pkgconfig/libksane.pc
diff --git a/debian/libksane0.install b/debian/libksane0.install
deleted file mode 100644
index fec0e0c..0000000
--- a/debian/libksane0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libksane.so.0
-usr/lib/libksane.so.0.2.0
diff --git a/debian/rules b/debian/rules
index f9e63ed..d8e4a0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_shlibdeps:
 	$(overridden_command) $(foreach p,$(shell dh_listpackages | grep ^lib),-p$p) -- -xkde-runtime
 	$(overridden_command) --remaining-packages
-
-override_dh_strip:
-	$(overridden_command) --dbg-package=libksane-dbg

-- 
libksane packaging

