[mate-desktop] 06/06: mate-user-guide: Move .desktop file for mate-user-guide into mate-user-guide bin:package. Adapt lintian override, add Breaks: entry to control file, adapt *.install files.

Mike Gabriel sunweaver at debian.org
Sun Aug 30 14:24:54 UTC 2015


This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository mate-desktop.

commit 076de310344fee5617795fe961a3a8455cc9aa7a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Aug 30 16:15:06 2015 +0200

    mate-user-guide: Move .desktop file for mate-user-guide into mate-user-guide bin:package. Adapt lintian override, add Breaks: entry to control file, adapt *.install files.
---
 debian/control                           | 1 +
 debian/mate-desktop.install              | 3 ++-
 debian/mate-desktop.lintian-overrides    | 2 --
 debian/mate-user-guide.install           | 1 +
 debian/mate-user-guide.lintian-overrides | 2 ++
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index f978f82..6d650cb 100644
--- a/debian/control
+++ b/debian/control
@@ -70,6 +70,7 @@ Architecture: all
 Depends: ${misc:Depends},
          yelp,
 Breaks: mate-desktop-common (<< 1.10.1-2),
+        mate-desktop (<< 1.10.2-1~),
 Description: MATE Desktop User Guide
  The MATE Desktop Environment is the continuation of GNOME 2. It provides an
  intuitive and attractive desktop environment using traditional metaphors for
diff --git a/debian/mate-desktop.install b/debian/mate-desktop.install
index 68bc965..75627a8 100644
--- a/debian/mate-desktop.install
+++ b/debian/mate-desktop.install
@@ -1,3 +1,4 @@
 usr/bin/
-usr/share/applications/
+usr/share/applications/mate-color-select.desktop
+usr/share/applications/mate-about.desktop
 usr/share/man/
diff --git a/debian/mate-desktop.lintian-overrides b/debian/mate-desktop.lintian-overrides
deleted file mode 100644
index 900a281..0000000
--- a/debian/mate-desktop.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# we hard-depend on yelp for displaying the mate-user-guide
-mate-desktop: desktop-command-not-in-package usr/share/applications/mate-user-guide.desktop yelp
diff --git a/debian/mate-user-guide.install b/debian/mate-user-guide.install
index 2b4b6f9..866cdfc 100644
--- a/debian/mate-user-guide.install
+++ b/debian/mate-user-guide.install
@@ -1 +1,2 @@
 usr/share/help/
+usr/share/applications/mate-user-guide.desktop
diff --git a/debian/mate-user-guide.lintian-overrides b/debian/mate-user-guide.lintian-overrides
new file mode 100644
index 0000000..71aa162
--- /dev/null
+++ b/debian/mate-user-guide.lintian-overrides
@@ -0,0 +1,2 @@
+# we hard-depend on yelp for displaying the mate-user-guide
+mate-user-guide: desktop-command-not-in-package usr/share/applications/mate-user-guide.desktop yelp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-desktop.git



More information about the pkg-mate-commits mailing list