[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.3-335-g17c66ef
X2Go dev team
git-admin at x2go.org
Fri Jan 3 20:53:40 CET 2014
The branch, build-baikal has been updated
via 17c66efd4970f2583b8d7f5cfedd8234912f6946 (commit)
from 42802af7a455d27609d037b755c42a7b6d697c57 (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 | 1 +
debian/libx2go-server-db-perl.install | 1 -
libx2go-server-db-perl/Makefile | 16 ++--------------
x2goserver-common/Makefile | 6 ++++++
.../etc/x2gosql/sql | 0
x2goserver.spec | 4 ++--
6 files changed, 11 insertions(+), 17 deletions(-)
rename {libx2go-server-db-perl => x2goserver-common}/etc/x2gosql/sql (100%)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index fb907e5..168e894 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,7 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low
+ Add Reinhard Tartler to Uploaders.
+ Add libcatpure-tiny-perl to Depends: field of libx2go-server-perl.
+ Use versioned dependency with (= {$binary:Version}) style.
+ + Move x2gosql config to x2goserver-common.
* debian/x2goserver.postinst, debian/libx2go-server-db-perl:
+ Handle X2Go session DB creation in x2goserver _and_
perl-X2Go-Server-DB on postinst.
diff --git a/debian/libx2go-server-db-perl.install b/debian/libx2go-server-db-perl.install
index 0663307..18d0fd0 100644
--- a/debian/libx2go-server-db-perl.install
+++ b/debian/libx2go-server-db-perl.install
@@ -3,4 +3,3 @@ 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/libx2go-server-db-perl/Makefile b/libx2go-server-db-perl/Makefile
index 93914aa..1cbb1bf 100755
--- a/libx2go-server-db-perl/Makefile
+++ b/libx2go-server-db-perl/Makefile
@@ -50,7 +50,7 @@ clean-arch:
clean-indep:
-install: install_scripts install_config
+install: install_scripts
install_scripts:
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
@@ -58,19 +58,7 @@ install_scripts:
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
-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: uninstall_scripts
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-common/Makefile b/x2goserver-common/Makefile
index b7b9d10..bbbc76e 100755
--- a/x2goserver-common/Makefile
+++ b/x2goserver-common/Makefile
@@ -59,6 +59,9 @@ install_scripts:
install_config:
$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
$(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/
+ $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql
+ $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords
+ $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql
install_man:
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5
@@ -76,6 +79,9 @@ uninstall_scripts:
uninstall_config:
$(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf
+ $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql
+ $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords || true
+ $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true
$(RM_DIR) $(DESTDIR)$(ETCDIR) || true
uninstall_man:
diff --git a/libx2go-server-db-perl/etc/x2gosql/sql b/x2goserver-common/etc/x2gosql/sql
similarity index 100%
rename from libx2go-server-db-perl/etc/x2gosql/sql
rename to x2goserver-common/etc/x2gosql/sql
diff --git a/x2goserver.spec b/x2goserver.spec
index 5875999..6105a2d 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -432,13 +432,13 @@ exit 0
%{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper.pl
%{_mandir}/man3/X2Go::Server::DB.*
%{_mandir}/man3/X2Go::Server::DB::*
-%dir %{_sysconfdir}/x2go/x2gosql
-%config(noreplace) %{_sysconfdir}/x2go/x2gosql/sql
%files common
%dir %{_sysconfdir}/x2go/
%config(noreplace) %{_sysconfdir}/x2go/x2go*
+%dir %{_sysconfdir}/x2go/x2gosql
+%config(noreplace) %{_sysconfdir}/x2go/x2gosql/sql
%{_mandir}/man5/x2goserver.conf.5.gz
%dir %{_datadir}/x2go/versions
%{_datadir}/x2go/versions/VERSION.x2goserver-common
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