[SCM] jmeters/master: Refreshed patch

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

The following commit has been merged in the master branch:
commit e9fc694c9ce9061dcb999076c6ab3578b71a3999
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Nov 8 02:47:46 2012 +0100

    Refreshed patch

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index 389115b..bee7ee2 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -7,39 +7,25 @@ Forwarded: no
  source/Makefile |   13 ++++++-------
  1 file changed, 6 insertions(+), 7 deletions(-)
 
---- jmeters.orig/source/Makefile
-+++ jmeters/source/Makefile
-@@ -14,8 +14,8 @@
- #  along with this program; if not, write to the Free Software
- #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Index: jmeters/source/Makefile
+===================================================================
+--- jmeters.orig/source/Makefile	2012-11-08 02:29:13.000000000 +0100
++++ jmeters/source/Makefile	2012-11-08 02:37:27.334132708 +0100
+@@ -20,7 +20,8 @@
  
--
+ 
+ PROGRAM = jmeters
 -PREFIX = /usr/local
 +DESTDIR=
 +PREFIX ?= /usr/local
  SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
  LIBDIR = lib$(SUFFIX)
- SHARED = $(PREFIX)/share
-@@ -24,7 +24,6 @@ VERSION = 0.2.1
- DISTDIR = jmeters-$(VERSION)
+ BINDIR = $(PREFIX)/bin
+@@ -28,7 +29,6 @@
+ VERSION = 0.4.1
  CPPFLAGS += -DPROGRAM=\"$(PROGRAM)\" -DVERSION=\"$(VERSION)\" -DSHARED=\"$(SHARED)\"
  CXXFLAGS += -O3 -Wall -MMD -MP
 -CXXFLAGS += -march=native
  
  
  all:	jmeters
-@@ -43,10 +42,10 @@ $(JMETERS_O):
- 
- 
- install:	all
--	install -d $(PREFIX)/bin
--	install -m 755 jmeters $(PREFIX)/bin
--	install -d $(SHARED)/jmeters
--	install -m 644 ../share/* $(SHARED)/jmeters
-+	install -d $(DESTDIR)$(PREFIX)/bin
-+	install -m 755 jmeters $(DESTDIR)$(PREFIX)/bin
-+	install -d $(DESTDIR)$(SHARED)/jmeters
-+	install -m 644 ../share/* $(DESTDIR)$(SHARED)/jmeters
- 
- clean:
- 	/bin/rm -f *~ *.o *.a *.d *.so

-- 
jmeters packaging