[SCM] Packaging of KVIrc (formerly maintained in Hg) branch, master, updated. debian/4.1.3+20110929.svn5980-1

Thu Sep 29 14:53:12 UTC 2011

The following commit has been merged in the master branch:
commit dd4e895ed9940cd320a8b2cb6fe3949d4703f758
Author: Kai Wasserbäch <curan at debian.org>
Date:   Thu Sep 29 14:15:30 2011 +0200

    Make KVIrc multiarch ready.
    
    * debian/{kvirc,libkvilib4,kvirc-modules}.install: Split out binaries
      under /usr/lib.
    * debian/rules: Add -DLIB_SUFFIX to dh_auto_configure invocation.
    * debian/control:
      - Added new packages (needed for split).
      - Added Multi-Arch fields
      - Added Pre-Depends: multiarch-support and ${misc:Pre-Depends} where
        needed.
      - Bumped B-D on CMake.
    * debian/{kvirc,libkvilib4,kvirc-modules}.lintian-overrides: Moved and
      updated overrides to match new locations (one could be dropped in the
      process).
---
 debian/changelog                       |   13 ++++++
 debian/control                         |   67 +++++++++++++++++++++++++++++--
 debian/kvirc-modules.install           |    1 +
 debian/kvirc-modules.lintian-overrides |    1 +
 debian/kvirc.install                   |    2 -
 debian/kvirc.lintian-overrides         |    5 --
 debian/libkvilib4.install              |    1 +
 debian/libkvilib4.lintian-overrides    |    1 +
 debian/rules                           |    5 +-
 9 files changed, 82 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e79095..b7db01e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,19 @@ kvirc (4:4.1.3+20110929.svn5980-1) UNRELEASED; urgency=low
     - Bumped B-D on debhelper to >= 8.9.4.
   * debian/rules: Remove a now obsolete flag.
   * debian/compat: Now at 9.
+  * Make KVIrc multiarch ready:
+    - debian/{kvirc,libkvilib4,kvirc-modules}.install: Split out binaries
+      under /usr/lib.
+    - debian/rules: Add -DLIB_SUFFIX to dh_auto_configure invocation.
+    - debian/control:
+      + Added new packages (needed for split).
+      + Added Multi-Arch fields
+      + Added Pre-Depends: multiarch-support and ${misc:Pre-Depends} where
+        needed.
+      + Bumped B-D on CMake.
+    - debian/{kvirc,libkvilib4,kvirc-modules}.lintian-overrides: Moved and
+      updated overrides to match new locations (one could be dropped in the
+      process).
 
  -- Kai Wasserbäch <curan at debian.org>  Thu, 29 Sep 2011 13:54:39 +0200
 
diff --git a/debian/control b/debian/control
index bab7207..202399f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,18 @@
 Source: kvirc
-Build-Depends: debhelper (>= 8.9.4), cmake, kdelibs5-dev, libperl-dev,
- pkg-kde-tools, zlib1g-dev, libx11-dev, libxrender-dev, libssl-dev,
- libqt4-dev, pkg-config, libxss-dev, python-dev, libqtwebkit-dev
+Build-Depends: debhelper (>= 8.9.4),
+ cmake (>= 2.8.4+dfsg.1-3),
+ kdelibs5-dev,
+ libperl-dev,
+ pkg-kde-tools,
+ zlib1g-dev,
+ libx11-dev,
+ libxrender-dev,
+ libssl-dev,
+ libqt4-dev,
+ pkg-config,
+ libxss-dev,
+ python-dev,
+ libqtwebkit-dev
 Section: net
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
@@ -15,8 +26,14 @@ Homepage: http://www.kvirc.de/
 
 Package: kvirc
 Architecture: any
