diffstat for libphash_0.9.4-1.4 libphash_0.9.4-1.4ubuntu1 changelog | 21 +++++++++++++++++++++ control | 5 +++-- rules | 2 +- 3 files changed, 25 insertions(+), 3 deletions(-) diff -u libphash-0.9.4/debian/changelog libphash-0.9.4/debian/changelog --- libphash-0.9.4/debian/changelog +++ libphash-0.9.4/debian/changelog @@ -1,9 +1,30 @@ +libphash (0.9.4-1.4ubuntu1) trusty; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Use dh-autoreconf to get new libtool macros for ppc64el and update + config.{sub,guess} for new arches. + + -- Logan Rosen Wed, 19 Mar 2014 13:28:27 -0400 + libphash (0.9.4-1.4) unstable; urgency=medium * Add support for libav10, patch by Sebastian Ramacher (Closes: #739336) -- Moritz Muehlenhoff Fri, 14 Mar 2014 19:11:15 +0100 +libphash (0.9.4-1.3ubuntu1) trusty; urgency=medium + + * Use dh-autoreconf to get new libtool macros for ppc64el and update + config.{sub,guess} for new arches. + + -- Logan Rosen Fri, 31 Jan 2014 12:36:21 -0500 + +libphash (0.9.4-1.3build1) trusty; urgency=low + + * No change rebuild against libav 9. + + -- Dmitrijs Ledkovs Sat, 09 Nov 2013 23:43:32 +0000 + libphash (0.9.4-1.3) unstable; urgency=low * Non-maintainer upload. diff -u libphash-0.9.4/debian/control libphash-0.9.4/debian/control --- libphash-0.9.4/debian/control +++ libphash-0.9.4/debian/control @@ -1,9 +1,10 @@ Source: libphash Section: libs Priority: optional -Maintainer: Debian Forensics +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Forensics Uploaders: Tiago Bortoletto Vaz -Build-Depends: debhelper (>= 7.0.50~), libavformat-dev, libavcodec-dev, libswscale-dev, libfftw3-dev, libjpeg-dev, libpng-dev, cimg-dev, libsndfile1-dev, libsamplerate0-dev, libmpg123-dev +Build-Depends: debhelper (>= 7.0.50~), libavformat-dev, libavcodec-dev, libswscale-dev, libfftw3-dev, libjpeg-dev, libpng-dev, cimg-dev, libsndfile1-dev, libsamplerate0-dev, libmpg123-dev, dh-autoreconf Standards-Version: 3.9.1 Homepage: http://phash.org Vcs-Browser: http://git.debian.org/?p=forensics/libphash.git diff -u libphash-0.9.4/debian/rules libphash-0.9.4/debian/rules --- libphash-0.9.4/debian/rules +++ libphash-0.9.4/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh ${@} + dh ${@} --with autoreconf override_dh_auto_configure: dh_auto_configure -- CXXFLAGS="$(CXXFLAGS) -D__STDC_CONSTANT_MACROS"