[SCM] kompare packaging branch, kubuntu_stable, updated. debian/4.14.0-1-23-ga4fce98

Harald Sitter apachelogger-guest at moszumanska.debian.org
Wed Apr 8 09:30:16 UTC 2015


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

The following commit has been merged in the kubuntu_stable branch:
commit a4fce98614096613dd0ea07529939c169d688d58
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Apr 8 11:30:10 2015 +0200

    split package
---
 debian/control                         | 56 ++++++++++++++++++++++++++++++----
 debian/kompare.install                 |  7 +++++
 debian/kpart5-kompare.install          |  9 ++++++
 debian/libkompareinterface-dev.install |  2 ++
 debian/libkompareinterface5.install    |  1 +
 5 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index bc9afc4..56fb168 100644
--- a/debian/control
+++ b/debian/control
@@ -10,17 +10,17 @@ Uploaders: Sune Vuorela <sune at debian.org>,
 Build-Depends: cmake,
                debhelper (>= 9),
                extra-cmake-modules (>= 0.0.9),
-               libkf5coreaddons-dev,
-               libkf5codecs-dev,
                kdoctools-dev,
+               libkf5codecs-dev,
+               libkf5config-dev,
+               libkf5coreaddons-dev,
                libkf5iconthemes-dev,
                libkf5jobwidgets-dev,
-               libkf5config-dev,
                libkf5parts-dev,
                libkf5texteditor-dev,
                libkf5widgetsaddons-dev,
-               pkg-kde-tools (>= 0.12),
-               libkomparediff2-dev (>= 4:14.12.3)
+               libkomparediff2-dev (>= 4:14.12.3),
+               pkg-kde-tools (>= 0.12)
 Standards-Version: 3.9.5
 Homepage: http://www.kde.org/
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/kompare.git/
@@ -29,7 +29,9 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/kompare.git
 Package: kompare
 Architecture: any
 Section: devel
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: kpart5-kompare (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Suggests: khelpcenter
 Description: file difference viewer
  Kompare displays the differences between files.  It can compare the
@@ -37,3 +39,45 @@ Description: file difference viewer
  files.
  .
  This package is part of the KDE Software Development Kit module.
+
+Package: kpart5-kompare
+Architecture: any
+Section: devel
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: kompare (<< 14.12.3+git20150408)
+Replaces: kompare (<< 14.12.3+git20150408)
+Description: file difference viewer - kpart
+ Kompare displays the differences between files.  It can compare the
+ contents of files or directories, as well as create, display, and merge patch
+ files.
+ .
+ This package is part of the KDE Software Development Kit module.
+
+Package: libkompareinterface-dev
+Architecture: any
+Section: devel
+Depends: libkompareinterface5 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: kompare (<< 14.12.3+git20150408)
+Replaces: kompare (<< 14.12.3+git20150408)
+Description: file difference viewer - kpart interface library development files
+ Kompare displays the differences between files.  It can compare the
+ contents of files or directories, as well as create, display, and merge patch
+ files.
+ .
+ This package is part of the KDE Software Development Kit module.
+
+Package: libkompareinterface5
+Architecture: any
+Section: devel
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: kpart5-kompare
+Breaks: kompare (<< 14.12.3+git20150408)
+Replaces: kompare (<< 14.12.3+git20150408)
+Description: file difference viewer - kpart interface library
+ Kompare displays the differences between files.  It can compare the
+ contents of files or directories, as well as create, display, and merge patch
+ files.
+ .
+ This package is part of the KDE Software Development Kit module.
diff --git a/debian/kompare.install b/debian/kompare.install
new file mode 100644
index 0000000..a414c2e
--- /dev/null
+++ b/debian/kompare.install
@@ -0,0 +1,7 @@
+usr/bin/kompare
+usr/lib/*/libkomparedialogpages.so.5
+usr/share/applications/kompare.desktop
+usr/share/doc/
+usr/share/kompare/
+usr/share/kompare/kompareui.rc
+usr/share/man/
diff --git a/debian/kpart5-kompare.install b/debian/kpart5-kompare.install
new file mode 100644
index 0000000..94f3d16
--- /dev/null
+++ b/debian/kpart5-kompare.install
@@ -0,0 +1,9 @@
+usr/lib/*/qt5/plugins/komparenavtreepart.so
+usr/lib/*/qt5/plugins/komparepart.so
+usr/share/icons/hicolor/*/apps/kompare.png
+usr/share/icons/hicolor/*/apps/kompare.svgz
+usr/share/kompare/komparepartui.rc
+usr/share/kservices5/komparenavtreepart.desktop
+usr/share/kservices5/komparepart.desktop
+usr/share/kservicetypes5/komparenavigationpart.desktop
+usr/share/kservicetypes5/kompareviewpart.desktop
diff --git a/debian/libkompareinterface-dev.install b/debian/libkompareinterface-dev.install
new file mode 100644
index 0000000..692eae8
--- /dev/null
+++ b/debian/libkompareinterface-dev.install
@@ -0,0 +1,2 @@
+usr/include/kompare/*
+usr/lib/*/libkompareinterface.so
diff --git a/debian/libkompareinterface5.install b/debian/libkompareinterface5.install
new file mode 100644
index 0000000..ca98ec2
--- /dev/null
+++ b/debian/libkompareinterface5.install
@@ -0,0 +1 @@
+usr/lib/*/libkompareinterface.so.5

-- 
kompare packaging



More information about the pkg-kde-commits mailing list