[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.10-32-gd1a5d75
X2go dev team
git-admin at x2go.org
Wed Feb 22 10:28:37 CET 2012
The branch, master has been updated
via d1a5d757ef2e45912f2f58162a6e6c39fa482d13 (commit)
from 6d06ba1e3e965314e6a8753b11e69aeb45f8b5ad (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 d1a5d757ef2e45912f2f58162a6e6c39fa482d13
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Feb 22 10:28:31 2012 +0100
Add package upgrade warning for installation using PostgreSQL. The upgrade warning refers to README.upgrade-pgsql-database.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 +
debian/po/POTFILES.in | 1 +
debian/po/de.po | 44 ++++++++++++++++++++++++++
debian/po/templates.pot | 41 ++++++++++++++++++++++++
debian/templates | 9 +++++
debian/x2goserver.docs | 1 +
debian/x2goserver.postinst | 3 ++
x2goserver/doc/README.upgrade-pgsql-database | 44 ++++++++++++++++++++++++++
8 files changed, 145 insertions(+), 0 deletions(-)
create mode 100644 debian/po/POTFILES.in
create mode 100644 debian/po/de.po
create mode 100644 debian/po/templates.pot
create mode 100644 debian/templates
create mode 100644 x2goserver/doc/README.upgrade-pgsql-database
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 57a32f7..bc47463 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,8 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low
- Make sure x2gocleansessions close _all_ open file handles after
forking as a daemon.
* Let x2goserver package suggest x2goserver-fmbindings.
+ * Add package upgrade warning for installation using PostgreSQL. The
+ upgrade warning refers to README.upgrade-pgsql-database.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
new file mode 100644
index 0000000..cef83a3
--- /dev/null
+++ b/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates
diff --git a/debian/po/de.po b/debian/po/de.po
new file mode 100644
index 0000000..dc47d07
--- /dev/null
+++ b/debian/po/de.po
@@ -0,0 +1,44 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: x2goserver at packages.debian.org\n"
+"POT-Creation-Date: 2012-02-06 21:20+0100\n"
+"PO-Revision-Date: 2012-02-06 21:25+0100\n"
+"Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: text
+#. Description
+#: ../templates:1001
+msgid "X2Go Server / PostgreSQL Upgrade"
+msgstr "X2Go Server / PostgreSQL Upgrade"
+
+#. Type: text
+#. Description
+#: ../templates:1001
+msgid "You have configured X2Go Server with PostgreSQL as session DB backend and you are upgrading x2goserver from a version minor to 3.1.0.0."
+msgstr "Ihr X2Go Server nutzt eine PostgreSQL Datenbank, um X2Go Sitzungsdaten zu verwalten und Sie aktualisieren gerade das Paket x2goserver von einer Version kleiner als 3.1.0.0."
+
+#. Type: text
+#. Description
+#: ../templates:1001
+msgid "Please follow these PostgreSQL DB upgrade instructions before you continue using your X2Go Server: /usr/share/doc/x2goserver/README.upgrade-pgsql-database"
+msgstr "Bitte befolgen Sie daher die PostgreSQL-Aktualisierungshinweise bevor sie mit der Weiternutzung Ihres X2Go Servers fortfahren: /usr/share/x2goserver/README.upgrade-pgsl-database"
+
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
new file mode 100644
index 0000000..1667bd9
--- /dev/null
+++ b/debian/po/templates.pot
@@ -0,0 +1,41 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: x2goserver at packages.debian.org\n"
+"POT-Creation-Date: 2012-02-06 21:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: text
+#. Description
+#: ../templates:1001
+msgid "X2Go Server / PostgreSQL Upgrade"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../templates:1001
+msgid ""
+"You have configured X2Go Server with PostgreSQL as session DB backend and "
+"you are upgrading x2goserver from a version minor to 3.1.0.0."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../templates:1001
+msgid ""
+"Please follow these PostgreSQL DB upgrade instructions before you continue "
+"using your X2Go Server: /usr/share/doc/x2goserver/README.upgrade-pgsql-"
+"database"
+msgstr ""
diff --git a/debian/templates b/debian/templates
new file mode 100644
index 0000000..384574a
--- /dev/null
+++ b/debian/templates
@@ -0,0 +1,9 @@
+Template: x2goserver/postgresql-upgrade-3_1_0_0
+Type: text
+_Description: X2Go Server / PostgreSQL Upgrade
+ You have configured X2Go Server with PostgreSQL as session DB backend and
+ you are upgrading x2goserver from a version minor to 3.1.0.0.
+ .
+ Please follow these PostgreSQL DB upgrade instructions before you continue
+ using your X2Go Server:
+ /usr/share/doc/x2goserver/README.upgrade-pgsql-database
diff --git a/debian/x2goserver.docs b/debian/x2goserver.docs
index 6c7d3af..869c67e 100644
--- a/debian/x2goserver.docs
+++ b/debian/x2goserver.docs
@@ -1 +1,2 @@
x2goserver/.build_man2html/html
+x2goserver/doc/*
diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst
index 68d83d7..f1582a8 100755
--- a/debian/x2goserver.postinst
+++ b/debian/x2goserver.postinst
@@ -5,6 +5,9 @@
set -e
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
diff --git a/x2goserver/doc/README.upgrade-pgsql-database b/x2goserver/doc/README.upgrade-pgsql-database
new file mode 100644
index 0000000..bb78733
--- /dev/null
+++ b/x2goserver/doc/README.upgrade-pgsql-database
@@ -0,0 +1,44 @@
+
+#######################################
+###
+### X2Go DB maintenance after upgrades
+###
+#######################################
+
+UPGRADING
+=========
+
+Normally no DB upgrades are necessary on x2goserver package upgrades. However, there are some
+exceptions for some specific version of the x2goserver package.
+
+
+Upgrading to x2goserver 3.1.0.0
+-------------------------------
+
+From: x2goserver (<= 3.0.99.10)
+To: x2goserver (>= 3.1.0.0)
+
+A new column has been added to the database: ,,used_ports''.
+
+X2Go users in the PostgreSQL database need access to this new column.
+
+Alternative 1: recreate all X2Go db users
+
+ x2godbadmin --rmuser <username>
+ x2godbadmin --adduser <username>
+
+Alternative 2:
+
+ Run this SQL command for each x2gouser_<user> in the X2Go PostgreSQL database
+
+ $ su - postgres
+ $ psql
+ psql (<YOUR-PSQL-VERSION)
+ Type "help" for help.
+ .
+ postgres=# \connect x2go_sessions
+ x2go_sessions=# GRANT SELECT ON used_ports TO "x2gouser_<username1>";
+ x2go_sessions=# GRANT SELECT ON used_ports TO "x2gouser_<username2>";
+ ...
+
+
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