aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2012-12-12 12:42:03 +0100
committerReinhard Tartler <siretart@tauware.de>2012-12-12 17:08:23 +0100
commita12ad50503536fc1e9cd3ff1bf11ef4869da6e6d (patch)
tree0cb75f610963617c0ddcdb28519bc85385622747
parent3970fabc565a26751a795c71722eaf3ec510303f (diff)
downloadnx-libs-a12ad50503536fc1e9cd3ff1bf11ef4869da6e6d.tar.gz
nx-libs-a12ad50503536fc1e9cd3ff1bf11ef4869da6e6d.tar.bz2
nx-libs-a12ad50503536fc1e9cd3ff1bf11ef4869da6e6d.zip
integrate debian/pre-build-nx.sh into debian/rules
This change makes debian/rules a bit easier to read
-rwxr-xr-xdebian/pre-build-nx.sh12
-rwxr-xr-xdebian/rules9
2 files changed, 8 insertions, 13 deletions
diff --git a/debian/pre-build-nx.sh b/debian/pre-build-nx.sh
deleted file mode 100755
index 59a8a470a..000000000
--- a/debian/pre-build-nx.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# create copies of upstream changelogs so that names apply to Debian policy...
-cp -a nx-X11/CHANGELOG nx-X11/changelog
-cp -a nxcomp/CHANGELOG nxcomp/changelog
-cp -a nxcompext/CHANGELOG nxcompext/changelog
-cp -a nxcompshad/CHANGELOG nxcompshad/changelog
-cp -a nx-X11/programs/Xserver/hw/nxagent/CHANGELOG nx-X11/programs/Xserver/hw/nxagent/changelog
-cp -a nx-X11/programs/nxauth/CHANGELOG nx-X11/programs/nxauth/changelog
-cp -a nxproxy/CHANGELOG nxproxy/changelog
-
-exit 0
diff --git a/debian/rules b/debian/rules
index cbd600ab2..79ca44fc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,14 @@ override_dh_clean:
dh_clean
override_dh_auto_build:
- debian/pre-build-nx.sh
+ # create copies of upstream changelogs so that names apply to Debian policy...
+ cp -a nx-X11/CHANGELOG nx-X11/changelog
+ cp -a nxcomp/CHANGELOG nxcomp/changelog
+ cp -a nxcompext/CHANGELOG nxcompext/changelog
+ cp -a nxcompshad/CHANGELOG nxcompshad/changelog
+ cp -a nx-X11/programs/Xserver/hw/nxagent/CHANGELOG nx-X11/programs/Xserver/hw/nxagent/changelog
+ cp -a nx-X11/programs/nxauth/CHANGELOG nx-X11/programs/nxauth/changelog
+ cp -a nxproxy/CHANGELOG nxproxy/changelog
LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt
debian/post-build-nx.sh