[SCM] scenic packaging branch, master, updated. upstream/0.6.2-103-g0e38865

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

The following commit has been merged in the master branch:
commit 0e38865a32ac1e66881389c7ab218babe04fe133
Author: Alexandre Quessy <alexandre at quessy.net>
Date:   Tue Jul 20 11:35:38 2010 -0400

    Removing patch that's been fixed upstream

diff --git a/debian/patches/1001_man-source-paths.patch b/debian/patches/1001_man-source-paths.patch
deleted file mode 100644
index 0c787e6..0000000
--- a/debian/patches/1001_man-source-paths.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Upstream changes introduced in version 0.6.2-1
-Author: Jonas Smedegaard <dr at jones.dk>
-Last-Update: 2010-06-21
-
---- scenic-0.6.2.orig/man/Makefile.in
-+++ scenic-0.6.2/man/Makefile.in
-@@ -541,22 +541,22 @@ uninstall-man: uninstall-man1
- # binary when any source file changes, only the main one.
- # Use -o so that the `missing' program can infer the output file.
- milhouse.1: $(top_srcdir)/src/main/milhouse.cpp $(top_srcdir)/src/util/programOptions.cpp $(common_mandeps) $(top_srcdir)/man/milhouse-man.txt
--	$(HELP2MAN) --include=milhouse-man.txt --name="Streams audio and video with GStreamer over RTP" --no-info $(top_builddir)/src/main/milhouse -o $@
-+	$(HELP2MAN) --include=$(top_srcdir)/man/milhouse-man.txt --name="Streams audio and video with GStreamer over RTP" --no-info $(top_builddir)/src/main/milhouse -o $@
- 
- scenic.1: $(top_srcdir)/py/scenic/runner.py $(top_srcdir)/py/scripts/scenic.in  $(top_srcdir)/py/scenic/configure.py.in $(common_mandeps) $(top_srcdir)/man/scenic-man.txt
--	$(HELP2MAN) --include=scenic-man.txt --name="Telepresence application for live performance and installations" --no-info $(top_builddir)/py/scripts/scenic -o $@
-+	export PYTHONPATH=$(top_srcdir)/py; $(HELP2MAN) --include=$(top_srcdir)/man/scenic-man.txt --name="Telepresence application for live performance and installations" --no-info $(top_builddir)/py/scripts/scenic -o $@
- 
- midistream.1: $(top_srcdir)/py/scripts/midistream.in $(top_srcdir)/py/rtpmidi/runner.py $(common_mandeps) $(top_srcdir)/man/midistream-man.txt
--	$(HELP2MAN) --include=midistream-man.txt --name="Streams MIDI notes and controls over RTP" --no-info $(top_builddir)/py/scripts/midistream -o $@
-+	export PYTHONPATH=$(top_srcdir)/py; $(HELP2MAN) --include=$(top_srcdir)/man/midistream-man.txt --name="Streams MIDI notes and controls over RTP" --no-info $(top_builddir)/py/scripts/midistream -o $@
- 
- firereset.1: $(top_srcdir)/src/firereset/firereset.c $(top_srcdir)/man/firereset-man.txt
--	$(HELP2MAN) --include=firereset-man.txt --name="Resets a IEEE 1394 bus to help in case of problems" --no-info $(top_builddir)/src/firereset/firereset -o $@
-+	$(HELP2MAN) --include=$(top_srcdir)/man/firereset-man.txt --name="Resets a IEEE 1394 bus to help in case of problems" --no-info $(top_builddir)/src/firereset/firereset -o $@
- 
- jack-info.1: $(top_srcdir)/utils/jack-info/jack_info.c $(top_srcdir)/man/jack-info-man.txt
--	$(HELP2MAN) --include=jack-info-man.txt --name="Prints informations about running JACK servers" --no-info $(top_builddir)/utils/jack-info/jack-info -o $@
-+	$(HELP2MAN) --include=$(top_srcdir)/man/jack-info-man.txt --name="Prints informations about running JACK servers" --no-info $(top_builddir)/utils/jack-info/jack-info -o $@
- 
- dc-ctl.1: $(top_srcdir)/utils/dc-ctl/dc-ctl.cpp  $(top_srcdir)/man/dc-ctl-man.txt
--	$(HELP2MAN) --include=dc-ctl-man.txt --name="Image control for IIDC IEEE 1394 cameras" --no-info $(top_builddir)/utils/dc-ctl/dc-ctl -o $@
-+	$(HELP2MAN) --include=$(top_srcdir)/man/dc-ctl-man.txt --name="Image control for IIDC IEEE 1394 cameras" --no-info $(top_builddir)/utils/dc-ctl/dc-ctl -o $@
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/debian/patches/1001_man-source-paths.patch. b/debian/patches/1001_man-source-paths.patch.
deleted file mode 100644
index ca06b35..0000000
--- a/debian/patches/1001_man-source-paths.patch.
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Upstream changes introduced in version 0.6.2-1
-Author: Jonas Smedegaard <dr at jones.dk>
-Last-Update: 2010-06-21
-
---- scenic-0.6.2.orig/man/Makefile.in
-+++ scenic-0.6.2/man/Makefile.in
-@@ -541,22 +541,22 @@ uninstall-man: uninstall-man1
- # binary when any source file changes, only the main one.
- # Use -o so that the `missing' program can infer the output file.
- milhouse.1: $(top_srcdir)/src/main/milhouse.cpp $(top_srcdir)/src/util/programOptions.cpp $(common_mandeps) $(top_srcdir)/man/milhouse-man.txt
--	$(HELP2MAN) --include=milhouse-man.txt --name="Streams audio and video with GStreamer over RTP" --no-info $(top_builddir)/src/main/milhouse -o $@
-+	$(HELP2MAN) --include=$(top_srcdir)/man/milhouse-man.txt --name="Streams audio and video with GStreamer over RTP" --no-info $(top_builddir)/src/main/milhouse -o $@
- 
- scenic.1: $(top_srcdir)/py/scenic/runner.py $(top_srcdir)/py/scripts/scenic.in  $(top_srcdir)/py/scenic/configure.py.in $(common_mandeps) $(top_srcdir)/man/scenic-man.txt
--	$(HELP2MAN) --include=scenic-man.txt --name="Telepresence application for live performance and installations" --no-info $(top_builddir)/py/scripts/scenic -o $@
-+	$(HELP2MAN) --include=$(top_srcdir)/man/scenic-man.txt --name="Telepresence application for live performance and installations" --no-info $(top_builddir)/py/scripts/scenic -o $@
- 
- midistream.1: $(top_srcdir)/py/scripts/midistream.in $(top_srcdir)/py/rtpmidi/runner.py $(common_mandeps) $(top_srcdir)/man/midistream-man.txt
--	$(HELP2MAN) --include=midistream-man.txt --name="Streams MIDI notes and controls over RTP" --no-info $(top_builddir)/py/scripts/midistream -o $@
-+	$(HELP2MAN) --include=$(top_srcdir)/man/midistream-man.txt --name="Streams MIDI notes and controls over RTP" --no-info $(top_builddir)/py/scripts/midistream -o $@
- 
- firereset.1: $(top_srcdir)/src/firereset/firereset.c $(top_srcdir)/man/firereset-man.txt
--	$(HELP2MAN) --include=firereset-man.txt --name="Resets a IEEE 1394 bus to help in case of problems" --no-info $(top_builddir)/src/firereset/firereset -o $@
-+	$(HELP2MAN) --include=$(top_srcdir)/man/firereset-man.txt --name="Resets a IEEE 1394 bus to help in case of problems" --no-info $(top_builddir)/src/firereset/firereset -o $@
- 
- jack-info.1: $(top_srcdir)/utils/jack-info/jack_info.c $(top_srcdir)/man/jack-info-man.txt
--	$(HELP2MAN) --include=jack-info-man.txt --name="Prints informations about running JACK servers" --no-info $(top_builddir)/utils/jack-info/jack-info -o $@
-+	$(HELP2MAN) --include=$(top_srcdir)/man/jack-info-man.txt --name="Prints informations about running JACK servers" --no-info $(top_builddir)/utils/jack-info/jack-info -o $@
- 
- dc-ctl.1: $(top_srcdir)/utils/dc-ctl/dc-ctl.cpp  $(top_srcdir)/man/dc-ctl-man.txt
--	$(HELP2MAN) --include=dc-ctl-man.txt --name="Image control for IIDC IEEE 1394 cameras" --no-info $(top_builddir)/utils/dc-ctl/dc-ctl -o $@
-+	$(HELP2MAN) --include=$(top_srcdir)/man/dc-ctl-man.txt --name="Image control for IIDC IEEE 1394 cameras" --no-info $(top_builddir)/utils/dc-ctl/dc-ctl -o $@
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/debian/patches/series b/debian/patches/series
index 111daa8..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-1001_man-source-paths.patch

-- 
scenic packaging