[PATCH] commit afer first successful 0.8.0 build

Sun May 3 08:17:02 UTC 2009

---
 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 <ametzler at debian.org>  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 <pkg-phototools-devel at lists.alioth.debian.org>
 Uploaders: Cyril Brulebois <kibi at debian.org>, Florent Bayle <fbayle at bigfoot.com>
-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


--h31gzZEtNLTqOjlF
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0004-Ship-new-binaries-install-manpages-with-dh_install.patch"

