[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.3-43-gd688c97
X2Go dev team
git-admin at x2go.org
Fri Jan 3 18:04:57 CET 2014
The branch, build-baikal has been updated
via d688c97dd8b0e89a9dc7477f4c8ce6d91d5f047f (commit)
from 8ee62de49fe31611822772bda79e995afb9c6e9b (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
debian/libx2go-server-db-perl.install | 1 +
debian/x2goserver.install | 2 +-
libx2go-server-db-perl/Makefile | 20 ++++++++++++++++++--
.../etc/x2gosql/sql | 0
x2goserver/Makefile | 6 ------
6 files changed, 22 insertions(+), 9 deletions(-)
rename {x2goserver => libx2go-server-db-perl}/etc/x2gosql/sql (100%)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ea42889..9567fa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low
SQLite3 into Perl package X2Go::Server::DB::SQLite3.
- Move x2gosqlitewrapper into Perl package X2Go::Server::DB::SQLite3.
- Move PostgreSQL DB code into Perl package X2Go::Server::DB::PostgreSQL.
+ - Move X2Go SQL configuration files (/etc/x2go/x2gosql) into package
+ libx2go-server-db-perl.
- Only extend LD_LIBRARY_PATH by Xrandr extension for KDE. Breaks GNOME.
* /debian/control:
+ Maintainer change in package: X2Go Developers <x2go-dev at lists.berlios.de>.
diff --git a/debian/libx2go-server-db-perl.install b/debian/libx2go-server-db-perl.install
index 18d0fd0..0663307 100644
--- a/debian/libx2go-server-db-perl.install
+++ b/debian/libx2go-server-db-perl.install
@@ -3,3 +3,4 @@ usr/share/man/man3/X2Go::Server::DB.*
usr/share/man/man3/X2Go::Server::DB::*
libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper /usr/lib/x2go/
libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl /usr/lib/x2go/
+libx2go-server-db-perl/etc/x2go* /etc/x2go/
diff --git a/debian/x2goserver.install b/debian/x2goserver.install
index 879a538..d51c15d 100644
--- a/debian/x2goserver.install
+++ b/debian/x2goserver.install
@@ -1,6 +1,6 @@
x2goserver/bin/x2go* /usr/bin/
x2goserver/sbin/x2go* /usr/sbin/
x2goserver/lib/x2go* /usr/lib/x2go/
-x2goserver/etc/* /etc/x2go/
+x2goserver/etc/x2go* /etc/x2go/
x2goserver/VERSION.x2goserver /usr/share/x2go/versions/
x2goserver/share/x2gofeature.d /usr/share/x2go/
diff --git a/libx2go-server-db-perl/Makefile b/libx2go-server-db-perl/Makefile
index 0b29ba1..bde1379 100755
--- a/libx2go-server-db-perl/Makefile
+++ b/libx2go-server-db-perl/Makefile
@@ -46,11 +46,27 @@ clean-arch:
clean-indep:
-install:
+install: install_scripts install_config
+
+install_scripts:
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
$(INSTALL_PROGRAM) lib/* $(DESTDIR)$(LIBDIR)/
getent group x2gouser &>/dev/null && chown root:x2gouser $(DESTDIR)$(LIBDIR)/libx2go-server-db-sqlite3-wrapper || true
chmod 2755 $(DESTDIR)$(LIBDIR)/libx2go-server-db-sqlite3-wrapper
-uninstall:
+install_config:
+ $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql
+ $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords
+ $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql
+
+uninstall: uninstall_scripts uninstall_config
+
+uninstall_scripts:
for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done
+
+uninstall_config:
+ $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql
+ $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords || true
+ $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true
+ $(RM_DIR) $(DESTDIR)$(ETCDIR) || true
diff --git a/x2goserver/etc/x2gosql/sql b/libx2go-server-db-perl/etc/x2gosql/sql
similarity index 100%
rename from x2goserver/etc/x2gosql/sql
rename to libx2go-server-db-perl/etc/x2gosql/sql
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index 27c2e06..87af41a 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -66,10 +66,7 @@ install_scripts:
install_config:
$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
- $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql
- $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords
$(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/
- $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql
install_man:
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
@@ -95,10 +92,7 @@ uninstall_scripts:
uninstall_config:
$(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf
- $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql
$(RM_DIR) $(DESTDIR)$(ETCDIR) || true
- $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords || true
- $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true
uninstall_man:
for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done
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).
More information about the x2go-commits
mailing list