[SCM] scenic packaging branch, master, updated. upstream/0.6.2-76-gb9980b9

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b9980b99f4eede0f566a5c05d7272bb023d8cd63
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jun 21 12:01:23 2010 +0200

    Add patch 1001 to fix help2man generation of Python-related manpages.

diff --git a/debian/patches/1001_man-source-paths.patch b/debian/patches/1001_man-source-paths.patch
new file mode 100644
index 0000000..0c787e6
--- /dev/null
+++ b/debian/patches/1001_man-source-paths.patch
@@ -0,0 +1,35 @@
+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.
new file mode 100644
index 0000000..ca06b35
--- /dev/null
+++ b/debian/patches/1001_man-source-paths.patch.
@@ -0,0 +1,35 @@
+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/README b/debian/patches/README
new file mode 100644
index 0000000..80c1584
--- /dev/null
+++ b/debian/patches/README
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..111daa8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+1001_man-source-paths.patch

-- 
scenic packaging