debian/*: Drop non-multi-arch support (i.e. Debian squeeze, Ubuntu 10.04 and earlier).

21 files changed, 0 insertions, 12 deletions

diff --git a/debian/libnx-x11-6.install.in b/debian/libnx-x11-6.install
index 4912d749f..4912d749f 100644
--- a/debian/libnx-x11-6.install.in
+++ b/debian/libnx-x11-6.install
diff --git a/debian/libnx-x11-dev.install.in b/debian/libnx-x11-dev.install
index 83e2def0e..83e2def0e 100644
--- a/debian/libnx-x11-dev.install.in
+++ b/debian/libnx-x11-dev.install
diff --git a/debian/libnx-xau-dev.install.in b/debian/libnx-xau-dev.install
index 1bf954c00..1bf954c00 100644
--- a/debian/libnx-xau-dev.install.in
+++ b/debian/libnx-xau-dev.install
diff --git a/debian/libnx-xau6.install.in b/debian/libnx-xau6.install
index 246377f12..246377f12 100644
--- a/debian/libnx-xau6.install.in
+++ b/debian/libnx-xau6.install
diff --git a/debian/libnx-xext-dev.install.in b/debian/libnx-xext-dev.install
index 819c82013..819c82013 100644
--- a/debian/libnx-xext-dev.install.in
+++ b/debian/libnx-xext-dev.install
diff --git a/debian/libnx-xext6.install.in b/debian/libnx-xext6.install
index 361d951f5..361d951f5 100644
--- a/debian/libnx-xext6.install.in
+++ b/debian/libnx-xext6.install
diff --git a/debian/libxcomp-dev.install.in b/debian/libxcomp-dev.install
index e27e6ecf0..e27e6ecf0 100644
--- a/debian/libxcomp-dev.install.in
+++ b/debian/libxcomp-dev.install
diff --git a/debian/libxcomp3.install.in b/debian/libxcomp3.install
index 9b8fa9f15..9b8fa9f15 100644
--- a/debian/libxcomp3.install.in
+++ b/debian/libxcomp3.install
diff --git a/debian/libxcompext-dev.install.in b/debian/libxcompext-dev.install
index a31961b99..a31961b99 100644
--- a/debian/libxcompext-dev.install.in
+++ b/debian/libxcompext-dev.install
diff --git a/debian/libxcompext3.install.in b/debian/libxcompext3.install
index b9ac8ebb9..b9ac8ebb9 100644
--- a/debian/libxcompext3.install.in
+++ b/debian/libxcompext3.install
diff --git a/debian/libxcompshad-dev.install.in b/debian/libxcompshad-dev.install
index 2010f5950..2010f5950 100644
--- a/debian/libxcompshad-dev.install.in
+++ b/debian/libxcompshad-dev.install
diff --git a/debian/libxcompshad3.install.in b/debian/libxcompshad3.install
index 6b452b2bd..6b452b2bd 100644
--- a/debian/libxcompshad3.install.in
+++ b/debian/libxcompshad3.install
diff --git a/debian/nx-x11proto-composite-dev.install.in b/debian/nx-x11proto-composite-dev.install
index cf2c77e36..cf2c77e36 100644
--- a/debian/nx-x11proto-composite-dev.install.in
+++ b/debian/nx-x11proto-composite-dev.install
diff --git a/debian/nx-x11proto-core-dev.install.in b/debian/nx-x11proto-core-dev.install
index 2e99909a8..2e99909a8 100644
--- a/debian/nx-x11proto-core-dev.install.in
+++ b/debian/nx-x11proto-core-dev.install
diff --git a/debian/nx-x11proto-damage-dev.install.in b/debian/nx-x11proto-damage-dev.install
index 1503260cf..1503260cf 100644
--- a/debian/nx-x11proto-damage-dev.install.in
+++ b/debian/nx-x11proto-damage-dev.install
diff --git a/debian/nx-x11proto-randr-dev.install.in b/debian/nx-x11proto-randr-dev.install
index 3b30f71d0..3b30f71d0 100644
--- a/debian/nx-x11proto-randr-dev.install.in
+++ b/debian/nx-x11proto-randr-dev.install
diff --git a/debian/nx-x11proto-render-dev.install.in b/debian/nx-x11proto-render-dev.install
index f2222d234..f2222d234 100644
--- a/debian/nx-x11proto-render-dev.install.in
+++ b/debian/nx-x11proto-render-dev.install
diff --git a/debian/nx-x11proto-xext-dev.install.in b/debian/nx-x11proto-xext-dev.install
index f34e66519..f34e66519 100644
--- a/debian/nx-x11proto-xext-dev.install.in
+++ b/debian/nx-x11proto-xext-dev.install
diff --git a/debian/nx-x11proto-xfixes-dev.install.in b/debian/nx-x11proto-xfixes-dev.install
index 91eae0306..91eae0306 100644
--- a/debian/nx-x11proto-xfixes-dev.install.in
+++ b/debian/nx-x11proto-xfixes-dev.install
diff --git a/debian/nx-x11proto-xinerama-dev.install.in b/debian/nx-x11proto-xinerama-dev.install
index 2e1efbc63..2e1efbc63 100644
--- a/debian/nx-x11proto-xinerama-dev.install.in
+++ b/debian/nx-x11proto-xinerama-dev.install
diff --git a/debian/rules b/debian/rules
index 275956c9a..f8bec8fc0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,23 +19,11 @@ override_dh_auto_clean:
 
 override_dh_clean:
 	rm -f nx*/configure
-	. ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done
 	rm -fR .preserve/
 	dh_clean
 
 override_dh_install:
 
-	# handle builds for Debian squeeze (non multi-arch)
-	. ./replace.sh; set -x; if [ -z "$(DEB_BUILD_MULTIARCH)" ]; then \
-	    find debian/*.install.in | while read file; do \
-	        cat $$file | sed -e 's#/\*/#/#g' > $$(string_rep $$file .install.in .install); \
-	    done; \
-	else \
-	    find debian/*.install.in | while read file; do \
-	        cat $$file > $$(string_rep $$file .install.in .install); \
-	    done; \
-	fi
-
 	# remove static libs
 	rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.a
 	rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a