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

tvheadend · Jan 16, 2016 · 11eef56 · 11eef56
1 parent 0b18702
commit 11eef56
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 25 deletions.
diff --git 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
diff --git 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