[Pkg-ganeti-devel] [ganeti] 03/04: Refresh all patches

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch master
in repository ganeti.

commit e2068223b257cd2975ed265d45dfb6090770e71b
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Fri May 16 09:47:50 2014 +0300

    Refresh all patches
---
 debian/patches/0003-Disable-local-checks-during-build.patch | 4 +---
 debian/patches/cfgupgrade12-remove-old-ssconf.patch         | 2 +-
 debian/patches/fix-startup-with-old-config.patch            | 2 +-
 debian/patches/pass-ghc-linker-flags.patch                  | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0003-Disable-local-checks-during-build.patch b/debian/patches/0003-Disable-local-checks-during-build.patch
index 4ff6c30..e5f5a4e 100644
--- a/debian/patches/0003-Disable-local-checks-during-build.patch
+++ b/debian/patches/0003-Disable-local-checks-during-build.patch
@@ -11,11 +11,9 @@ Last-Update: 2013-07-12
  Makefile.in |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/Makefile.in b/Makefile.in
-index 2936193..a1890e5 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -2571,7 +2571,7 @@ distcleancheck: distclean
+@@ -3142,7 +3142,7 @@
  	       exit 1; } >&2
  check-am: all-am
  	$(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS)
diff --git a/debian/patches/cfgupgrade12-remove-old-ssconf.patch b/debian/patches/cfgupgrade12-remove-old-ssconf.patch
index c062a26..fced23d 100644
--- a/debian/patches/cfgupgrade12-remove-old-ssconf.patch
+++ b/debian/patches/cfgupgrade12-remove-old-ssconf.patch
@@ -6,7 +6,7 @@ Author: Iustin Pop <iustin at debian.org>
 Last-Update: 2010-10-24
 --- a/tools/cfgupgrade12
 +++ b/tools/cfgupgrade12
-@@ -404,6 +404,10 @@
+@@ -407,6 +407,10 @@
          logging.debug("Writing RAPI certificate to %s", options.RAPI_CERT_FILE)
          utils.GenerateSelfSignedSslCert(options.RAPI_CERT_FILE)
  
diff --git a/debian/patches/fix-startup-with-old-config.patch b/debian/patches/fix-startup-with-old-config.patch
index 0f20177..4cb61b0 100644
--- a/debian/patches/fix-startup-with-old-config.patch
+++ b/debian/patches/fix-startup-with-old-config.patch
@@ -5,7 +5,7 @@ Author: Iustin Pop <iusty at k1024.org>
 Last-Update: 2009-12-04
 --- a/doc/examples/ganeti.initd.in
 +++ b/doc/examples/ganeti.initd.in
-@@ -59,6 +59,16 @@
+@@ -68,6 +68,16 @@
  }
  
  start_all() {
diff --git a/debian/patches/pass-ghc-linker-flags.patch b/debian/patches/pass-ghc-linker-flags.patch
index 65b14ab..17696f6 100644
--- a/debian/patches/pass-ghc-linker-flags.patch
+++ b/debian/patches/pass-ghc-linker-flags.patch
@@ -6,7 +6,7 @@ Forwarded: no
 Last-Update: 2013-11-01
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -801,6 +801,7 @@
+@@ -904,6 +904,7 @@
  	-O -Wall -Werror -isrc \
  	-fwarn-monomorphism-restriction \
  	-fwarn-tabs \

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