diff -Nru ffmpeg-xbmc-2.1.3~git20140129.1026/debian/changelog ffmpeg-xbmc-2.1.3~git20140129.1200/debian/changelog --- ffmpeg-xbmc-2.1.3~git20140129.1026/debian/changelog 2014-01-29 09:26:51.000000000 +0000 +++ ffmpeg-xbmc-2.1.3~git20140129.1200/debian/changelog 2014-01-29 11:06:39.000000000 +0000 @@ -1,4 +1,4 @@ -ffmpeg-xbmc (2.1.3~git20140129.1026-9292bac~trusty) trusty; urgency=high +ffmpeg-xbmc (2.1.3~git20140129.1200-9292bac~trusty) trusty; urgency=high * FFmpeg git master + Xbmc specific patches only useful for building Xbmc diff -Nru ffmpeg-xbmc-2.1.3~git20140129.1026/debian/ffmpeg-xbmc-dev.postinst ffmpeg-xbmc-2.1.3~git20140129.1200/debian/ffmpeg-xbmc-dev.postinst --- ffmpeg-xbmc-2.1.3~git20140129.1026/debian/ffmpeg-xbmc-dev.postinst 2014-01-29 08:42:21.000000000 +0000 +++ ffmpeg-xbmc-2.1.3~git20140129.1200/debian/ffmpeg-xbmc-dev.postinst 2014-01-29 10:59:34.000000000 +0000 @@ -2,12 +2,17 @@ set -e PC_FILES=(libavcodec.pc libavdevice.pc libavfilter.pc libavformat.pc libavutil.pc libpostproc.pc libswresample.pc libswscale.pc) -PKG_CONF_DIR=/usr/lib/$(uname -m)-linux-gnu/pkgconfig +if [ "$(uname -m)" = "x86_64" ] +then + PKG_CONF_DIR=/usr/lib/x86_64-linux-gnu/pkgconfig +else + PKG_CONF_DIR=/usr/lib/i386-linux-gnu/pkgconfig +fi case "$1" in configure) fileexists=False - cd $PKG_CONF_DIR + cd $PKG_CONF_DIR || exit 0 for pcfile in ${PC_FILES[*]} do if [ -e $pcfile ] || [ -h $pcfile ] diff -Nru ffmpeg-xbmc-2.1.3~git20140129.1026/debian/ffmpeg-xbmc-dev.postrm ffmpeg-xbmc-2.1.3~git20140129.1200/debian/ffmpeg-xbmc-dev.postrm --- ffmpeg-xbmc-2.1.3~git20140129.1026/debian/ffmpeg-xbmc-dev.postrm 2014-01-29 08:42:21.000000000 +0000 +++ ffmpeg-xbmc-2.1.3~git20140129.1200/debian/ffmpeg-xbmc-dev.postrm 2014-01-29 11:00:00.000000000 +0000 @@ -2,11 +2,17 @@ set -e PC_FILES=(libavcodec.pc libavdevice.pc libavfilter.pc libavformat.pc libavutil.pc libpostproc.pc libswresample.pc libswscale.pc) -PKG_CONF_DIR=/usr/lib/$(uname -m)-linux-gnu/pkgconfig +if [ "$(uname -m)" = "x86_64" ] +then + PKG_CONF_DIR=/usr/lib/x86_64-linux-gnu/pkgconfig +else + PKG_CONF_DIR=/usr/lib/i386-linux-gnu/pkgconfig +fi + case "$1" in purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - cd $PKG_CONF_DIR + cd $PKG_CONF_DIR || exit 0 for pcfile in ${PC_FILES[*]} do [ -h $pcfile ] && rm $pcfile diff -Nru ffmpeg-xbmc-2.1.3~git20140129.1026/nohup.out ffmpeg-xbmc-2.1.3~git20140129.1200/nohup.out --- ffmpeg-xbmc-2.1.3~git20140129.1026/nohup.out 1970-01-01 00:00:00.000000000 +0000 +++ ffmpeg-xbmc-2.1.3~git20140129.1200/nohup.out 2014-01-29 11:07:11.000000000 +0000 @@ -0,0 +1,47 @@ + dpkg-buildpackage -rfakeroot -d -us -uc -S +dpkg-buildpackage: source package ffmpeg-xbmc +dpkg-buildpackage: source version 2.1.3~git20140129.1200-9292bac~saucy +dpkg-buildpackage: source changed by wsnipex + dpkg-source --before-build FFmpeg-9292bac08d62b92fcd66a8df468741190269f510 + fakeroot debian/rules clean +dh clean + dh_testdir + debian/rules override_dh_auto_clean +make[1]: Entering directory `/data2/packages/ffmpeg2/FFmpeg-9292bac08d62b92fcd66a8df468741190269f510' +make distclean 2>/dev/null || exit 0 +make[2]: Entering directory `/data2/packages/ffmpeg2/FFmpeg-9292bac08d62b92fcd66a8df468741190269f510' +make[2]: Leaving directory `/data2/packages/ffmpeg2/FFmpeg-9292bac08d62b92fcd66a8df468741190269f510' +make[1]: Leaving directory `/data2/packages/ffmpeg2/FFmpeg-9292bac08d62b92fcd66a8df468741190269f510' + dh_clean + dpkg-source -b FFmpeg-9292bac08d62b92fcd66a8df468741190269f510 +dpkg-source: info: using source format `3.0 (native)' +dpkg-source: info: building ffmpeg-xbmc in ffmpeg-xbmc_2.1.3~git20140129.1200-9292bac~saucy.tar.gz +dpkg-source: info: building ffmpeg-xbmc in ffmpeg-xbmc_2.1.3~git20140129.1200-9292bac~saucy.dsc + dpkg-genchanges -S >../ffmpeg-xbmc_2.1.3~git20140129.1200-9292bac~saucy_source.changes +dpkg-genchanges: including full source code in upload + dpkg-source --after-build FFmpeg-9292bac08d62b92fcd66a8df468741190269f510 +dpkg-buildpackage: source only upload: Debian-native package +Now signing changes and any dsc files... + signfile ffmpeg-xbmc_2.1.3~git20140129.1200-9292bac~saucy.dsc wsnipex + + signfile ffmpeg-xbmc_2.1.3~git20140129.1200-9292bac~saucy_source.changes wsnipex + +Successfully signed dsc and changes files + dpkg-buildpackage -rfakeroot -d -us -uc -S +dpkg-buildpackage: source package ffmpeg-xbmc +dpkg-buildpackage: source version 2.1.3~git20140129.1200-9292bac~trusty +dpkg-buildpackage: source changed by wsnipex + dpkg-source --before-build FFmpeg-9292bac08d62b92fcd66a8df468741190269f510 + fakeroot debian/rules clean +dh clean + dh_testdir + debian/rules override_dh_auto_clean +make[1]: Entering directory `/data2/packages/ffmpeg2/FFmpeg-9292bac08d62b92fcd66a8df468741190269f510' +make distclean 2>/dev/null || exit 0 +make[2]: Entering directory `/data2/packages/ffmpeg2/FFmpeg-9292bac08d62b92fcd66a8df468741190269f510' +make[2]: Leaving directory `/data2/packages/ffmpeg2/FFmpeg-9292bac08d62b92fcd66a8df468741190269f510' +make[1]: Leaving directory `/data2/packages/ffmpeg2/FFmpeg-9292bac08d62b92fcd66a8df468741190269f510' + dh_clean + dpkg-source -b FFmpeg-9292bac08d62b92fcd66a8df468741190269f510 +dpkg-source: info: using source format `3.0 (native)' +dpkg-source: info: building ffmpeg-xbmc in ffmpeg-xbmc_2.1.3~git20140129.1200-9292bac~trusty.tar.gz