build: some further updates to support new lib caching in pbuilder

diff --git a/debian/control b/debian/control
index 4e4ab6c1155184de74b7f9e0260394c338e709f5..ecabed90884d29857e2bc08a19ca9c8c6e658ad5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tvheadend
 Section: video
 Priority: extra
 Maintainer: Adam Sutton <aps@tvheadend.org>
-Build-Depends: debhelper (>= 7.0.50), pkg-config, gettext, libavahi-client-dev, libssl-dev, zlib1g-dev, wget, bzip2, libcurl4-gnutls-dev, git-core, liburiparser-dev, python
+Build-Depends: debhelper (>= 7.0.50), pkg-config, gettext, libavahi-client-dev, libssl-dev, zlib1g-dev, wget, bzip2, libcurl4-gnutls-dev, git-core, liburiparser-dev, python, curl
 Standards-Version: 3.7.3
 
 Package: tvheadend

diff --git a/debian/rules.official b/debian/rules.official
deleted file mode 100755 (executable)
index a0e4a80..0000000
--- a/debian/rules.official
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/make -f
-export DH_VERBOSE=1
-
-%:
-       dh $@
-
-override_dh_auto_configure:
-       dh_auto_configure -- --enable-libffmpeg_static --enable-hdhomerun_static
-
-override_dh_auto_build:
-       make ${JARGS}
-
-override_dh_strip:
-       dh_strip --dbg-package=tvheadend-dbg
-
-override_dh_auto_install:
-       dh_auto_install --destdir=debian/tvheadend
-
-override_dh_auto_clean:
-  

diff --git a/support/apt-update b/support/apt-update
index 0c898fd49f3682a128fcc804e62d4ea170bb24cb..95c9c720cd0b999eb60e7a638d0e7f2a3c75db32 100755 (executable)
--- a/support/apt-update
+++ b/support/apt-update
@@ -77,16 +77,13 @@ for b in $TVH_BUILD; do
   # Create changelog
   ./support/changelog "$CHANGELOG" "$d" "$VER" || exit 1
 
-  # Override rules file for official builds
-  cp ./debian/rules.official ./debian/rules
-  
   # Build source package
   dpkg-buildpackage -d -I.git* -S -sgpg -pgpg || exit 1
 
   # Build
   if [ "$CMD" == "pbuilder" ]; then
     for a in ${arch}; do
-      pbuilder-dist $d $a ../tvheadend_${V}.dsc
+      pbuilder-dist $d $a build ${PBUILDER_OPTS} ../tvheadend_${V}.dsc
     done
 
   # Upload