diff -Nru mythtv-0.27.0+fixes.20140324.8ee257c/debian/changelog mythtv-0.27.0+fixes.20140324.8ee257c/debian/changelog --- mythtv-0.27.0+fixes.20140324.8ee257c/debian/changelog 2014-03-24 05:05:59.000000000 +0000 +++ mythtv-0.27.0+fixes.20140324.8ee257c/debian/changelog 2014-04-11 06:14:13.000000000 +0000 @@ -1,3 +1,11 @@ +mythtv (2:0.27.0+fixes.20140324.8ee257c-0ubuntu2) trusty; urgency=medium + + * Fix default mythweb configuration to match changes to Ubuntu document + root. (LP: #1300404) + * Add back ppc64el_altivec.patch to fix FTBFS on ppc64el. + + -- Mario Limonciello Fri, 11 Apr 2014 00:57:11 -0500 + mythtv (2:0.27.0+fixes.20140324.8ee257c-0ubuntu1) trusty; urgency=medium * Scripted Build from fixes git packaging [5b1b1e8] diff -Nru mythtv-0.27.0+fixes.20140324.8ee257c/debian/.gitignore mythtv-0.27.0+fixes.20140324.8ee257c/debian/.gitignore --- mythtv-0.27.0+fixes.20140324.8ee257c/debian/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ mythtv-0.27.0+fixes.20140324.8ee257c/debian/.gitignore 2014-03-24 05:03:50.000000000 +0000 @@ -0,0 +1 @@ +libmyth-0.*-0.install diff -Nru mythtv-0.27.0+fixes.20140324.8ee257c/debian/mythweb.links mythtv-0.27.0+fixes.20140324.8ee257c/debian/mythweb.links --- mythtv-0.27.0+fixes.20140324.8ee257c/debian/mythweb.links 2014-03-24 05:03:50.000000000 +0000 +++ mythtv-0.27.0+fixes.20140324.8ee257c/debian/mythweb.links 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -etc/mythtv/mythweb-htaccess usr/share/mythtv/mythweb/.htaccess -usr/share/mythtv/mythweb var/www/mythweb diff -Nru mythtv-0.27.0+fixes.20140324.8ee257c/debian/mythweb.postinst mythtv-0.27.0+fixes.20140324.8ee257c/debian/mythweb.postinst --- mythtv-0.27.0+fixes.20140324.8ee257c/debian/mythweb.postinst 2014-03-24 05:03:50.000000000 +0000 +++ mythtv-0.27.0+fixes.20140324.8ee257c/debian/mythweb.postinst 2014-04-11 05:56:45.000000000 +0000 @@ -71,7 +71,21 @@ PASSWORD="$RET"; db_get mythweb/only || true ONLY="$RET" - + + REL=$(lsb_release -c -s) + if [ "$REL" \> "raring" ]; then + SYMLINK="/var/www/html/mythweb" + CONFIG="000-default.conf" + CONFIG_MYTHBUNTU="000-default-mythbuntu.conf" + else + SYMLINK="/var/www/mythweb" + CONFIG="default" + CONFIG_MYTHBUNTU="default-mythbuntu" + fi + if [ ! -L $SYMLINK ]; then + ln -s /usr/share/mythtv/mythweb $SYMLINK + fi + DEFAULT_CONFIG=/etc/default/mythweb cat > $DEFAULT_CONFIG << EOF [cfg] @@ -104,12 +118,9 @@ s/\(^[ \t]*setenv[ \t]\+db_login[ \t]\+\"\)[^\"]*\"/\1$mythtv_username\"/g; s/\(^[ \t]*setenv[ \t]\+db_password[ \t]\+\"\)[^\"]*\"/\1$mythtv_password\"/g; " > $NEW - - if [ -e /var/www/mythweb ]; then - # replace /var/www/html with /var/www/mythweb - perl -pi -e 's/\/var\/www\/html/\/var\/www\/mythweb/g;' $NEW - fi - + if [ "$INPUT" != "$MYTHWEBCONF" ]; then + sed "s,/var/www/html,$SYMLINK,;" -i $NEW + fi mv -f $NEW $MYTHWEBCONF MYTHWEBDIR=/etc/apache2/sites-available/mythwebdir @@ -118,16 +129,6 @@ mv $MYTHWEBDIR ${MYTHWEBDIR}.dpkg-old fi - ACCESS=/etc/mythtv/mythweb-htaccess.conf - if test -f $ACCESS; then - mv $ACCESS ${ACCESS}.dpkg-old - fi - - CONFIG=/etc/mythtv/mythweb-settings.php - if test -f $CONFIG; then - mv $CONFIG ${CONFIG}.dpkg-old - fi - cachedir=/var/cache/mythweb/image_cache if ! dpkg-statoverride --list $cachedir; then chgrp www-data $cachedir @@ -139,7 +140,7 @@ chgrp www-data $datadir chmod 775 $datadir fi - + LINKS=' /var/lib/mythtv/music^music /var/lib/mythtv/recordings^recordings @@ -186,19 +187,18 @@ BASE=/etc/apache2 DIR_AVAILABLE=${BASE}/sites-available DIR_ENABLED=${BASE}/sites-enabled - CONFIG=default #not enabled & we want to enable redirect - if [ ! -e ${DIR_ENABLED}/${CONFIG}-mythbuntu ] && [ "$ONLY" = true ] && \ + if [ ! -e ${DIR_ENABLED}/${CONFIG_MYTHBUNTU} ] && [ "$ONLY" = true ] && \ [ -e ${DIR_AVAILABLE}/${CONFIG} ]; then - cp ${DIR_AVAILABLE}/${CONFIG} ${DIR_AVAILABLE}/${CONFIG}-mythbuntu - perl -pi -e 's/()/$1\n\tDirectoryIndex mythweb/i' ${DIR_AVAILABLE}/${CONFIG}-mythbuntu + cp ${DIR_AVAILABLE}/${CONFIG} ${DIR_AVAILABLE}/${CONFIG_MYTHBUNTU} + perl -pi -e 's/()/$1\n\tDirectoryIndex mythweb/i' ${DIR_AVAILABLE}/${CONFIG_MYTHBUNTU} DISABLE=${CONFIG} - ENABLE=${CONFIG}-mythbuntu + ENABLE=${CONFIG_MYTHBUNTU} #already enabled & we want to disable redirect - elif [ -e ${DIR_ENABLED}/${CONFIG}-mythbuntu ] && [ "$ONLY" = false ]; then + elif [ -e ${DIR_ENABLED}/${CONFIG_MYTHBUNTU} ] && [ "$ONLY" = false ]; then ENABLE=${CONFIG} - DISABLE=${CONFIG}-mythbuntu + DISABLE=${CONFIG_MYTHBUNTU} fi if [ -n "${ENABLE}" ] && [ -e "${DIR_AVAILABLE}/${ENABLE}" ]; then a2ensite ${ENABLE} > /dev/null || true @@ -209,12 +209,6 @@ reload_apache fi - - # This is a known issue precipitaing from older installs - # LP Bug: 329053 - if [ -e /etc/mythtv/mythweb-htaccess ]; then - mv /etc/mythtv/mythweb-htaccess /etc/mythtv/mythweb-htaccess.obsolete - fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff -Nru mythtv-0.27.0+fixes.20140324.8ee257c/debian/mythweb.postrm mythtv-0.27.0+fixes.20140324.8ee257c/debian/mythweb.postrm --- mythtv-0.27.0+fixes.20140324.8ee257c/debian/mythweb.postrm 2014-03-24 05:03:50.000000000 +0000 +++ mythtv-0.27.0+fixes.20140324.8ee257c/debian/mythweb.postrm 2014-04-11 05:56:45.000000000 +0000 @@ -19,15 +19,29 @@ case "$1" in remove|purge) #These files may have been created during installation - rm -f /etc/mythtv/mythweb-htaccess rm -f /etc/mythtv/mythweb-digest - rm -f /etc/apache2/sites-available/mythweb.conf - if [ -e /etc/apache2/sites-enabled/default-mythbuntu ]; then - a2dissite default-mythbuntu > /dev/null || true - a2ensite default > /dev/null || true - rm -f /etc/apache2/sites-available/default-mythbuntu - reload_apache - fi + rm -f /etc/apache2/sites-available/mythweb.conf + + REL=$(lsb_release -c -s) + if [ "$REL" \> "raring" ]; then + SYMLINK="/var/www/html/mythweb" + CONFIG="000-default.conf" + CONFIG_MYTHBUNTU="000-default-mythbuntu.conf" + else + SYMLINK="/var/www/mythweb" + CONFIG="default" + CONFIG_MYTHBUNTU="default-mythbuntu" + fi + if [ -L $SYMLINK ]; then + rm -f$SYMLINK + fi + + if [ -e /etc/apache2/sites-enabled/default-mythbuntu ]; then + a2dissite $CONFIG_MYTHBUNTU > /dev/null || true + a2ensite $CONFIG > /dev/null || true + rm -f /etc/apache2/sites-available/$CONFIG_MYTHBUNTU + reload_apache + fi ;; upgrade|abort-upgrade|abort-remove|abort-deconfigure) diff -Nru mythtv-0.27.0+fixes.20140324.8ee257c/debian/patches/ppc64el_altivec.patch mythtv-0.27.0+fixes.20140324.8ee257c/debian/patches/ppc64el_altivec.patch --- mythtv-0.27.0+fixes.20140324.8ee257c/debian/patches/ppc64el_altivec.patch 1970-01-01 00:00:00.000000000 +0000 +++ mythtv-0.27.0+fixes.20140324.8ee257c/debian/patches/ppc64el_altivec.patch 2014-04-11 05:58:16.000000000 +0000 @@ -0,0 +1,25 @@ +Index: mythtv-0.27.0+fixes.20130919.5b917e8/mythtv/external/FFmpeg/libavcodec/ppc/asm.S +=================================================================== +--- mythtv-0.27.0+fixes.20130919.5b917e8.orig/mythtv/external/FFmpeg/libavcodec/ppc/asm.S 2013-08-31 19:08:37.000000000 -0400 ++++ mythtv-0.27.0+fixes.20130919.5b917e8/mythtv/external/FFmpeg/libavcodec/ppc/asm.S 2014-01-14 10:41:11.940592191 -0500 +@@ -36,12 +36,20 @@ + + .macro extfunc name + .global X(\name) ++#if _CALL_ELF == 2 ++ .text ++X(\name): ++ addis %r2,%r12,.TOC.-X(\name)@ha ++ addi %r2,%r2,.TOC.-X(\name)@l ++ .localentry (\name),-X(\name) ++#else + .section .opd, "aw" + X(\name): + .quad L(\name), .TOC.@tocbase, 0 + .previous + .type X(\name), STT_FUNC + L(\name): ++#endif + .endm + + .macro movrel rd, sym, gp diff -Nru mythtv-0.27.0+fixes.20140324.8ee257c/debian/patches/series mythtv-0.27.0+fixes.20140324.8ee257c/debian/patches/series --- mythtv-0.27.0+fixes.20140324.8ee257c/debian/patches/series 2014-03-24 05:03:50.000000000 +0000 +++ mythtv-0.27.0+fixes.20140324.8ee257c/debian/patches/series 2014-04-11 05:58:30.000000000 +0000 @@ -7,3 +7,6 @@ ##mythplugins## configure_mythplugins_without_mythtv_installed.patch + +#fix FTBFS on ppc64el +ppc64el_altivec.patch