bump debian version for 0.84 and refresh patchesNotice: this object is not reachable from any branch.

Notice: this object is not reachable from any branch.

6 files changed, 24 insertions, 42 deletions

diff --git a/debian/changelog b/debian/changelog
index 61c3356..479576d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-rt-tests (0.83-1) unstable; urgency=low
+rt-tests (0.84-1) UNRELEASED; urgency=low
 
   * new upstream release
 
- -- Uwe Kleine-König <u.kleine-koenig@pengutronix.de>  Fri, 02 Dec 2011 10:40:15 +0100
+ -- Uwe Kleine-König <u.kleine-koenig@pengutronix.de>  Sun, 05 Aug 2012 21:29:39 +0200
 
 rt-tests (0.74-1) unstable; urgency=low
 
diff --git a/debian/patches/backfire-fix-build-failure-for-modern-kernels.patch b/debian/patches/backfire-fix-build-failure-for-modern-kernels.patch
index 2059dd8..6be2f5f 100644
--- a/debian/patches/backfire-fix-build-failure-for-modern-kernels.patch
+++ b/debian/patches/backfire-fix-build-failure-for-modern-kernels.patch
@@ -12,10 +12,8 @@ Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 Forwarded: id:1313844843-6405-1-git-send-email-u.kleine-koenig@pengutronix.de
 ---
  src/backfire/backfire.c |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/src/backfire/backfire.c b/src/backfire/backfire.c
-index aaf9c4a..0e9a0df 100644
 --- a/src/backfire/backfire.c
 +++ b/src/backfire/backfire.c
 @@ -24,7 +24,6 @@
@@ -35,6 +33,3 @@ index aaf9c4a..0e9a0df 100644
  static int backfire_open_cnt; /* #times opened */
  static int backfire_open_mode; /* special open modes */
  static struct timeval sendtime; /* when the most recent signal was sent */
--- 
-1.7.5.4
-
diff --git a/debian/patches/debian_has_recent_glibc b/debian/patches/debian_has_recent_glibc
index cfaa930..805fcf0 100644
--- a/debian/patches/debian_has_recent_glibc
+++ b/debian/patches/debian_has_recent_glibc
@@ -10,46 +10,32 @@ This fixes a (harmless) build warning
 Forwarded: not-needed
 Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 ---
- Makefile                 |   11 +++++------
+ Makefile                 |    5 ++---
  src/include/rt-get_cpu.h |   19 +------------------
  src/lib/rt-get_cpu.c     |   27 ---------------------------
- 3 files changed, 6 insertions(+), 51 deletions(-)
+ 3 files changed, 3 insertions(+), 48 deletions(-)
 
 --- a/Makefile
 +++ b/Makefile
 @@ -7,7 +7,6 @@
  TARGETS = $(sources:.c=)
  
- LIBS 	= -lrt -lpthread
+ LIBS 	= -lrt -lpthread -lrttest -L.
 -EXTRA_LIBS ?= -ldl	# for get_cpu
  DESTDIR	?=
  prefix  ?= /usr/local
  bindir  ?= $(prefix)/bin
-@@ -75,19 +74,19 @@
- rt-migrate-test: rt-migrate-test.o
- 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
+@@ -97,8 +96,8 @@
+ hackbench: hackbench.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
  
--ptsematest: ptsematest.o rt-utils.o rt-get_cpu.o
-+ptsematest: ptsematest.o rt-utils.o
- 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
+-librttest.a: rt-utils.o error.o rt-get_cpu.o
+-	$(AR) rcs librttest.a rt-utils.o error.o rt-get_cpu.o
++librttest.a: rt-utils.o error.o
++	$(AR) rcs librttest.a rt-utils.o error.o
  
