[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-336-g20fbe4b

[X2Go dev team]

The branch, master has been updated
       via  20fbe4b7fab3cc4d97bdc0f501a8c328ad752afd (commit)
      from  17c66efd4970f2583b8d7f5cfedd8234912f6946 (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 20fbe4b7fab3cc4d97bdc0f501a8c328ad752afd
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jan 2 14:50:57 2014 +0100

    Revert "Use versioned dependency with (= {:Version}) style."
    
    This reverts commit 00936769f86616c52c1ca5016591aa4405709c48.
    
    Conflicts:
    	debian/changelog
    	debian/control

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

Summary of changes:
 debian/changelog |    1 -
 debian/control   |   30 +++++++++++++++---------------
 2 files changed, 15 insertions(+), 16 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 168e894..0b3df31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,7 +54,6 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low
     + Move several x2goserver-* package to x2goserver's Recommends field.
     + 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_
diff --git a/debian/control b/debian/control
index a6696ab..53f6053 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Depends:
  ${misc:Depends},
  libfile-basedir-perl,
  libfile-readbackwards-perl,
- libx2go-server-perl (= ${binary:Version}),
+ libx2go-server-perl (>= ${source:Version}), libx2go-server-db-perl (<< ${source:Version}.1~),
  x2goagent (>= 2:3.5.0.15-0~),
  lsof,
  bc,
@@ -41,10 +41,10 @@ Recommends:
  x11-xserver-utils,
  fontconfig,
  xinit,
- x2goserver-extensions (= ${binary:Version}),
- x2goserver-xsession (= ${binary:Version}),
- x2goserver-fmbindings (= ${binary:Version}),
- x2goserver-printing (= ${binary:Version}),
+ x2goserver-extensions (>= ${source:Version}), x2goserver-extensions (<< ${source:Version}.1~),
+ x2goserver-xsession (>= ${source:Version}), x2goserver-xsession (<< ${source:Version}.1~),
+ x2goserver-fmbindings (>= ${source:Version}), x2goserver-fmbindings (<< ${source:Version}.1~),
+ x2goserver-printing (>= ${source:Version}), x2goserver-printing (<< ${source:Version}.1~),
  xfonts-base,
 Suggests:
  rdesktop,
@@ -100,9 +100,9 @@ Depends:
  ${misc:Depends},
  libconfig-simple-perl,
  libcapture-tiny-perl,
- libx2go-log-perl (= ${binary:Version}),
- libx2go-server-db-perl (= ${binary:Version}),
- x2goserver-common (= ${binary:Version}),
+ 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~),
 Description: Perl X2Go::Server package
  X2Go is a server based computing environment with
     - session resuming
@@ -124,8 +124,8 @@ Depends:
  libconfig-simple-perl,
  libdbd-pg-perl,
  libdbd-sqlite3-perl,
- libx2go-log-perl (= ${binary:Version}),
- x2goserver-common (= ${binary:Version}),
+ libx2go-log-perl (>= ${source:Version}), libx2go-log-perl (<< ${source:Version}.1~),
+ x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~),
 Breaks:
  x2goserver (<< 4.1.0.0-0~),
 Replaces:
@@ -147,7 +147,7 @@ Section: perl
 Depends:
  ${perl:Depends},
  ${misc:Depends},
- x2goserver-common (= ${binary:Version}),
+ x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~),
 Description: Perl X2Go::Log package
  X2Go is a server based computing environment with
     - session resuming
@@ -163,7 +163,7 @@ Package: x2goserver-printing
 Architecture: all
 Depends:
  ${misc:Depends},
- x2goserver (= ${binary:Version}),
+ x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~),
  adduser
 Breaks:
  x2goprint
@@ -197,7 +197,7 @@ Package: x2goserver-extensions
 Architecture: all
 Depends:
  ${misc:Depends},
- x2goserver (= ${binary:Version}),
+ x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~),
  x11-xkb-utils
 Description: X2Go Server (extension support)
  X2Go is a server based computing environment with
@@ -219,7 +219,7 @@ Package: x2goserver-xsession
 Architecture: all
 Depends:
  ${misc:Depends},
- x2goserver (= ${binary:Version}),
+ x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~),
  x11-common
 Description: X2Go Server (Xsession runner)
  X2Go is a server based computing environment with
@@ -242,7 +242,7 @@ Package: x2goserver-fmbindings
 Architecture: all
 Depends:
  ${misc:Depends},
- x2goserver (= ${binary:Version}),
+ x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~),
  desktop-file-utils,
  xdg-utils
 Description: X2Go Server (file manager bindings)


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).