-Depends: kvirc-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: multiarch-support, ${misc:Pre-Depends}
+Depends: libkvilib4 (= ${binary:Version}),
+ kvirc-modules (= ${binary:Version}),
+ kvirc-data (= ${source:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
 Suggests: kvirc-dbg (= ${binary:Version})
+Multi-Arch: same
 Description: KDE-based next generation IRC client with module support
  A highly configurable graphical IRC client with an MDI interface,
  built-in scripting language, support for IRC DCC, drag & drop file
@@ -28,10 +45,47 @@ Description: KDE-based next generation IRC client with module support
  wrong choice as it is rather big. But if you want a highly customizable client
  you won't regret the installation.
 
+Package: libkvilib4
+Architecture: any
+Section: libs
+Pre-Depends: multiarch-support, ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: kvirc (= ${binary:Version})
+Suggests: kvirc-dbg (= ${binary:Version})
+Multi-Arch: same
+Description: KVIrc (IRC client) base library
+ A highly configurable graphical IRC client with an MDI interface,
+ built-in scripting language, support for IRC DCC, drag & drop file
+ browsing, and much more. KVIrc uses the KDE widget set, can be extended
+ using its own scripting language, integrates with KDE, and supports
+ custom plugins.
+ .
+ This package contains the main library of KVIrc.
+
+Package: kvirc-modules
+Architecture: any
+Section: libs
+Pre-Depends: multiarch-support, ${misc:Pre-Depends}
+Depends: libkvilib4 (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Recommends: kvirc (= ${binary:Version})
+Suggests: kvirc-dbg (= ${binary:Version})
+Multi-Arch: same
+Description: KVIrc (IRC client) modules
+ A highly configurable graphical IRC client with an MDI interface,
+ built-in scripting language, support for IRC DCC, drag & drop file
+ browsing, and much more. KVIrc uses the KDE widget set, can be extended
+ using its own scripting language, integrates with KDE, and supports
+ custom plugins.
+ .
+ This package contains all modules for KVIrc.
+
 Package: kvirc-data
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: kvirc (>= ${source:Version})
+Multi-Arch: foreign
 Description: Data files for KVIrc
  This package contains the architecture-independent data needed by KVIrc in
  order to run, such as icons and images, language files, and shell scripts.
@@ -42,7 +96,10 @@ Package: kvirc-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: kvirc (= ${binary:Version}), ${misc:Depends}
+Depends: kvirc (= ${binary:Version}),
+ libkvilib4 (= ${binary:Version}),
+ kvirc-modules (= ${binary:Version}),
+ ${misc:Depends}
 Description: KVIrc (IRC client) debugging symbols
  A highly configurable graphical IRC client with an MDI interface,
  built-in scripting language, support for IRC DCC, drag & drop file
diff --git a/debian/kvirc-modules.install b/debian/kvirc-modules.install
new file mode 100644
index 0000000..2566481
--- /dev/null
+++ b/debian/kvirc-modules.install
@@ -0,0 +1 @@
+usr/lib/*/kvirc/*/modules/*.so
diff --git a/debian/kvirc-modules.lintian-overrides b/debian/kvirc-modules.lintian-overrides
new file mode 100644
index 0000000..5674e86
--- /dev/null
+++ b/debian/kvirc-modules.lintian-overrides
@@ -0,0 +1 @@
+kvirc-modules: spelling-error-in-binary */libkvilanguage.so ment meant
diff --git a/debian/kvirc.install b/debian/kvirc.install
index 744b155..eda0fef 100644
--- a/debian/kvirc.install
+++ b/debian/kvirc.install
@@ -1,6 +1,4 @@
 usr/bin/kvirc
-usr/lib/*.so.*
-usr/lib/kvirc/*/modules/*.so
 usr/share/applications/kvirc.desktop
 usr/share/man/*/man1/kvirc.1
 usr/share/man/man1/kvirc.1
diff --git a/debian/kvirc.lintian-overrides b/debian/kvirc.lintian-overrides
index 180be5a..42a2833 100644
--- a/debian/kvirc.lintian-overrides
+++ b/debian/kvirc.lintian-overrides
@@ -1,7 +1,2 @@
 #The file is in the kvirc-data on which kvirc depends.
 kvirc: menu-icon-missing usr/share/pixmaps/kvirc32x32.xpm
-#Library just used for kvirc.
-kvirc: package-name-doesnt-match-sonames libkvilib4
-kvirc: no-symbols-control-file usr/lib/libkvilib.so.4.1.1
-# false positive
-kvirc: spelling-error-in-binary usr/lib/kvirc/4.1/modules/libkvilanguage.so ment meant
diff --git a/debian/libkvilib4.install b/debian/libkvilib4.install
new file mode 100644
index 0000000..3de3b10
--- /dev/null
+++ b/debian/libkvilib4.install
@@ -0,0 +1 @@
+usr/lib/*/*.so.*
diff --git a/debian/libkvilib4.lintian-overrides b/debian/libkvilib4.lintian-overrides
new file mode 100644
index 0000000..2c1de10
--- /dev/null
+++ b/debian/libkvilib4.lintian-overrides
@@ -0,0 +1 @@
+libkvilib4: no-symbols-control-file */libkvilib.so.4.1.3
diff --git a/debian/rules b/debian/rules
index 86ec42c..7166c75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ REV = $(shell echo $(UPVERSION) | sed -e 's/^.*svn//' -e 's/\+rc[0-9]$$//')
 # the following variable which gives us a cleaner buildd output (idea taken
 # from the mesa package).
 NOT_INSTALLED := \
-				usr/lib/libkvilib.so \
+				usr/lib/$(DEB_HOST_MULTIARCH)/libkvilib.so \
 				usr/bin/kvirc-config \
 				usr/share/kvirc/4.1/license/LICENSE-GPLV2 \
 				usr/share/kvirc/4.1/license/LICENSE-GPLV3 \
@@ -24,7 +24,8 @@ override_dh_auto_configure:
 			-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
 			-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
 			-DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
-			-DMANUAL_REVISION=$(REV)
+			-DMANUAL_REVISION=$(REV) \
+			-DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
 
 override_dh_install:
 	set -e; for file in $(NOT_INSTALLED); do rm debian/tmp/$$file; done

-- 
Packaging of KVIrc (formerly maintained in Hg)

