From 93b716f787d61ce91bbfa1360189fc2dc52a2b0c Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 29 Dec 2011 16:28:19 +0100
Subject: Disable patch: 006_remove-configure-files.patch, remove configure
files from within /debian/rules.
---
debian/changelog | 2 ++
debian/patches/series | 2 +-
debian/rules | 3 +++
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index fa30cd8a2..244147e39 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@das-netzwerkteam.de> Wed, 28 Dec 2011 19:06:26 +0100
diff --git a/debian/patches/series b/debian/patches/series
index c03893297..0bc35555b 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 b6be368cd..44ea97188 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
--
cgit v1.2.3