[PATCH] Ship new binaries, install manpages with dh_install.

[Andreas Metzler]

---
 debian/changelog            |    6 ++++++
 debian/hugin-tools.install  |    9 +++++++++
 debian/hugin-tools.manpages |    6 ------
 debian/hugin.install        |    5 +++++
 debian/hugin.manpages       |    3 ---
 5 files changed, 20 insertions(+), 9 deletions(-)
 delete mode 100644 debian/hugin-tools.manpages
 delete mode 100644 debian/hugin.manpages

diff --git a/debian/changelog b/debian/changelog
index 3e40a2c..4f94e4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,12 @@ hugin (0.8.0~beta4-1) experimental; urgency=low
       30_manpage_hyphen_fixes: Fix hyphens in doc/fulla.1.
     + Update 40_fix_implicit_linking.
     + Now requires wxWidgets 2.8, GLEW and OpenGL. Update build-depends.
+    + New binaries matchpoint, celeste_standalone, pto2mk,
+      PTBatcherGUI and PTBatcher.
+    + Upstream's build system now correctly installs manpages, making it
+      possible to use dh_install instead of dh_installman to put them in
+      Debian packages. This makes "dh_install --list-missing
+      --sourcedir=debian/tmp" very useful.
 
  -- Andreas Metzler <ametzler at debian.org>  Sun, 03 May 2009 08:51:32 +0200
 
diff --git a/debian/hugin-tools.install b/debian/hugin-tools.install
index 3f27a97..8e3ab7f 100644
--- a/debian/hugin-tools.install
+++ b/debian/hugin-tools.install
@@ -6,10 +6,19 @@ usr/bin/hugin_hdrmerge
 usr/bin/nona
 usr/bin/tca_correct
 usr/bin/vig_optimize
+usr/bin/PTBatcher
+usr/bin/celeste_standalone
+usr/bin/matchpoint
+usr/bin/pto2mk
 usr/lib
 
 # Manpages
 usr/share/man/man1/fulla.1
+usr/share/man/man1/hugin_hdrmerge.1
+usr/share/man/man1/autooptimiser.1
+usr/share/man/man1/align_image_stack.1
+usr/share/man/man1/nona.1
+usr/share/man/man1/vig_optimize.1
 
 # Lintian overrides
 ../overrides/hugin-tools usr/share/lintian/overrides
diff --git a/debian/hugin-tools.manpages b/debian/hugin-tools.manpages
deleted file mode 100644
index 0f8ad2a..0000000
--- a/debian/hugin-tools.manpages
+++ /dev/null
@@ -1,6 +0,0 @@
-doc/align_image_stack.1
-doc/autooptimiser.1
-debian/tmp/usr/share/man/man1/fulla.1
-doc/hugin_hdrmerge.1
-doc/nona.1
-doc/vig_optimize.1
diff --git a/debian/hugin.install b/debian/hugin.install
index 9b344f3..b39506d 100644
--- a/debian/hugin.install
+++ b/debian/hugin.install
@@ -2,6 +2,11 @@
 usr/bin/hugin
 usr/bin/hugin_stitch_project
 usr/bin/nona_gui
+usr/bin/PTBatcherGUI
+
+usr/share/man/man1/nona_gui.1
+usr/share/man/man1/hugin.1
+usr/share/man/man1/hugin_stitch_project.1
 
 # Desktop
 usr/share/applications
diff --git a/debian/hugin.manpages b/debian/hugin.manpages
deleted file mode 100644
index 34fa1ed..0000000
--- a/debian/hugin.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-doc/hugin.1
-doc/nona_gui.1
-doc/hugin_stitch_project.1
-- 
1.5.6.5


--h31gzZEtNLTqOjlF
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0005-B-d-on-libpano13-2.9.14-for-new-projections.patch"