[X2go-Commits] nx-libs.git - master (branch) updated: nxagent/3.5.0-7-26-g21a85ff

X2go dev team git-admin at x2go.org
Thu Dec 29 14:45:24 CET 2011


The branch, master has been updated
       via  21a85ffbe8d97fd7d5d71149360afca13f842878 (commit)
      from  5dea6a378978c4abf38ac2f4325dbe6634e0d116 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 21a85ffbe8d97fd7d5d71149360afca13f842878
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Dec 29 14:45:18 2011 +0100

    Make sure upstream changelog file names are in lower case.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog          |    1 +
 debian/libnx-x11.docs     |    2 +-
 debian/libxcomp3.docs     |    2 +-
 debian/libxcompext3.docs  |    2 +-
 debian/libxcompshad3.docs |    2 +-
 debian/nxagent.docs       |    2 +-
 debian/nxauth.docs        |    2 +-
 debian/nxproxy.docs       |    2 +-
 debian/pre-build-nx.sh    |    9 +++++++++
 debian/rules              |    9 +++++++++
 10 files changed, 26 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2730d23..fa30cd8 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 at das-netzwerkteam.de>  Wed, 28 Dec 2011 19:06:26 +0100
 
diff --git a/debian/libnx-x11.docs b/debian/libnx-x11.docs
index a7301fe..5a57a3f 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 9def83b..97efc9f 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 f7a3059..8323a34 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 4e13840..33632b9 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 522622e..111e25b 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 b906fa5..aaa115f 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 cf38b97..4b3d18d 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 c52d3c2..bb18ebe 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 402e22a..b6be368 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


hooks/post-receive
-- 
nx-libs.git (NX libraries)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX libraries).




More information about the x2go-commits mailing list