[emos] 03/06: merge dev-cmake changes properly

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository emos.

commit 2fbf44c989020a3f8104b5348b9771842d66ff81
Merge: 8a94e67 f266d4c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Jun 27 09:48:25 2015 +0100

    merge dev-cmake changes properly

 debian/patches/shared.patch | 30 ++++++++++++------------------
 debian/rules                |  2 +-
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --cc debian/rules
index 8787b48,06f197b..39ee1b9
--- a/debian/rules
+++ b/debian/rules
@@@ -1,6 -1,6 +1,6 @@@
  #!/usr/bin/make -f
  
- # export DH_VERBOSE=1
 -# export DH_VERBOSE=1
++export DH_VERBOSE=1
  
  # The magic debhelper  rule
  %:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/emos.git