[X2Go-Commits] [x2gothinclient] 07/07: rename bin:package x2gothinclient-minidesktop-mate to x2gothinclient-minidesktop

git-admin at x2go.org git-admin at x2go.org
Fri Aug 22 17:40:13 CEST 2014


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

x2go pushed a commit to branch master
in repository x2gothinclient.

commit 30fc5f2351122f48f2a57d185f5c0b0c317a5d5f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Aug 22 17:40:05 2014 +0200

    rename bin:package x2gothinclient-minidesktop-mate to x2gothinclient-minidesktop
---
 debian/changelog                                   |    2 +-
 debian/control                                     |   10 +++++++---
 debian/x2gothinclient-minidesktop-mate.install     |    4 ----
 debian/x2gothinclient-minidesktop.install          |    5 +++++
 ...ostinst => x2gothinclient-minidesktop.postinst} |    0
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e0f5bd..e2d7a4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ x2gothinclient (1.1.0.3-0x2go1) UNRELEASED; urgency=low
     - Stop advertising GNOME in default session profile. Switching to MATE.
     - Use type=auto for automatic keyboard detection as default in example
       session profiles.
-    - New TCE component: x2gothinclient-minidesktop-mate. Instead of using
+    - New TCE component: x2gothinclient-minidesktop. Instead of using
       X2Go Client as login manager, we launch a minimal MATE desktop and
       connect to X2Go sessions from there.
     - x2gothinclient-minidesktop: Add WindowList applet to MATE panel.
diff --git a/debian/control b/debian/control
index f6b801f..0b502ce 100644
--- a/debian/control
+++ b/debian/control
@@ -92,7 +92,7 @@ Description: Install X2Go Thin Client chroot (meta-package)
  This meta-package installs all X2Go TCE dependencies. This
  package is used in the X2Go Thin Client's chroot.
 
-Package: x2gothinclient-minidesktop-mate
+Package: x2gothinclient-minidesktop
 Architecture: all
 Depends:
  ${misc:Depends},
@@ -105,6 +105,10 @@ Depends:
  mate-settings-daemon-pulse,
  iceweasel,
  libglib2.0-bin,
+Breaks:
+ x2gothinclient-minidesktop-mate (<= 1.0.1.3-0x2go2),
+Replaces:
+ x2gothinclient-minidesktop-mate (<= 1.0.1.3-0x2go2),
 Description: Minimal desktop for X2Go Thin Client chroot (based on MATE)
  X2Go is a server based computing environment with
     - session resuming
@@ -115,8 +119,8 @@ Description: Minimal desktop for X2Go Thin Client chroot (based on MATE)
     - audio support
     - authentication by smartcard and USB stick
  .
- x2gothinclient-minidesktop-mate:
- --------------------------------
+ x2gothinclient-minidesktop:
+ ---------------------------
  This meta-package provides a minimal desktop (based on MATE) as the
  TCE's workspace area. From there you can launch X2Go Sessions, but
  you also have a set of basic applications that run on the thinclient
diff --git a/debian/x2gothinclient-minidesktop-mate.install b/debian/x2gothinclient-minidesktop-mate.install
deleted file mode 100644
index 9eba321..0000000
--- a/debian/x2gothinclient-minidesktop-mate.install
+++ /dev/null
@@ -1,4 +0,0 @@
-x2gothinclient-minidesktop/seeds/preseed_nodm usr/share/x2gothinclient/minidesktop/
-x2gothinclient-minidesktop/schema-overrides/* usr/share/glib-2.0/schemas/
-x2gothinclient-minidesktop/mate-panel-layouts/* usr/share/mate-panel/layouts/
-x2gothinclient-minidesktop/background/*.svg usr/share/images/
\ No newline at end of file
diff --git a/debian/x2gothinclient-minidesktop.install b/debian/x2gothinclient-minidesktop.install
new file mode 100644
index 0000000..79c5825
--- /dev/null
+++ b/debian/x2gothinclient-minidesktop.install
@@ -0,0 +1,5 @@
+x2gothinclient-minidesktop/seeds/preseed_nodm usr/share/x2gothinclient/minidesktop/
+x2gothinclient-minidesktop/schema-overrides/* usr/share/glib-2.0/schemas/
+x2gothinclient-minidesktop/mate-panel-layout/* usr/share/mate-panel/layouts/
+x2gothinclient-minidesktop/background/*.svg usr/share/images/
+x2gothinclient-minidesktop/autostart/x2gothinclient-minidesktop.desktop etc/xdg/autostart/
\ No newline at end of file
diff --git a/debian/x2gothinclient-minidesktop-mate.postinst b/debian/x2gothinclient-minidesktop.postinst
similarity index 100%
rename from debian/x2gothinclient-minidesktop-mate.postinst
rename to debian/x2gothinclient-minidesktop.postinst

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git


More information about the x2go-commits mailing list