[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-53-g4b48023
X2Go dev team
git-admin at x2go.org
Fri Sep 21 00:20:54 CEST 2012
The branch, master has been updated
via 4b48023b7e502ca5bd9bd1aa1cf85d8f1c323577 (commit)
from 0f4c848a45fd8fa8576cca118a9b7c2b4fc1ed5c (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 4b48023b7e502ca5bd9bd1aa1cf85d8f1c323577
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Sep 21 00:20:49 2012 +0200
more packaging fixes
-----------------------------------------------------------------------
Summary of changes:
debian/{x2goserver.config => config} | 2 +-
debian/control | 129 ++++++++++++++++----------------
debian/libx2go-server-db-perl.postinst | 3 -
debian/po/de.po | 4 +-
debian/templates | 4 +-
debian/x2goserver-common.postinst | 4 -
debian/x2goserver-common.postrm | 1 -
7 files changed, 69 insertions(+), 78 deletions(-)
rename debian/{x2goserver.config => config} (88%)
The diff of changes is:
diff --git a/debian/x2goserver.config b/debian/config
similarity index 88%
rename from debian/x2goserver.config
rename to debian/config
index 89ff9f4..58fc25f 100755
--- a/debian/x2goserver.config
+++ b/debian/config
@@ -18,7 +18,7 @@ if dpkg --compare-versions "$LASTVERSION" lt "3.2.0.0" && \
[ -e /etc/x2go/x2gosql/sql ] && \
egrep "^backend=postgres.*" /etc/x2go/x2gosql/sql >/dev/null; then
- db_input critical x2goserver/postgresql-upgrade-3_2_0_0 || true
+ db_input critical x2goserver/upgrade-3_2_0_0 || true
db_go
fi
\ No newline at end of file
diff --git a/debian/control b/debian/control
index b594663..976b430 100644
--- a/debian/control
+++ b/debian/control
@@ -13,14 +13,72 @@ Homepage: http://code.x2go.org/releases/source/x2goserver
Vcs-Git: git://code.x2go.org/x2goserver.git
Vcs-Browser: http://code.x2go.org/gitweb?p=x2goserver.git;a=summary
+Package: x2goserver
+Architecture: any
+Depends:
+ ${misc:Depends},
+ libx2go-server-perl (>= ${source:Version}), libx2go-server-db-perl (<< ${source:Version}.1~),
+ x2goagent (>= 2:3.5.0.15-0~),
+ lsof,
+ openssh-client,
+ openssh-server,
+ xauth,
+ psmisc,
+ net-tools
+Recommends:
+ sshfs,
+ x11-apps,
+ x11-session-utils,
+ x11-utils,
+ x11-xfs-utils,
+ x11-xkb-utils,
+ x11-xserver-utils,
+ xinit,
+ x2goserver-extensions (= ${source:Version})
+Suggests:
+ x2goserver-printing (= ${source:Version}),
+ x2goserver-compat (= ${source:Version}),
+ x2goserver-xsession (= ${source:Version}),
+ x2goserver-fmbindings (= ${source:Version}),
+ x2goserver-pyhoca (= ${source:Version}),
+ rdesktop,
+ pulseaudio-utils
+Breaks:
+ x2goserver-one,
+ x2goserver-home,
+Replaces:
+ x2goserver-one,
+ x2goserver-home,
+Description: X2Go server daemon scripts
+ X2Go is a server based computing environment with
+ - session resuming
+ - low bandwidth support
+ - LDAP support
+ - client side mass storage mounting support
+ - audio support
+ - authentication by smartcard and USB stick
+ .
+ This package contains the main daemon and tools for
+ X2Go server-side session administrations.
+ .
+ The x2goserver package provides full functionality
+ for running the X2Go project's legacy X2Go client
+ (x2goclient) on the client-side.
+ .
+ However, if you intend using other client implementations
+ of X2Go make sure that you also have X2Go server
+ extensions package (x2goserver-extensions) installed.
+
+
Package: x2goserver-common
Architecture: any
Depends:
${misc:Depends},
+ adduser,
Breaks:
- x2goserver (< 3.2.0.0-0~),
+ x2goserver (<< 3.2.0.0-0~),
Replaces:
- x2goserver (< 3.2.0.0-0~),
+ x2goserver (<< 3.2.0.0-0~),
Description: X2Go Server (common files)
X2Go is a server based computing environment with
- session resuming
@@ -39,6 +97,7 @@ Section: perl
Depends:
${perl:Depends},
${misc:Depends},
+ libconfig-simple-perl,
libx2go-log-perl (>= ${source:Version}), libx2go-log-perl (<< ${source:Version}.1~),
libx2go-server-db-perl (>= ${source:Version}), libx2go-server-db-perl (<< ${source:Version}.1~),
x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~),
@@ -60,6 +119,10 @@ Depends:
${perl:Depends},
${misc:Depends},
${shlibs:Depends},
+ makepasswd,
+ libconfig-simple-perl,
+ libdbd-pg-perl,
+ libdbd-sqlite3-perl,
libx2go-log-perl (>= ${source:Version}), libx2go-log-perl (<< ${source:Version}.1~),
x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~),
Description: Perl X2Go::Server:DB package
@@ -91,68 +154,6 @@ Description: Perl X2Go::Log package
.
This package contains the X2Go::Log Perl package.
-Package: x2goserver
-Architecture: any
-Depends:
- ${misc:Depends},
- libx2go-server-db-perl (>= ${source:Version}), libx2go-server-db-perl (<< ${source:Version}.1~),
- libx2go-log-perl (>= ${source:Version}), libx2go-log-perl (<< ${source:Version}.1~),
- x2goagent (>= 2:3.5.0.15-0~),
- lsof,
- openssh-client,
- openssh-server,
- libconfig-simple-perl,
- makepasswd,
- libdbd-pg-perl,
- libdbd-sqlite3-perl,
- adduser,
- xauth,
- psmisc,
- net-tools
-Recommends:
- sshfs,
- x11-apps,
- x11-session-utils,
- x11-utils,
- x11-xfs-utils,
- x11-xkb-utils,
- x11-xserver-utils,
- xinit,
- x2goserver-extensions (= ${source:Version})
-Suggests:
- x2goserver-printing (= ${source:Version}),
- x2goserver-compat (= ${source:Version}),
- x2goserver-xsession (= ${source:Version}),
- x2goserver-fmbindings (= ${source:Version}),
- x2goserver-pyhoca (= ${source:Version}),
- rdesktop,
- pulseaudio-utils
-Breaks:
- x2goserver-one,
- x2goserver-home,
-Replaces:
- x2goserver-one,
- x2goserver-home,
-Description: X2Go server daemon scripts
- X2Go is a server based computing environment with
- - session resuming
- - low bandwidth support
- - LDAP support
- - client side mass storage mounting support
- - audio support
- - authentication by smartcard and USB stick
- .
- This package contains the main daemon and tools for
- X2Go server-side session administrations.
- .
- The x2goserver package provides full functionality
- for running the X2Go project's legacy X2Go client
- (x2goclient) on the client-side.
- .
- However, if you intend using other client implementations
- of X2Go make sure that you also have X2Go server
- extensions package (x2goserver-extensions) installed.
-
Package: x2goserver-printing
Architecture: all
Depends:
diff --git a/debian/libx2go-server-db-perl.postinst b/debian/libx2go-server-db-perl.postinst
index 1e34a99..147d902 100755
--- a/debian/libx2go-server-db-perl.postinst
+++ b/debian/libx2go-server-db-perl.postinst
@@ -5,9 +5,6 @@
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/debian/po/de.po b/debian/po/de.po
index ec35005..069909c 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -45,10 +45,8 @@ msgstr "Bitte befolgen Sie daher die PostgreSQL-Aktualisierungshinweise bevor si
#. Type: text
#. Description
#: ../templates:2001
-#, fuzzy
-#| msgid "X2Go Server / PostgreSQL Upgrade"
msgid "X2Go Server Upgrade"
-msgstr "X2Go Server / PostgreSQL Upgrade"
+msgstr "X2Go Server Upgrade"
#. Type: text
#. Description
diff --git a/debian/templates b/debian/templates
index 671220e..153d971 100644
--- a/debian/templates
+++ b/debian/templates
@@ -8,7 +8,7 @@ _Description: X2Go Server / PostgreSQL Upgrade
using your X2Go Server:
/usr/share/doc/x2goserver/README.upgrade-pgsql-database.gz
-Template: x2goserver/postgresql-upgrade-3_2_0_0
+Template: x2goserver/upgrade-3_2_0_0
Type: text
_Description: X2Go Server Upgrade
You are upgrading from an X2Go Server version (< 3.2.0.0). Between
@@ -16,4 +16,4 @@ _Description: X2Go Server Upgrade
change.
.
Note that most of the Perl code in X2Go Server has been moved into
- its own Perl API X2Go::Server.
\ No newline at end of file
+ its own Perl API X2Go::Server.
diff --git a/debian/x2goserver-common.postinst b/debian/x2goserver-common.postinst
index b67e638..7c0123b 100755
--- a/debian/x2goserver-common.postinst
+++ b/debian/x2goserver-common.postinst
@@ -5,9 +5,6 @@
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>
@@ -20,7 +17,6 @@ set -e
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
-
case "$1" in
configure)
diff --git a/debian/x2goserver-common.postrm b/debian/x2goserver-common.postrm
index bd67b1d..1644a21 100755
--- a/debian/x2goserver-common.postrm
+++ b/debian/x2goserver-common.postrm
@@ -15,7 +15,6 @@
set -e
-
case "$1" in
purge)
getent passwd x2gouser >/dev/null && deluser x2gouser
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