aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/libnx-x11.docs2
-rw-r--r--debian/libxcomp3.docs2
-rw-r--r--debian/libxcompext3.docs2
-rw-r--r--debian/libxcompshad3.docs2
-rw-r--r--debian/nxagent.docs2
-rw-r--r--debian/nxauth.docs2
-rw-r--r--debian/nxproxy.docs2
-rwxr-xr-xdebian/pre-build-nx.sh9
-rwxr-xr-xdebian/rules9
10 files changed, 26 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 2730d2347..fa30cd8a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,7 @@ nx-libs (2:3.5.0-0~x2go2) UNRELEASED; urgency=low
as they relate to a bug in debhelper (call of ldconfig although we did not
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.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 28 Dec 2011 19:06:26 +0100
diff --git a/debian/libnx-x11.docs b/debian/libnx-x11.docs
index a7301fe25..5a57a3fdc 100644
--- a/debian/libnx-x11.docs
+++ b/debian/libnx-x11.docs
@@ -1 +1 @@
-nx-X11/CHANGELOG
+nx-X11/changelog \ No newline at end of file
diff --git a/debian/libxcomp3.docs b/debian/libxcomp3.docs
index 9def83bf6..97efc9f41 100644
--- a/debian/libxcomp3.docs
+++ b/debian/libxcomp3.docs
@@ -1 +1 @@
-nxcomp/CHANGELOG
+nxcomp/changelog
diff --git a/debian/libxcompext3.docs b/debian/libxcompext3.docs
index f7a3059cd..8323a3471 100644
--- a/debian/libxcompext3.docs
+++ b/debian/libxcompext3.docs
@@ -1 +1 @@
-nxcompext/CHANGELOG
+nxcompext/changelog
diff --git a/debian/libxcompshad3.docs b/debian/libxcompshad3.docs
index 4e13840d3..33632b9a6 100644
--- a/debian/libxcompshad3.docs
+++ b/debian/libxcompshad3.docs
@@ -1 +1 @@
-nxcompshad/CHANGELOG
+nxcompshad/changelog
diff --git a/debian/nxagent.docs b/debian/nxagent.docs
index 522622e88..111e25b45 100644
--- a/debian/nxagent.docs
+++ b/debian/nxagent.docs
@@ -1 +1 @@
-nx-X11/programs/Xserver/hw/nxagent/CHANGELOG \ No newline at end of file
+nx-X11/programs/Xserver/hw/nxagent/changelog \ No newline at end of file
diff --git a/debian/nxauth.docs b/debian/nxauth.docs
index b906fa5e3..aaa115f2c 100644
--- a/debian/nxauth.docs
+++ b/debian/nxauth.docs
@@ -1 +1 @@
-nx-X11/programs/nxauth/CHANGELOG \ No newline at end of file
+nx-X11/programs/nxauth/changelog \ No newline at end of file
diff --git a/debian/nxproxy.docs b/debian/nxproxy.docs
index cf38b97b0..4b3d18d8c 100644
--- a/debian/nxproxy.docs
+++ b/debian/nxproxy.docs
@@ -1,4 +1,4 @@
-nxproxy/CHANGELOG
+nxproxy/changelog
nxproxy/README
nxproxy/README-IPAQ
nxproxy/README-VALGRIND
diff --git a/debian/pre-build-nx.sh b/debian/pre-build-nx.sh
index c52d3c26b..bb18ebedb 100755
--- a/debian/pre-build-nx.sh
+++ b/debian/pre-build-nx.sh
@@ -1,3 +1,12 @@
#!/bin/sh
+# create copies of upstream changelog whose 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 402e22a96..b6be368cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,15 @@ override_dh_auto_clean:
rm -Rf nx-X11/.build-exports
LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_clean
+override_dh_clean:
+ rm -f nx-X11/changelog
+ rm -f nxcomp/changelog
+ rm -f nxcompext/changelog
+ rm -f nxcompshad/changelog
+ rm -f nx-X11/programs/Xserver/hw/nxagent/changelog
+ rm -f nx-X11/programs/nxauth/changelog
+ rm -f nxproxy/changelog
+
override_dh_auto_build:
debian/pre-build-nx.sh
LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt