[SCM] caps/master: Refreshed patches.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 387a7813b6765eed0c574e6dacda2a0e6ef462b2
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Aug 28 21:53:07 2013 +0200

    Refreshed patches.

diff --git a/debian/patches/02-fix_destdir.patch b/debian/patches/02-fix_destdir.patch
index 5a4caf7..236bb5b 100644
--- a/debian/patches/02-fix_destdir.patch
+++ b/debian/patches/02-fix_destdir.patch
@@ -4,15 +4,15 @@ Forwarded: no
 
 Index: caps/Makefile
 ===================================================================
---- caps.orig/Makefile	2013-08-15 23:21:13.398263229 +0200
-+++ caps/Makefile	2013-08-15 23:26:44.659905865 +0200
+--- caps.orig/Makefile	2013-08-28 21:46:57.426497661 +0200
++++ caps/Makefile	2013-08-28 21:46:57.422497660 +0200
 @@ -1,4 +1,5 @@
  PREFIX = /usr
 +DESTDIR=
  
  CC = g++
  
-@@ -55,24 +56,24 @@
+@@ -58,24 +59,24 @@
  
  install: all
  	@$(STRIP) $(PLUG).so > /dev/null
diff --git a/debian/patches/03-fix_hardening.patch b/debian/patches/03-fix_hardening.patch
index 9166630..24b38f7 100644
--- a/debian/patches/03-fix_hardening.patch
+++ b/debian/patches/03-fix_hardening.patch
@@ -2,10 +2,10 @@ Description:  Fix hardening by pasing LDFLAGS properly.
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: no
 
-Index: caps-back/Makefile
+Index: caps/Makefile
 ===================================================================
---- caps-back.orig/Makefile	2013-08-15 23:50:47.163058854 +0200
-+++ caps-back/Makefile	2013-08-15 23:56:02.632623183 +0200
+--- caps.orig/Makefile	2013-08-28 21:46:07.522495631 +0200
++++ caps/Makefile	2013-08-28 21:46:07.514495631 +0200
 @@ -11,8 +11,8 @@
  
  -include defines.make
@@ -15,5 +15,5 @@ Index: caps-back/Makefile
 +CFLAGS += $(OPTS) $(_CFLAGS)
 +LDFLAGS += $(_LDFLAGS) $(CFLAGS)
  
- VERSION = 0.9.10
+ VERSION = 0.9.16
  PLUG = caps
diff --git a/debian/patches/04-fix_optimization.patch b/debian/patches/04-fix_optimization.patch
index 5336688..e1d2761 100644
--- a/debian/patches/04-fix_optimization.patch
+++ b/debian/patches/04-fix_optimization.patch
@@ -4,14 +4,14 @@ Forwarded: no
 
 Index: caps/Makefile
 ===================================================================
---- caps.orig/Makefile	2013-08-19 00:41:43.764475952 +0200
-+++ caps/Makefile	2013-08-19 00:44:24.204482476 +0200
+--- caps.orig/Makefile	2013-08-28 21:48:15.094500819 +0200
++++ caps/Makefile	2013-08-28 21:48:32.302501518 +0200
 @@ -3,7 +3,7 @@
  
  CC = g++
  
--OPTS = -O6 -ffast-math -funroll-loops -Wall -fPIC -DPIC
-+OPTS = -O3 -ffast-math -funroll-loops -Wall -fPIC -DPIC
+-OPTS = -O6 -ffast-math -funroll-loops -Wall -Wno-psabi -fPIC -DPIC
++OPTS = -O3 -ffast-math -funroll-loops -Wall -Wno-psabi -fPIC -DPIC
  #OPTS = -g -DDEBUG 
  
  _LDFLAGS = -shared 

-- 
caps packaging