[X2go-Commits] nxcompshad.git - master (branch) updated: 3.5.0-2-3-g3a3d67d

[X2go dev team]

The branch, master has been updated
       via  3a3d67d1e2e66a44558399b263e9bc3e9c3990ce (commit)
       via  cd9e5eda188bc866f6f363cbc76ec18dfea437e6 (commit)
       via  8c2e841aa8c7a0c52cb8cf33499d55d006499c63 (commit)
      from  cae6a347cda7e42f976a39aecd902d6d423ed50c (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 3a3d67d1e2e66a44558399b263e9bc3e9c3990ce
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Oct 14 01:44:51 2011 +0200

    add DEB_BUILD_MULTIARCH to rules file

commit cd9e5eda188bc866f6f363cbc76ec18dfea437e6
Merge: 8c2e841aa8c7a0c52cb8cf33499d55d006499c63 cae6a347cda7e42f976a39aecd902d6d423ed50c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Oct 14 01:39:33 2011 +0200

    Merge branch 'master' of ssh://code.x2go.org:32032/srv/git/code.x2go.org/nxcompshad

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

Summary of changes:
 debian/changelog |    7 ++-----
 debian/rules     |    2 ++
 2 files changed, 4 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 59981c6..aa0feca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,9 @@
-nxcompshad (3.5.0-2-0~x2go3) UNRELEASED; urgency=low
-
-  [ Mike Gabriel ]
-  * Continuing work...
+nxcompshad (3.5.0-2-0~x2go3) unstable; urgency=low
 
   [ Reinhard Tartler ]
   * Build -dbg package.
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 17 Aug 2011 18:56:23 +0200
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 04 Oct 2011 20:37:33 +0200
 
 nxcompshad (3.5.0-2-0~x2go2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 87006da..7654069 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
+
 %:
 	dh --with autoreconf --parallel $@
 


hooks/post-receive
-- 
nxcompshad.git (NX compshad library)

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 "nxcompshad.git" (NX compshad library).