diff -u hugin-0.7.0~svn3191+beta5/debian/changelog hugin-0.7.0~svn3191+beta5/debian/changelog --- hugin-0.7.0~svn3191+beta5/debian/changelog +++ hugin-0.7.0~svn3191+beta5/debian/changelog @@ -1,3 +1,11 @@ +hugin (0.7.0~svn3191+beta5-1ubuntu1.1) intrepid-proposed; urgency=low + + * Fix the name of the autopano executable, so that it works by default + ( Backported patch 51_ubuntu-autopano-sift from Jaunty) + * LP: #332384 + + -- Fabrice Coutadeur Sat, 21 Feb 2009 08:05:23 +0100 + hugin (0.7.0~svn3191+beta5-1ubuntu1) intrepid; urgency=low * Merge from Debian unstable (LP: #251003), remaining Ubuntu changes: diff -u hugin-0.7.0~svn3191+beta5/debian/patches/series hugin-0.7.0~svn3191+beta5/debian/patches/series --- hugin-0.7.0~svn3191+beta5/debian/patches/series +++ hugin-0.7.0~svn3191+beta5/debian/patches/series @@ -5 +5 @@ -90_autopano-sift +51_ubuntu-autopano-sift only in patch2: unchanged: --- hugin-0.7.0~svn3191+beta5.orig/debian/patches/51_ubuntu-autopano-sift +++ hugin-0.7.0~svn3191+beta5/debian/patches/51_ubuntu-autopano-sift @@ -0,0 +1,15 @@ +Index: hugin-0.7.0/src/hugin1/hugin/config_defaults.h +=================================================================== +--- hugin-0.7.0.orig/src/hugin1/hugin/config_defaults.h 2008-11-06 07:31:28.000000000 +0100 ++++ hugin-0.7.0/src/hugin1/hugin/config_defaults.h 2008-11-06 07:32:13.000000000 +0100 +@@ -160,8 +160,8 @@ + #define HUGIN_APKOLOR_EXE "" + #define HUGIN_APKOLOR_ARGS "" + +-#define HUGIN_APSIFT_EXE "autopano-sift-c" +-#define HUGIN_APSIFT_ARGS "--maxmatches %p %o %i" ++#define HUGIN_APSIFT_EXE "autopano-complete" ++#define HUGIN_APSIFT_ARGS "--points %p -o %o %i" + #define HUGIN_STITCHER_RUN_EDITOR 0l + #define HUGIN_STITCHER_EDITOR "gimp-remote" + #define HUGIN_STITCHER_EDITOR_ARGS "%f"