8 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index e782cb41c..2d71befce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,7 @@ nx-libs (2:3.5.0-0~x2go2) UNRELEASED; urgency=low
   * Update patch: 017_nx-x11_update-autotools-helper-files.patch. Add lintian
     override to source.lintian-overrides: ancient-autotools-helper-file as we
     handle autotools helper file updates via patch system.
+  * Add upstream CHANGELOG files to all .deb packages of this source package.
 
  -- 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 5d0e991f4..a7301fe25 100644
--- a/debian/libnx-x11.docs
+++ b/debian/libnx-x11.docs
@@ -1,3 +1 @@
 nx-X11/CHANGELOG
-nx-X11/CHANGELOG.NX.original
-nx-X11/CHANGELOG.X.original
diff --git a/debian/libxcomp3.docs b/debian/libxcomp3.docs
new file mode 100644
index 000000000..9def83bf6
--- /dev/null
+++ b/debian/libxcomp3.docs
@@ -0,0 +1 @@
+nxcomp/CHANGELOG
diff --git a/debian/libxcompext3.docs b/debian/libxcompext3.docs
new file mode 100644
index 000000000..f7a3059cd
--- /dev/null
+++ b/debian/libxcompext3.docs
@@ -0,0 +1 @@
+nxcompext/CHANGELOG
diff --git a/debian/libxcompshad3.docs b/debian/libxcompshad3.docs
new file mode 100644
index 000000000..4e13840d3
--- /dev/null
+++ b/debian/libxcompshad3.docs
@@ -0,0 +1 @@
+nxcompshad/CHANGELOG
diff --git a/debian/nxagent.docs b/debian/nxagent.docs
new file mode 100644
index 000000000..522622e88
--- /dev/null
+++ b/debian/nxagent.docs
@@ -0,0 +1 @@
+nx-X11/programs/Xserver/hw/nxagent/CHANGELOG
+\ No newline at end of file
diff --git a/debian/nxauth.docs b/debian/nxauth.docs
new file mode 100644
index 000000000..b906fa5e3
--- /dev/null
+++ b/debian/nxauth.docs
@@ -0,0 +1 @@
+nx-X11/programs/nxauth/CHANGELOG
+\ No newline at end of file
diff --git a/debian/nxproxy.docs b/debian/nxproxy.docs
new file mode 100644
index 000000000..cf38b97b0
--- /dev/null
+++ b/debian/nxproxy.docs
@@ -0,0 +1,4 @@
+nxproxy/CHANGELOG
+nxproxy/README
+nxproxy/README-IPAQ
+nxproxy/README-VALGRIND