From: Sebastian Harl Date: Sun, 10 Jun 2012 10:41:52 +0000 (+0200) Subject: Merged branch 'nmu/1.8.5-0.1'. X-Git-Tag: pfstools-1.8.5-1~6 X-Git-Url: https://git.tokkee.org/?p=pkg-pfstools.git;a=commitdiff_plain;h=be3a967ae8ab9e7849addb54b2564e11da29d88e Merged branch 'nmu/1.8.5-0.1'. Conflicts: debian/changelog debian/control --- be3a967ae8ab9e7849addb54b2564e11da29d88e diff --cc debian/changelog index a84d801,9b8b1c6..af20d6d --- a/debian/changelog +++ b/debian/changelog @@@ -1,13 -1,28 +1,35 @@@ - pfstools (1.8.2-1) unstable; urgency=low ++pfstools (1.8.5-1) unstable; urgency=low + - * New upstream release. - * debian/patches: - - Removed gcc-4.4 -- applied upstream. + * debian/control: + - Updated standards-version to 3.9.1 -- no changes. + + -- Sebastian Harl Sat, 31 Jul 2010 19:31:26 +0200 + + pfstools (1.8.5-0.1) unstable; urgency=low + + * Non-maintainer upload. + + [ Sébastien Villemot ] + * New upstream release, build-depend on Qt4 instead of Qt3 (Closes: #604368) + * gcc-4.4.dpatch: remove patch, applied upstream + * Convert to format 3.0 (quilt) and drop dpatch, because otherwise Lintian + produces an error (dpatch is obsolete) + + [ Rafael Laboissiere ] + * debian/control: + - Build-depend on liboctave-dev, such that the package builds with + Octave 3.6 (Closes: #666959) + - Depend simply on octave, do not use the obsolete ${octave:Depends} + substitution variable anymore + * debian/rules: + - Use directly the octave-config script in order to get the + installation path for the *.oct and *.m files + - Do not invoke the obsolete script octave-depends + * debian/octave-pfstools.install: Adjust for the multiarch path, which + contains the architecture triplet now + + -- Sébastien Villemot Sun, 03 Jun 2012 11:00:46 +0200 + pfstools (1.8.1-2) unstable; urgency=low [ Thomas Weber ] diff --cc debian/control index 4a9f966,4398056..7b4954b --- a/debian/control +++ b/debian/control @@@ -3,8 -3,8 +3,8 @@@ Section: graphic Priority: optional Maintainer: Debian PhotoTools Maintainers Uploaders: Sebastian Harl - Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), dpatch, gfortran, autotools-dev, libqt3-mt-dev, libmagick++-dev | libmagick++9-dev, libtiff4-dev, libopenexr-dev, libnetpbm10-dev, octave3.2-headers, texlive-latex-base, freeglut3-dev + Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), gfortran, autotools-dev, libqt4-dev, libmagick++-dev | libmagick++9-dev, libtiff4-dev, libopenexr-dev, libnetpbm10-dev, liboctave-dev, texlive-latex-base, freeglut3-dev -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Homepage: http://pfstools.sourceforge.net/ Vcs-Git: git://git.debian.org/git/pkg-phototools/pfstools.git Vcs-Browser: http://git.debian.org/?p=pkg-phototools/pfstools.git