Hello, I have built works-for-me-quality packages of hugin 0.8.0 beta4, patch series attached. This is just the simple stuff: install everything shipped upstream, drop unneeded patches, bump build-depends.
The main hugin binary works nicely for me, the new OpenGL preview is a lot faster. The biggest thing, apart from further testing is updating debian/copyright, which looks like loads of fun. ;-) have fun, cu andreas -- `What a good friend you are to him, Dr. Maturin. His other friends are so grateful to you.' `I sew his ears on from time to time, sure'
>From 03ea05708d03a28d88d8795f2ba77ee31acee472 Mon Sep 17 00:00:00 2001 From: Andreas Metzler <[email protected]> Date: Sun, 3 May 2009 08:51:20 +0200 Subject: [PATCH] Merge in unstable changelog entry. --- debian/changelog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/debian/changelog b/debian/changelog index 02d71a4..91a1a76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hugin (0.7.0-2) unstable; urgency=low + + * Upload to unstable. + + -- Andreas Metzler <[email protected]> Sun, 19 Apr 2009 18:21:47 +0200 + hugin (0.7.0-1) experimental; urgency=low * New upstream release (Closes: #502721). -- 1.5.6.5
>From 025c231672789630b2713c52fb45574e81dc9203 Mon Sep 17 00:00:00 2001 From: Andreas Metzler <[email protected]> Date: Sun, 3 May 2009 08:52:07 +0200 Subject: [PATCH] New changelog entry --- debian/changelog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/debian/changelog b/debian/changelog index 91a1a76..6656928 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hugin (0.7.0-3) experimental; urgency=low + + * foo + + -- Andreas Metzler <[email protected]> Sun, 03 May 2009 08:51:32 +0200 + hugin (0.7.0-2) unstable; urgency=low * Upload to unstable. -- 1.5.6.5
>From ebeab1b211c593045abc104824a267b4317eda2e Mon Sep 17 00:00:00 2001 From: Andreas Metzler <[email protected]> Date: Sun, 3 May 2009 10:17:02 +0200 Subject: [PATCH] commit afer first successful 0.8.0 build --- debian/changelog | 8 ++++- debian/control | 2 +- .../20_remove_encoding_key_from_desktop_files | 20 ---------------- debian/patches/30_manpage_hyphen_fixes | 25 -------------------- debian/patches/40_fix_implicit_linking | 8 ------ debian/patches/series | 2 - debian/rules | 2 +- 7 files changed, 8 insertions(+), 59 deletions(-) delete mode 100644 debian/patches/20_remove_encoding_key_from_desktop_files delete mode 100644 debian/patches/30_manpage_hyphen_fixes diff --git a/debian/changelog b/debian/changelog index 6656928..3e40a2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ -hugin (0.7.0-3) experimental; urgency=low +hugin (0.8.0~beta4-1) experimental; urgency=low - * foo + * New upstream version. + + Drop unneeded patches 20_remove_encoding_key_from_desktop_files, + 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. -- Andreas Metzler <[email protected]> Sun, 03 May 2009 08:51:32 +0200 diff --git a/debian/control b/debian/control index 743c121..d2db801 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: graphics Priority: optional Maintainer: Debian PhotoTools Maintainers <[email protected]> Uploaders: Cyril Brulebois <[email protected]>, Florent Bayle <[email protected]> -Build-Depends: debhelper (>= 5), quilt, cmake, libboost-graph-dev, libboost-thread-dev, zlib1g-dev, libexiv2-dev (>= 0.12), libjpeg62-dev, libopenexr-dev, libpano13-dev, libpng12-dev, libtiff4-dev, libgtk2.0-dev, libwxgtk2.6-dev, wx-common +Build-Depends: debhelper (>= 5), quilt, cmake, libboost-graph-dev, libboost-thread-dev, zlib1g-dev, libexiv2-dev (>= 0.12), libjpeg62-dev, libopenexr-dev, libpano13-dev, libpng12-dev, libtiff4-dev, libgtk2.0-dev, libwxgtk2.8-dev, libglew1.5-dev Standards-Version: 3.8.0 Homepage: http://hugin.sourceforge.net/ Vcs-Git: git://git.debian.org/git/pkg-phototools/hugin.git diff --git a/debian/patches/20_remove_encoding_key_from_desktop_files b/debian/patches/20_remove_encoding_key_from_desktop_files deleted file mode 100644 index 6ca4bda..0000000 --- a/debian/patches/20_remove_encoding_key_from_desktop_files +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/hugin1/hugin/hugin.desktop 2008-01-17 13:38:17.000000000 +0100 -+++ b/src/hugin1/hugin/hugin.desktop 2008-01-17 13:38:21.000000000 +0100 -@@ -15,7 +15,6 @@ - GenericName[cs]=Nástroj pro skládání panoramat - GenericName[ru]=Сшиватель панорам - Categories=Application;Graphics; --Encoding=UTF-8 - Exec=hugin - Icon=hugin - StartupNotify=false ---- a/src/hugin1/stitch_project/hugin_stitch_project.desktop 2008-01-17 13:38:07.000000000 +0100 -+++ b/src/hugin1/stitch_project/hugin_stitch_project.desktop 2008-01-17 13:38:26.000000000 +0100 -@@ -2,7 +2,6 @@ - Name=Hugin batch stitcher - GenericName=Panorama batch stitcher - Categories=Application;Graphics; --Encoding=UTF-8 - Exec=hugin_stitch_project - Icon=hugin - StartupNotify=false diff --git a/debian/patches/30_manpage_hyphen_fixes b/debian/patches/30_manpage_hyphen_fixes deleted file mode 100644 index 28fe822..0000000 --- a/debian/patches/30_manpage_hyphen_fixes +++ /dev/null @@ -1,25 +0,0 @@ ---- a/doc/fulla.1 2007-12-23 16:01:30.000000000 +0100 -+++ b/doc/fulla.1 2007-12-23 16:04:52.000000000 +0100 -@@ -50,11 +50,11 @@ - .TP - .BI \-b " a:b:c:d" - Radial distortion coefficents for blue channel, (a, b, c, d). --this is applied after the global distortion correction(supplied by -g). -+this is applied after the global distortion correction (supplied by \-g). - .TP - .BI \-r " a:b:c:d" - Radial distortion coefficents for red channel, (a, b, c, d). --this is applied after the global distortion correction(supplied by -g). -+this is applied after the global distortion correction (supplied by \-g). - .TP - .BI \-f " filename" - Filename of the flatfield image. Enables vignetting correction by flatfield -@@ -69,7 +69,7 @@ - .TP - .B \-p - Try to read radial distortion coefficients (usually supplied --using -g) from the PTLens database. The environment variable PTLENS_PROFILE -+using \-g) from the PTLens database. The environment variable PTLENS_PROFILE - should point to the profile.txt file. Since newer version of the PTLens database - are incompatible with fulla, download the PTLens database from the hugin sourceforge - website instead: http://www.sf.net/projects/hugin diff --git a/debian/patches/40_fix_implicit_linking b/debian/patches/40_fix_implicit_linking index 4e1320c..19f17f1 100644 --- a/debian/patches/40_fix_implicit_linking +++ b/debian/patches/40_fix_implicit_linking @@ -22,11 +22,3 @@ ENDIF (${HUGIN_SHARED_LIBS}) + +TARGET_LINK_LIBRARIES(huginjhead huginbase) ---- a/src/foreign/levmar/CMakeLists.txt 2008-01-27 22:18:25.000000000 +0000 -+++ b/src/foreign/levmar/CMakeLists.txt 2008-01-27 22:21:28.000000000 +0000 -@@ -1,3 +1,5 @@ - - add_library(huginlevmar STATIC lm.c Axb.c misc.c lmlec.c lmbc.c) - -+SET_TARGET_PROPERTIES(huginlevmar PROPERTIES COMPILE_FLAGS -fPIC) -+ diff --git a/debian/patches/series b/debian/patches/series index 3ed9971..68ba8ab 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ -20_remove_encoding_key_from_desktop_files -30_manpage_hyphen_fixes 40_fix_implicit_linking diff --git a/debian/rules b/debian/rules index 684d9b9..f29f647 100755 --- a/debian/rules +++ b/debian/rules @@ -130,7 +130,7 @@ install-stamp: $(MAKE) install -C $(BUILD_DIR) DESTDIR=$(CURDIR)/debian/tmp # Get rid of extra license file - rm debian/tmp/usr/share/hugin/xrc/data/help_en_EN/LICENCE.manual + rm -f debian/tmp/usr/share/hugin/xrc/data/help_en_EN/LICENCE.manual # Get rid of .so, which aren't actually needed find debian/tmp -name '*.so' -delete -- 1.5.6.5
>From 0a0014ca1cfbfa982fc414f31919eb168414dc66 Mon Sep 17 00:00:00 2001 From: Andreas Metzler <[email protected]> Date: Sun, 3 May 2009 10:43:44 +0200 Subject: [PATCH] Ship new binaries, install manpages with dh_install. --- 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 <[email protected]> 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
>From 4b904567dbd8786fdd2071401f880a70da9e9fd8 Mon Sep 17 00:00:00 2001 From: Andreas Metzler <[email protected]> Date: Sun, 3 May 2009 11:28:53 +0200 Subject: [PATCH] B-d on libpano13 2.9.14, for new projections. --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4f94e4a..d5c0743 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,8 @@ hugin (0.8.0~beta4-1) experimental; urgency=low + Drop unneeded patches 20_remove_encoding_key_from_desktop_files, 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. + + Now requires wxWidgets 2.8, GLEW and OpenGL. New projections require + libpano13 2.9.14. Update build-depends. + New binaries matchpoint, celeste_standalone, pto2mk, PTBatcherGUI and PTBatcher. + Upstream's build system now correctly installs manpages, making it diff --git a/debian/control b/debian/control index d2db801..720ef08 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: graphics Priority: optional Maintainer: Debian PhotoTools Maintainers <[email protected]> Uploaders: Cyril Brulebois <[email protected]>, Florent Bayle <[email protected]> -Build-Depends: debhelper (>= 5), quilt, cmake, libboost-graph-dev, libboost-thread-dev, zlib1g-dev, libexiv2-dev (>= 0.12), libjpeg62-dev, libopenexr-dev, libpano13-dev, libpng12-dev, libtiff4-dev, libgtk2.0-dev, libwxgtk2.8-dev, libglew1.5-dev +Build-Depends: debhelper (>= 5), quilt, cmake, libboost-graph-dev, libboost-thread-dev, zlib1g-dev, libexiv2-dev (>= 0.12), libjpeg62-dev, libopenexr-dev, libpano13-dev (>= 2.9.14~0), libpng12-dev, libtiff4-dev, libgtk2.0-dev, libwxgtk2.8-dev, libglew1.5-dev Standards-Version: 3.8.0 Homepage: http://hugin.sourceforge.net/ Vcs-Git: git://git.debian.org/git/pkg-phototools/hugin.git -- 1.5.6.5
>From e2bc38f4f7f37b7631ef497c805cb085386fadbf Mon Sep 17 00:00:00 2001 From: Andreas Metzler <[email protected]> Date: Sun, 3 May 2009 11:35:53 +0200 Subject: [PATCH] PTBatcher requires a $DISPLAY, move it to hugin from hugin-tools --- debian/hugin-tools.install | 1 - debian/hugin.install | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/debian/hugin-tools.install b/debian/hugin-tools.install index 8e3ab7f..b70b3ae 100644 --- a/debian/hugin-tools.install +++ b/debian/hugin-tools.install @@ -6,7 +6,6 @@ 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 diff --git a/debian/hugin.install b/debian/hugin.install index b39506d..3a08971 100644 --- a/debian/hugin.install +++ b/debian/hugin.install @@ -3,6 +3,7 @@ usr/bin/hugin usr/bin/hugin_stitch_project usr/bin/nona_gui usr/bin/PTBatcherGUI +usr/bin/PTBatcher usr/share/man/man1/nona_gui.1 usr/share/man/man1/hugin.1 -- 1.5.6.5
>From 6f0605b90f848a2907fb95dddba1866e7a0d6ba2 Mon Sep 17 00:00:00 2001 From: Andreas Metzler <[email protected]> Date: Sun, 3 May 2009 12:41:25 +0200 Subject: [PATCH] Add new binaries to package description. --- debian/control | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/debian/control b/debian/control index 720ef08..4d48deb 100644 --- a/debian/control +++ b/debian/control @@ -51,6 +51,9 @@ Description: CLI tools for Hugin * hugin_hdrmerge - Merge overlapping images. * nona - Stitch a panorama image. * vig_optimize - Determine the radial vignetting. + * pto2mk - Create a makefile for stitching. + * matchpoint - Run feature detection and extraction + * celeste_standalone- Remove cloud-like control points. Package: hugin-data Section: graphics -- 1.5.6.5
_______________________________________________ Pkg-phototools-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-phototools-devel
