[X2go-Commits] nx-libs.git - master (branch) updated: nxagent/3.5.0-7-14-g3d575c4

[X2go dev team]

The branch, master has been updated
       via  3d575c45cf192acd50330a1b84dedb234900c52e (commit)
       via  b97f5a78b90ab8a7ed48e46e795697bec1c47bc3 (commit)
      from  dda2c7cd629ebd5e3ad3441708cb835bb92dcd54 (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 3d575c45cf192acd50330a1b84dedb234900c52e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Dec 29 11:54:02 2011 +0100

    add possible-new-upstream-release-without-new-version lintian override for *-dev packages, as well

commit b97f5a78b90ab8a7ed48e46e795697bec1c47bc3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Dec 29 11:37:35 2011 +0100

    wrap long lines in /debian/changelog

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

Summary of changes:
 debian/changelog                               |    7 ++++---
 debian/libnx-mesa-extras-dev.lintian-overrides |    1 +
 debian/libnx-x11-dev.lintian-overrides         |    1 +
 debian/libxcomp-dev.lintian-overrides          |    2 ++
 debian/libxcompext-dev.lintian-overrides       |    2 ++
 debian/libxcompshad-dev.lintian-overrides      |    2 ++
 debian/patches/series                          |    2 +-
 7 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 debian/libnx-mesa-extras-dev.lintian-overrides
 create mode 100644 debian/libnx-x11-dev.lintian-overrides

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a63a680..a8aa964 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,13 +19,14 @@ nx-libs (2:3.5.0-0~x2go2) UNRELEASED; urgency=low
     - 108_nxagent_wine-close-delay.patch
     - 109_nxagent_locale-utf8-compound-text.patch
     - 200_nxagent_unbrand-agent.patch
-  * Adapt path names in FreeNX patches to meet requirements for source tree of this
-    package.
+  * Adapt path names in FreeNX patches to meet requirements for source tree of
+    this package.
   * Rework FreeNX patches to be applicable to latest NX sources.
   * Install nxagent.xpm icon to /usr/share/pixmaps.
   * Rename patch: 008_nxproxy_add-nx-proxy-wrapper.patch to
     008_nxproxy_add-nxproxy-wrapper.patch.
-  * Add patch from FreeNX patchset: 110_nxagent_createpixmap-bounds-check.patch.
+  * Add patch from FreeNX patchset:
+    110_nxagent_createpixmap-bounds-check.patch.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 28 Dec 2011 19:06:26 +0100
 
diff --git a/debian/libnx-mesa-extras-dev.lintian-overrides b/debian/libnx-mesa-extras-dev.lintian-overrides
new file mode 100644
index 0000000..3ecbd16
--- /dev/null
+++ b/debian/libnx-mesa-extras-dev.lintian-overrides
@@ -0,0 +1 @@
+libnx-mesa-extras-dev: possible-new-upstream-release-without-new-version
diff --git a/debian/libnx-x11-dev.lintian-overrides b/debian/libnx-x11-dev.lintian-overrides
new file mode 100644
index 0000000..a4bbdce
--- /dev/null
+++ b/debian/libnx-x11-dev.lintian-overrides
@@ -0,0 +1 @@
+libnx-x11-dev: possible-new-upstream-release-without-new-version
diff --git a/debian/libxcomp-dev.lintian-overrides b/debian/libxcomp-dev.lintian-overrides
index e838038..7f1ec05 100644
--- a/debian/libxcomp-dev.lintian-overrides
+++ b/debian/libxcomp-dev.lintian-overrides
@@ -1 +1,3 @@
 libxcomp-dev: breaks-without-version
+libxcomp-dev: possible-new-upstream-release-without-new-version
+
diff --git a/debian/libxcompext-dev.lintian-overrides b/debian/libxcompext-dev.lintian-overrides
index 1729b9f..98e270f 100644
--- a/debian/libxcompext-dev.lintian-overrides
+++ b/debian/libxcompext-dev.lintian-overrides
@@ -1 +1,3 @@
 libxcompext-dev: breaks-without-version
+libxcompext-dev: possible-new-upstream-release-without-new-version
+
diff --git a/debian/libxcompshad-dev.lintian-overrides b/debian/libxcompshad-dev.lintian-overrides
index bdc2888..1d6ef6b 100644
--- a/debian/libxcompshad-dev.lintian-overrides
+++ b/debian/libxcompshad-dev.lintian-overrides
@@ -1 +1,3 @@
 libxcompshad-dev: breaks-without-version
+libxcompshad-dev: possible-new-upstream-release-without-new-version
+
diff --git a/debian/patches/series b/debian/patches/series
index 1a66986..a2c5035 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,7 +17,7 @@
 101_nxagent_set-rgb-path.patch
 102_xserver-xext_set-securitypolicy-path.patch
 103_nxagent_set-X0-config-path.patch
-104_nxagent_enable_debug.patch
+#104_nxagent_enable_debug.patch
 105_nxagent_export-remote-keyboard-config.patch
 106_nxagent_utf8-copy-clipboard.patch
 107_nxagent_clipboard-compound-text+small-bed-sheets.patch


hooks/post-receive
-- 
nx-libs.git (NX libraries)

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