[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-305-g0c7b135

[X2Go dev team]

The branch, master has been updated
       via  0c7b1354b643a7bf4f63213e1d5996f58adb5f91 (commit)
      from  d80cc0b8ac1e353c6a0aafc81d8400bb3ce02d1a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0c7b1354b643a7bf4f63213e1d5996f58adb5f91
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 17 17:10:39 2013 +0100

    Make sure x2goserver-*.features files do not get installed multiple times into various packages.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    2 ++
 x2goserver.spec  |    7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0b7cfeb..fc3600e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,6 +62,8 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low
     + Install SQLite3 wrapper as setgid x2gouser. (Fixes: 371).
     + Assure that SQLite3 session DB file gets created on install (unless
       PostgreSQL is used as session DB backend).
+    + Make sure x2goserver-*.features files do not get installed
+      multiple times into various packages.
 
   [ Guangzhou Nianguan Electronics Technology Co.Ltd. ]
   * New upstream version (4.1.0.0):
diff --git a/x2goserver.spec b/x2goserver.spec
index 70e006e..62291d4 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -379,10 +379,7 @@ exit 0
 %exclude %{_mandir}/man8/x2gofm.8.gz
 %exclude %{_mandir}/man8/x2goprint.8.gz
 %dir %{_datadir}/x2go/x2gofeature.d/
-%{_datadir}/x2go/x2gofeature.d/
-%exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-fmbindings.features
-%exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features
-%exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-xsession.features
+%{_datadir}/x2go/x2gofeature.d/x2goserver.features
 %{_datadir}/x2go/versions/VERSION.x2goserver
 %attr(0775,root,x2gouser) %dir %{_sharedstatedir}/x2go/
 %ghost %attr(0660,root,x2gouser) %{_sharedstatedir}/x2go/x2go_sessions
@@ -435,7 +432,7 @@ exit 0
 %files extensions
 %{_libdir}/x2go/extensions
 %{_bindir}/x2goserver-run-extensions
-%{_datadir}/x2go/x2gofeature.d/
+%{_datadir}/x2go/x2gofeature.d/x2goserver-extensions.features
 %{_datadir}/x2go/versions/VERSION.x2goserver-extensions
 %{_mandir}/man8/x2goserver-run-extensions.8.gz
 


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).