[X2go-Commits] x2gobroker.git - master (branch) updated: 0.0.0.7-2-g2b21500

[X2Go dev team]

The branch, master has been updated
       via  2b21500f91135c8646103c6389c5cf66c2be4c17 (commit)
      from  7475b931d6cc28ce59b0259d9d2b9c258e1bbc14 (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 2b21500f91135c8646103c6389c5cf66c2be4c17
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 7 18:20:15 2013 +0100

    /debian/control, /debian/rules: Add hack that allows building the package with python2 or pysupport, depending on what's present on the build system.

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

Summary of changes:
 Makefile         |    3 ---
 debian/changelog |    6 +++++-
 debian/control   |    4 ++--
 debian/rules     |   10 +++++++---
 4 files changed, 14 insertions(+), 9 deletions(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index 3c90c45..b5c2148 100755
--- a/Makefile
+++ b/Makefile
@@ -69,10 +69,7 @@ clean_arch:
 	rm -f lib/x2gobroker-agent
 
 clean_indep:
-	-make -f Makefile.perl realclean
 
 test:
-	make -f Makefile.perl test
 
 install:
-	make -f Makefile.perl install
diff --git a/debian/changelog b/debian/changelog
index 6ae4d27..4b5447c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 x2gobroker (0.0.0.8-0~x2go1) UNRELEASED; urgency=low
 
-  * Continue development...
+  * New upstream version (0.0.0.7):
+    - Continue development...
+  * /debian/control, /debian/rules:
+    + Add hack that allows building the package with python2 or pysupport,
+      depending on what's present on the build system.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 07 Mar 2013 07:16:33 +0100
 
diff --git a/debian/control b/debian/control
index 79dc5cb..8dd0112 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Uploaders:
  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>,
 Build-Depends:
  debhelper (>= 7.0.50~),
- cdbs (>= 0.4.90~),
- dpkg-dev (>= 1.16.1~),
+ cdbs (>= 0.4.49~),
+ dpkg-dev (>= (1.14.31~),
  python (>= 2.6.5-0~),
  python-setuptools,
  python-nose,
diff --git a/debian/rules b/debian/rules
index 997158b..bdf3e3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,9 +17,13 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_CFLAGS_MAINT_APPEND = -Wall
-include /usr/share/dpkg/buildflags.mk
+# this doesn't work, so commenting it out...
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+#export DEB_CFLAGS_MAINT_APPEND = -Wall
+#include /usr/share/dpkg/buildflags.mk
+
+DEB_PYTHON_SYSTEM = $(shell test -f /usr/bin/dh_python2 && echo "" || echo "pysupport")
+DEB_PYTHON_INSTALL_ARGS_ALL = --install-layout=deb --single-version-externally-managed
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).