[X2Go-Commits] nx-libs.git - build-main (branch) updated: nxproxy/3.5.0-1-150-g93b716f

[X2Go dev team]

The branch, build-main has been updated
       via  93b716f787d61ce91bbfa1360189fc2dc52a2b0c (commit)
      from  21a85ffbe8d97fd7d5d71149360afca13f842878 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog      |    2 ++
 debian/patches/series |    2 +-
 debian/rules          |    3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index fa30cd8..244147e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,8 @@ nx-libs (2:3.5.0-0~x2go2) UNRELEASED; urgency=low
     touch any directory controlled by /etc/ld.so.conf, amongst others
     see BTS issue #205142).
   * Make sure upstream changelog file names are in lower case.
+  * Disable patch: 006_remove-configure-files.patch, remove configure
+    files from within /debian/rules.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 28 Dec 2011 19:06:26 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index c038932..0bc3555 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,7 @@
 003_nxcompshad_gcc43.patch
 004_nx-x11_fix-nxcompshad-build.patch
 005_nxagent_add-nxagent-wrapper.patch
-006_remove-configure-files.patch
+#006_remove-configure-files.patch
 007_nxcompshad_clean-gch-files.patch
 008_nxproxy_add-nxproxy-wrapper.patch
 009_nxproxy_add-man-page.patch
diff --git a/debian/rules b/debian/rules
index b6be368..44ea971 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,9 @@ override_dh_auto_clean:
 	LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_clean
 
 override_dh_clean:
+	rm -f nxcomp/configure
+	rm -f nxcompext/configure
+	rm -f nxcompshad/configure
 	rm -f nx-X11/changelog
 	rm -f nxcomp/changelog
 	rm -f nxcompext/changelog


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