[SCM] caps/master: Patches removed - applied upstream.

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

The following commit has been merged in the master branch:
commit bed3e23b741dda246773de2e5032c49f7b643f11
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Feb 6 14:59:03 2014 +0100

    Patches removed - applied upstream.

diff --git a/debian/patches/01-fix_prefix.patch b/debian/patches/01-fix_prefix.patch
deleted file mode 100644
index b4d4e0e..0000000
--- a/debian/patches/01-fix_prefix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description:  Set prefix properly
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: no
-
-Index: caps/Makefile
-===================================================================
---- caps.orig/Makefile	2013-08-15 21:57:28.000000000 +0200
-+++ caps/Makefile	2013-08-15 22:08:30.448628529 +0200
-@@ -1,4 +1,4 @@
--PREFIX = /usr/local
-+PREFIX = /usr
- 
- CC = g++
- 
diff --git a/debian/patches/02-fix_destdir.patch b/debian/patches/02-fix_destdir.patch
deleted file mode 100644
index cbab32a..0000000
--- a/debian/patches/02-fix_destdir.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description:  Set DESTDIR
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: yes
-
-Index: caps/Makefile
-===================================================================
---- 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++
- 
-@@ -58,24 +59,24 @@
- 
- install: all
- 	@$(STRIP) $(PLUG).so > /dev/null
--	install -d $(DEST)
--	install -m 644 $(PLUG).so $(DEST)
--	install -d $(RDFDEST)
--	install -m 644 $(PLUG).rdf $(RDFDEST)
-+	install -d $(DESTDIR)$(DEST)
-+	install -m 644 $(PLUG).so $(DESTDIR)$(DEST)
-+	install -d $(DESTDIR)$(RDFDEST)
-+	install -m 644 $(PLUG).rdf $(DESTDIR)$(RDFDEST)
- 
- fake-install: all
--	-rm $(DEST)/$(PLUG).so
--	ln -s `pwd`/$(PLUG).so $(DEST)/$(PLUG).so
--	-rm $(RDFDEST)/$(PLUG).rdf
--	ln -s `pwd`/$(PLUG).rdf $(RDFDEST)/$(PLUG).rdf
-+	-rm $(DESTDIR)$(DEST)/$(PLUG).so
-+	ln -s `pwd`/$(PLUG).so $(DESTDIR)$(DEST)/$(PLUG).so
-+	-rm $(DESTDIR)$(RDFDEST)/$(PLUG).rdf
-+	ln -s `pwd`/$(PLUG).rdf $(DESTDIR)$(RDFDEST)/$(PLUG).rdf
- 
- rdf-install:
--	install -d $(RDFDEST)
--	install -m 644 $(PLUG).rdf $(RDFDEST)
-+	install -d $(DESTDIR)$(RDFDEST)
-+	install -m 644 $(PLUG).rdf $(DESTDIR)$(RDFDEST)
- 
- uninstall:
--	-rm $(DEST)/$(PLUG).so
--	-rm $(DEST)/$(PLUG)-ng.so
-+	-rm $(DESTDIR)$(DEST)/$(PLUG).so
-+	-rm $(DESTDIR)$(DEST)/$(PLUG)-ng.so
- 
- clean:
- 	rm -f $(OBJECTS) $(PLUG).so *.s depend
diff --git a/debian/patches/03-fix_hardening.patch b/debian/patches/03-fix_hardening.patch
deleted file mode 100644
index 619064d..0000000
--- a/debian/patches/03-fix_hardening.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description:  Fix hardening by pasing LDFLAGS properly.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: yes
-
-Index: caps/Makefile
-===================================================================
---- 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
- 
--CFLAGS = $(OPTS) $(_CFLAGS)
--LDFLAGS = $(_LDFLAGS) $(CFLAGS)
-+CFLAGS += $(OPTS) $(_CFLAGS)
-+LDFLAGS += $(_LDFLAGS) $(CFLAGS)
- 
- VERSION = 0.9.16
- PLUG = caps
diff --git a/debian/patches/04-fix_optimization.patch b/debian/patches/04-fix_optimization.patch
deleted file mode 100644
index 782d9dd..0000000
--- a/debian/patches/04-fix_optimization.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description:  Fix optimization.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: yes
-
-Index: caps/Makefile
-===================================================================
---- 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 -Wno-psabi -fPIC -DPIC
-+OPTS = -O3 -ffast-math -funroll-loops -Wall -Wno-psabi -fPIC -DPIC
- #OPTS = -g -DDEBUG 
- 
- _LDFLAGS = -shared 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 67c6c0b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-01-fix_prefix.patch
-02-fix_destdir.patch
-03-fix_hardening.patch
-04-fix_optimization.patch

-- 
caps packaging