[X2go-Commits] nx-libs.git - master (branch) updated: redist-client/3.5.0.16-10-g0def009
X2Go dev team
git-admin at x2go.org
Tue Dec 4 15:27:10 CET 2012
The branch, master has been updated
via 0def0092f904ecbcaf68a4f1880a730dcc2d8aed (commit)
via 6c9bd8865df4ec7e1fbd63bb7e349a6aaef3e8ae (commit)
from 2093e705a25923942819f31f2b51229c9da85ced (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 0def0092f904ecbcaf68a4f1880a730dcc2d8aed
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Dec 4 15:27:00 2012 +0100
control file: add some kommata at EOLs, fix dependency of x2goagent on nxagent
commit 6c9bd8865df4ec7e1fbd63bb7e349a6aaef3e8ae
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Dec 4 15:24:25 2012 +0100
Add pkg-config to build dependencies.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
debian/control | 31 ++++++++++++++++---------------
2 files changed, 17 insertions(+), 15 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 41ea4c3..983c50c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ nx-libs (2:3.5.0.17-0) UNRELEASED; urgency=low
[ Mike Gabriel ]
* Add README.keystrokes to doc section of bin:package nxagent.
+ * Add pkg-config to build dependencies.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 07 Nov 2012 21:14:23 +0100
diff --git a/debian/control b/debian/control
index f34b1d2..c1e4b14 100644
--- a/debian/control
+++ b/debian/control
@@ -14,14 +14,15 @@ Build-Depends:
quilt (>= 0.46-7~),
libxmltok1-dev,
libxml2-dev,
- autoconf
+ autoconf,
+ pkg-config,
Build-Conflicts:
x11proto-core-dev,
x11proto-kb-dev,
x11proto-randr-dev,
x11proto-record-dev,
x11proto-xinerama-dev,
- xbitmaps
+ xbitmaps,
Standards-Version: 3.9.3
Homepage: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary
Vcs-Git: git://code.x2go.org/nx-libs.git
@@ -31,7 +32,7 @@ Package: libnx-x11
Architecture: any
Depends:
${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
Breaks: nxlibs (<=3.5.1)
Replaces: nxlibs
Description: nx-X11
@@ -49,7 +50,7 @@ Breaks: nxlibs-dev (<=3.5.1)
Replaces: nxlibs-dev
Depends:
libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~),
- ${misc:Depends}
+ ${misc:Depends},
Description: Library headers for nx-X11
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
@@ -63,7 +64,7 @@ Section: libdevel
Architecture: any
Depends:
libnx-x11-dev (>= ${source:Version}), libnx-x11-dev (<< ${source:Version}.1~),
- ${misc:Depends}
+ ${misc:Depends},
Description: Library headers for nx-X11 (extra headers)
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
@@ -78,7 +79,7 @@ Depends:
libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~),
xfonts-base,
${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
Description: NX agent
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
@@ -101,8 +102,8 @@ Description: NX agent
Package: x2goagent
Architecture: all
Depends:
- nxagent (>= ${source:Version}),
- ${misc:Depends}
+ nxagent (>= ${source:Version}), nxagent (<< ${source:Version}.1~),
+ ${misc:Depends},
Suggests:
x2goserver
Description: X2Go agent
@@ -125,7 +126,7 @@ Architecture: any
Depends:
libxcomp3 (>= ${source:Version}), libxcomp3 (<< ${source:Version}.1~),
${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
Description: NX proxy
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
@@ -138,7 +139,7 @@ Architecture: any
Depends:
libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~),
${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
Description: NX xauth
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
@@ -150,7 +151,7 @@ Package: libxcomp3
Architecture: any
Depends:
${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
Breaks: nxcomp (<=3.5.1)
Replaces: nxcomp
Description: NX X compression library
@@ -165,7 +166,7 @@ Section: libdevel
Architecture: any
Depends:
libxcomp3 (= ${binary:Version}),
- ${misc:Depends}
+ ${misc:Depends},
Breaks: nxcomp-dev (<=3.5.1)
Replaces: nxcomp-dev
Description: NX X compression library headers
@@ -180,7 +181,7 @@ Architecture: any
Depends:
libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~),
${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
Breaks: nxcompext (<=3.5.1)
Replaces: nxcompext
Description: NX X11 protocol compression extensions library
@@ -213,7 +214,7 @@ Architecture: any
Depends:
libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~),
${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
Breaks: nxcompshad (<=3.5.1)
Replaces: nxcompshad
Description: NX shadowing library
@@ -228,7 +229,7 @@ Section: libdevel
Architecture: any
Depends:
libxcompshad3 (=${binary:Version}),
- ${misc:Depends}
+ ${misc:Depends},
Breaks: nxcompshad-dev (<=3.5.1)
Replaces: nxcompshad-dev
Description: NX shadowing library headers
hooks/post-receive
--
nx-libs.git (NX (redistributed))
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 "nx-libs.git" (NX (redistributed)).
More information about the x2go-commits
mailing list