[SCM] KDE Graphics module packaging branch, master, updated. debian/4.6.3-1-2-ge624f08

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Mon May 30 21:43:13 UTC 2011


The following commit has been merged in the master branch:
commit e624f08a410fe7d0bce1f67e5650af0adc1f2163
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Mon May 30 23:44:39 2011 +0200

    Move a couple of files from okular to kruler and ksnapshot.
---
 debian/changelog         |    4 ++++
 debian/control           |    4 ++++
 debian/kruler.install    |    1 +
 debian/ksnapshot.install |    1 +
 debian/okular.install    |    2 --
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 08393ed..d5051a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 kdegraphics (4:4.6.3-2) UNRELEASED; urgency=low
 
+  * Move these files
+    - usr/share/doc/kde/HTML/en/kruler/kruler-settings.png
+    - usr/share/doc/kde/HTML/en/ksnapshot/send-to-menu.png
+    to kruler and ksnapshot respectively.
 
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Mon, 30 May 2011 22:15:01 +0200
 
diff --git a/debian/control b/debian/control
index c42b38e..d3d9041 100644
--- a/debian/control
+++ b/debian/control
@@ -133,6 +133,8 @@ Package: kruler
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: okular (<= 4:4.6.3-2~)
+Replaces: okular (<= 4:4.6.3-2~)
 Description: screen ruler
  KRuler is a tool for measuring the size, in pixels, of items on the screen.
  .
@@ -165,6 +167,8 @@ Package: ksnapshot
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: okular (<= 4:4.6.3-2~)
+Replaces: okular (<= 4:4.6.3-2~)
 Description: screen capture tool
  KSnapshot captures images of the screen.  It can capture the whole screen,
  a specified region, an individual window, or only part of a window.
diff --git a/debian/kruler.install b/debian/kruler.install
index b7ca0e6..0904cb9 100644
--- a/debian/kruler.install
+++ b/debian/kruler.install
@@ -1,4 +1,5 @@
 usr/bin/kruler
+usr/share/doc/kde/HTML/en/kruler/kruler-settings.png
 usr/share/applications/kde4/kruler.desktop
 usr/share/doc/kde/HTML/en/kruler/common
 usr/share/doc/kde/HTML/en/kruler/index.cache.bz2
diff --git a/debian/ksnapshot.install b/debian/ksnapshot.install
index b771668..dcdac0e 100644
--- a/debian/ksnapshot.install
+++ b/debian/ksnapshot.install
@@ -1,4 +1,5 @@
 usr/bin/kbackgroundsnapshot
+usr/share/doc/kde/HTML/en/ksnapshot/send-to-menu.png
 usr/bin/ksnapshot
 usr/share/applications/kde4/ksnapshot.desktop
 usr/share/dbus-1/interfaces/org.kde.ksnapshot.xml
diff --git a/debian/okular.install b/debian/okular.install
index de44c74..b7dc5d2 100644
--- a/debian/okular.install
+++ b/debian/okular.install
@@ -23,8 +23,6 @@ usr/share/applications/kde4/okularApplication_ooo.desktop
 usr/share/applications/kde4/okularApplication_pdf.desktop
 usr/share/applications/kde4/okularApplication_plucker.desktop
 usr/share/applications/kde4/okularApplication_xps.desktop
-usr/share/doc/kde/HTML/en/kruler/kruler-settings.png
-usr/share/doc/kde/HTML/en/ksnapshot/send-to-menu.png
 usr/share/doc/kde/HTML/en/okular/annotation-properties.png
 usr/share/doc/kde/HTML/en/okular/annotations.png
 usr/share/doc/kde/HTML/en/okular/common

-- 
KDE Graphics module packaging



More information about the pkg-kde-commits mailing list