diff -u hugin-0.7.0/debian/control hugin-0.7.0/debian/control --- hugin-0.7.0/debian/control +++ hugin-0.7.0/debian/control @@ -1,9 +1,10 @@ Source: hugin Section: graphics Priority: optional -Maintainer: Debian PhotoTools Maintainers +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian PhotoTools Maintainers Uploaders: Cyril Brulebois , Florent Bayle -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, wx-common Standards-Version: 3.8.0 Homepage: http://hugin.sourceforge.net/ Vcs-Git: git://git.debian.org/git/pkg-phototools/hugin.git @@ -12,7 +13,7 @@ Package: hugin Section: graphics Architecture: any -Depends: hugin-tools (= ${binary:Version}), enblend (>= 3.2), enfuse, libimage-exiftool-perl, make, ${shlibs:Depends}, ${misc:Depends} +Depends: hugin-tools (= ${binary:Version}), enblend (>= 3.2), enfuse, libimage-exiftool-perl, make, autopano-sift, ${shlibs:Depends}, ${misc:Depends} Conflicts: hugin-bin (<< 0.7.0~svn) Replaces: hugin-bin (<< 0.7.0~svn), hugin-data (<< 0.7.0~svn), hugin-tools (<< 0.7.0~svn) Provides: hugin-bin diff -u hugin-0.7.0/debian/changelog hugin-0.7.0/debian/changelog --- hugin-0.7.0/debian/changelog +++ hugin-0.7.0/debian/changelog @@ -1,3 +1,14 @@ +hugin (0.7.0-1ubuntu1) jaunty; urgency=low + + * Closes LP: #285674 + * Closes LP: #162575 + - debian/control: added dependency on autopano-sift + - debian/patches: added 91_ubuntu-autopano-sift to fix default config + * debian/control: change build dependency from libwxgtk2.6-dev to + libwxgtk2.8-dev + + -- Fabrice Coutadeur Sat, 29 Nov 2008 03:47:12 +0100 + hugin (0.7.0-1) experimental; urgency=low * New upstream release (Closes: #502721). diff -u hugin-0.7.0/debian/patches/series hugin-0.7.0/debian/patches/series --- hugin-0.7.0/debian/patches/series +++ hugin-0.7.0/debian/patches/series @@ -3,0 +4 @@ +51_ubuntu-autopano-sift only in patch2: unchanged: --- hugin-0.7.0.orig/debian/patches/51_ubuntu-autopano-sift +++ hugin-0.7.0/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"