[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-105-g381bbae

[X2Go dev team]

The branch, master has been updated
       via  381bbae19c69112d37ed7fbef28f32c87ea1f17b (commit)
       via  309d4caa7717da5b3bec843e97dfd188567ef485 (commit)
      from  4110b7c3d0b6888022e17799856f59e0c99684f5 (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 381bbae19c69112d37ed7fbef28f32c87ea1f17b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Dec 12 12:24:24 2012 +0100

    apply CFLAGS patch to libx2go-server-db-perl/Makefile, as the sgid wrapper build has been moved to that file for 3.2.0.0

commit 309d4caa7717da5b3bec843e97dfd188567ef485
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Dec 12 12:20:41 2012 +0100

    Honour CFLAGS when compiling the server's sgid wrapper script (closes upstream.issue #83).
    
    Conflicts (resolved by Mike Gabriel):
    	x2goserver/Makefile

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

Summary of changes:
 debian/changelog                |    5 +++++
 libx2go-server-db-perl/Makefile |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 03e44ed..07c485f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,11 @@ x2goserver (3.1.1.10-0~x2go1) UNRELEASED; urgency=low
     - Fix mounting of multiple paths, thanks to Pascal Vibet. (Closes upstream
       issue #67).
 
+  [ Orion Poplawski ]
+  * New upstream version (3.1.1.10):
+    - Honour CFLAGS when compiling the server's sgid wrapper script (closes
+      upstream.issue #83).
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 23 Nov 2012 15:35:48 +0100
 
 x2goserver (3.1.1.9-0~x2go1) unstable; urgency=low
diff --git a/libx2go-server-db-perl/Makefile b/libx2go-server-db-perl/Makefile
index bde1379..3d57f2d 100755
--- a/libx2go-server-db-perl/Makefile
+++ b/libx2go-server-db-perl/Makefile
@@ -35,7 +35,7 @@ all: clean build
 build: build-arch build-indep
 
 build-arch:
-	gcc -fPIE -pie -o lib/libx2go-server-db-sqlite3-wrapper src/libx2go-server-db-sqlite3-wrapper.c
+	gcc -fPIE -pie $(CFLAGS) -o lib/libx2go-server-db-sqlite3-wrapper src/libx2go-server-db-sqlite3-wrapper.c
 
 build-indep:
 


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

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 "x2goserver.git" (X2Go Server).