[SCM] palapeli packaging branch, master, updated. debian/16.08.0-1-10-gcc75b9f

Pino Toscano pino at moszumanska.debian.org
Sun Dec 31 17:44:48 UTC 2017


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

The following commit has been merged in the master branch:
commit cc75b9f564d57fea6bc8ce83d10543d8b3fef106
Author: Pino Toscano <pino at debian.org>
Date:   Sun Dec 31 18:39:48 2017 +0100

    move some data to palapeli-data
---
 debian/changelog             |  2 ++
 debian/control               |  2 ++
 debian/palapeli-data.install |  2 ++
 debian/palapeli.install      | 13 -------------
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1794446..32ecc6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ palapeli (4:17.08.3-0r1) UNRELEASED; urgency=medium
   * Bump Standards-Version to 4.1.3, no changes required.
   * Simplify watch file, and switch it to https.
   * Update install files.
+  * Move icons, and mimetype file to palapeli-data
+    - add proper breaks/replaces
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 31 Oct 2017 18:04:02 +0100
 
diff --git a/debian/control b/debian/control
index a2017e1..5f53de3 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,8 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/palapeli.git
 Package: palapeli-data
 Architecture: all
 Depends: ${misc:Depends}
+Breaks: palapeli (<< 4:17.08.3~)
+Replaces: palapeli (<< 4:17.08.3~)
 Description: data files for palapeli jigsaw puzzle game
  Data files (puzzles) for the palapeli puzzle game.
  .
diff --git a/debian/palapeli-data.install b/debian/palapeli-data.install
index 92bdc0e..2a5b509 100644
--- a/debian/palapeli-data.install
+++ b/debian/palapeli-data.install
@@ -1,2 +1,4 @@
 usr/share/doc/kde/HTML/en/palapeli/
+usr/share/icons/
 usr/share/kde4/apps/palapeli/
+usr/share/mime/packages/palapeli-mimetypes.xml
diff --git a/debian/palapeli.install b/debian/palapeli.install
index 92d209e..17175cd 100644
--- a/debian/palapeli.install
+++ b/debian/palapeli.install
@@ -6,18 +6,6 @@ usr/lib/kde4/palathumbcreator.so
 usr/lib/libpala.so.0
 usr/lib/libpala.so.0.2.0
 usr/share/applications/kde4/org.kde.palapeli.desktop
-usr/share/icons/hicolor/128x128/apps/palapeli.png
-usr/share/icons/hicolor/128x128/mimetypes/application-x-palapeli.png
-usr/share/icons/hicolor/16x16/apps/palapeli.png
-usr/share/icons/hicolor/16x16/mimetypes/application-x-palapeli.png
-usr/share/icons/hicolor/24x24/apps/palapeli.png
-usr/share/icons/hicolor/24x24/mimetypes/application-x-palapeli.png
-usr/share/icons/hicolor/32x32/apps/palapeli.png
-usr/share/icons/hicolor/32x32/mimetypes/application-x-palapeli.png
-usr/share/icons/hicolor/48x48/apps/palapeli.png
-usr/share/icons/hicolor/48x48/mimetypes/application-x-palapeli.png
-usr/share/icons/hicolor/64x64/apps/palapeli.png
-usr/share/icons/hicolor/64x64/mimetypes/application-x-palapeli.png
 usr/share/kde4/config/palapeli-collectionrc
 usr/share/kde4/services/ServiceMenus/palapeli_servicemenu.desktop
 usr/share/kde4/services/palapeli_goldbergslicer.desktop
@@ -26,4 +14,3 @@ usr/share/kde4/services/palapeli_rectslicer.desktop
 usr/share/kde4/services/palathumbcreator.desktop
 usr/share/kde4/servicetypes/libpala-slicerplugin.desktop
 usr/share/metainfo/org.kde.palapeli.appdata.xml
-usr/share/mime/packages/palapeli-mimetypes.xml

-- 
palapeli packaging



More information about the pkg-kde-commits mailing list