[Pkg-ganeti-devel] [ganeti] 01/02: Merge tag 'debian/2.11.5-2' into trusty

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch trusty
in repository ganeti.

commit bc59c6fe9c00308e1761fde15a6179fd6d22c850
Merge: 547e085 4a73f02
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Fri Sep 26 15:02:56 2014 +0300

    Merge tag 'debian/2.11.5-2' into trusty
    
    ganeti Debian release 2.11.5-2
    
    Conflicts:
    	debian/rules
             - merge

 debian/changelog | 10 +++++++---
 debian/control   |  2 +-
 debian/copyright |  4 ++--
 debian/rules     |  3 ++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --cc debian/rules
index 90d75c9,ef1b7f0..76437cb
--- a/debian/rules
+++ b/debian/rules
@@@ -43,7 -43,8 +43,8 @@@ override_dh_auto_configure
  	  --with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
  	  --with-user-prefix=$(GNT_USERGROUP_PREFIX) \
  	  --with-group-prefix=$(GNT_USERGROUP_PREFIX) \
- 	  --with-ssh-initscript="/usr/sbin/service ssh"
 -	  --with-ssh-initscript="/usr/sbin/invoke-rc.d ssh" \
++	  --with-ssh-initscript="/usr/sbin/service ssh" \
+ 	  --with-backup-dir="/var/backups"
  
  override_dh_auto_clean:
  	[ ! -f Makefile ] || $(MAKE) distclean

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