[SCM] scenic packaging branch, master, updated. upstream/0.6.2-106-gb84ba63

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6eba1ed748bd6f0ddc7a506815d2fce73203283a
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Jul 23 00:12:14 2010 +0200

    Add patch 2001 to disable building Python-dependent manpages (currently failing when libraries not already installed). Regenerate manpages during build. Add TODO on fixing the underlying issue and reenable.

diff --git a/debian/TODO b/debian/TODO
index 012f363..c017d6c 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,4 +1,4 @@
  * Create doc-base file for the docbook stuff
  * add python-autotools .mk file in rules
  * use code in rules to manage deps
-
+ * fix build midistream.1 and scenic.1 manpages and enable their install
diff --git a/debian/patches/2001_disable_python-dependent_manpages.patch b/debian/patches/2001_disable_python-dependent_manpages.patch
new file mode 100644
index 0000000..fe858cd
--- /dev/null
+++ b/debian/patches/2001_disable_python-dependent_manpages.patch
@@ -0,0 +1,25 @@
+Description: Avoid building python-dependent midistream.1 and scenic.1 manpages
+ Upstream build routines bogusly work only when its Python library has
+ already been installed.
+Author: Jonas Smedegaard <dr at jones.dk>
+Forwarded: not-needed
+Last-Update: 2010-07-23
+
+--- a/man/Makefile.in
++++ b/man/Makefile.in
+@@ -544,11 +544,11 @@
+ milhouse.1: $(top_srcdir)/src/main/milhouse.cpp $(top_srcdir)/src/util/programOptions.cpp $(common_mandeps) $(top_srcdir)/man/milhouse-man.txt
+ 	$(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=$(top_srcdir)/man/scenic-man.txt --name="Telepresence application for live performance and installations" --no-info $(top_builddir)/py/scripts/scenic -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=$(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=$(top_srcdir)/man/midistream-man.txt --name="Streams MIDI notes and controls over RTP" --no-info $(top_builddir)/py/scripts/midistream -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=$(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=$(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 $@
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..03568de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+2001_disable_python-dependent_manpages.patch
diff --git a/debian/rules b/debian/rules
index bb42c39..a6393f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,13 @@ include /usr/share/cdbs/1/class/python-autotools.mk
 # Unit tests are disabled for now, since it's Python path is broken when they are ran.
 #DEB_MAKE_CHECK_TARGET = check 
 
+# Regenerate Python-dependent manpages
+# TODO: Fix do it in upstream code, and drop patch 2001
+binary-install/scenic::
+	PYTHONPATH=$(cdbs_curdestdir)/usr/lib/python2.6/dist-packages help2man --include=$(DEB_SRCDIR)/man/scenic-man.txt --name="Telepresence application for live performance and installations" --no-info $(cdbs_curdestdir)/usr/bin/scenic -o $(cdbs_curdestdir)/usr/share/man/man1/scenic.1
+binary-install/midistream::
+	PYTHONPATH=$(cdbs_curdestdir)/usr/lib/python2.6/dist-packages help2man --include=$(DEB_SRCDIR)/man/midistream-man.txt --name="Streams MIDI notes and controls over RTP" --no-info $(cdbs_curdestdir)/usr/bin/midistream -o $(cdbs_curdestdir)/usr/share/man/man1/midistream.1
+
 # Ensure proper hash-bang in Python script (Python Policy 0.9 §3.1)
 binary-install/scenic::
 	egrep -r -l -Z '^#! ?/usr/bin/(env )?python[[:print:]]*$$' debian/$(cdbs_curpkg)/usr/bin/* \

-- 
scenic packaging