[debian-edu-commits] debian-edu/pkg-team/ 26/159: let’s try building them

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository xrdp.

commit 76040872840f259a5e88f4a47c33a5503bb9e027
Author: mirabilos <tg at mirbsd.org>
Date:   Wed Aug 5 20:24:23 2015 +0200

    let’s try building them
---
 changelog            |  2 +-
 patches/series       |  1 +
 patches/submake.diff | 11 +++++++++++
 rules                |  3 +++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 8cdf1b4..44c0816 100644
--- a/changelog
+++ b/changelog
@@ -4,7 +4,7 @@ xrdp (0.9.0~git20150803-1~alpha1) teckids; urgency=medium
   * Update copyright file from snapshot and issue #232
   * Also make xorgxrdp module
 
- -- Thorsten Glaser <thorsten.glaser at teckids.org>  Wed, 05 Aug 2015 19:20:07 +0200
+ -- Thorsten Glaser <thorsten.glaser at teckids.org>  Wed, 05 Aug 2015 20:24:11 +0200
 
 xrdp (0.9.0~git20150318-1~alpha1) teckids; urgency=medium
 
diff --git a/patches/series b/patches/series
index f0a1ab7..ce9c05d 100644
--- a/patches/series
+++ b/patches/series
@@ -1,2 +1,3 @@
 debian-manpage.diff
 libtoolise.diff
+submake.diff
diff --git a/patches/submake.diff b/patches/submake.diff
new file mode 100644
index 0000000..5ca122f
--- /dev/null
+++ b/patches/submake.diff
@@ -0,0 +1,11 @@
+# DP: recurse into xorgxrdp/ as well
+# DP: maybe should be made into a proper configure option for upstream
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -27,4 +27,5 @@ SUBDIRS = \
+   instfiles \
+   genkeymap \
+   xrdpapi \
++  xorgxrdp \
+   $(XRDPVRDIR)
diff --git a/rules b/rules
index a77d217..1a512ec 100755
--- a/rules
+++ b/rules
@@ -36,4 +36,7 @@ override_dh_auto_configure:
 	    --enable-rfxcodec \
 	    --enable-opus
 	cd xorgxrdp && ./configure ${CONFIGURE_ARGS}
+
+override_dh_auto_install:
+	dh_auto_install -v
 	exit 1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/xrdp.git