--sigwaittest: sigwaittest.o rt-utils.o rt-get_cpu.o
-+sigwaittest: sigwaittest.o rt-utils.o
- 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
- 
--svsematest: svsematest.o rt-utils.o rt-get_cpu.o
-+svsematest: svsematest.o rt-utils.o
- 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
- 
--pmqtest: pmqtest.o rt-utils.o rt-get_cpu.o
-+pmqtest: pmqtest.o rt-utils.o
- 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
- 
--sendme: sendme.o rt-utils.o rt-get_cpu.o
-+sendme: sendme.o rt-utils.o
- 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
- 
- pip_stress: pip_stress.o error.o rt-utils.o
+ CLEANUP  = $(TARGETS) *.o .depend *.*~ *.orig *.rej rt-tests.spec *.d *.a
+ CLEANUP += $(if $(wildcard .git), ChangeLog)
 --- a/src/include/rt-get_cpu.h
 +++ b/src/include/rt-get_cpu.h
 @@ -19,27 +19,10 @@
diff --git a/debian/patches/fix_comment_about_realtime_group.patch b/debian/patches/fix_comment_about_realtime_group.patch
index 6302d62..cb5aae8 100644
--- a/debian/patches/fix_comment_about_realtime_group.patch
+++ b/debian/patches/fix_comment_about_realtime_group.patch
@@ -14,7 +14,7 @@ Closes: http://bugs.debian.org/619938
 
 --- a/src/lib/rt-utils.c
 +++ b/src/lib/rt-utils.c
-@@ -264,7 +264,8 @@
+@@ -265,7 +265,8 @@
  	param.sched_priority = 1;
  	if (sched_setscheduler(0, SCHED_FIFO, &param)) {
  		fprintf(stderr, "Unable to change scheduling policy!\n");
diff --git a/debian/patches/install_hwlatdetect_into_sbindir b/debian/patches/install_hwlatdetect_into_sbindir
index 8299b59..ef33069 100644
--- a/debian/patches/install_hwlatdetect_into_sbindir
+++ b/debian/patches/install_hwlatdetect_into_sbindir
@@ -6,8 +6,8 @@ needs root privileges install it into $sbindir.
 
 Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 ---
- Makefile |    8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
+ Makefile |    9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
 
 --- a/Makefile
 +++ b/Makefile
@@ -19,21 +19,22 @@ Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  mandir	?= $(prefix)/share/man
  srcdir	?= $(prefix)/src
  
-@@ -22,8 +23,6 @@
- 
- CFLAGS = -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include
+@@ -23,8 +24,6 @@
+ CFLAGS ?= -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include
+ LDFLAGS ?=
  
 -PYLIB  := $(shell python -c 'import distutils.sysconfig;  print distutils.sysconfig.get_python_lib()')
 -
  ifndef DEBUG
  	CFLAGS	+= -O2
  else
-@@ -119,10 +118,7 @@
+@@ -123,11 +122,7 @@
  	mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(mandir)/man4"
  	mkdir -p "$(DESTDIR)$(srcdir)" "$(DESTDIR)$(mandir)/man8"
  	cp $(TARGETS) "$(DESTDIR)$(bindir)"
 -	if test -n "$(PYLIB)" ; then \
 -		install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \
+-		rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \
 -		ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \
 -	fi
 +	install -D -m 755 src/hwlatdetect/hwlatdetect.py "$(DESTDIR)$(sbindir)/hwlatdetect"
diff --git a/debian/patches/manpage_pip_stress.patch b/debian/patches/manpage_pip_stress.patch
index 6c7c23f..48e45e5 100644
--- a/debian/patches/manpage_pip_stress.patch
+++ b/debian/patches/manpage_pip_stress.patch
@@ -41,7 +41,7 @@ Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 +was written by John Kacur <jkacur@redhat.com>.
 --- a/Makefile
 +++ b/Makefile
-@@ -124,6 +124,7 @@
+@@ -128,6 +128,7 @@
  	gzip src/backfire/backfire.4 -c >"$(DESTDIR)$(mandir)/man4/backfire.4.gz"
  	gzip src/cyclictest/cyclictest.8 -c >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz"
  	gzip src/pi_tests/pi_stress.8 -c >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz"