fix pbuilder package building

diff --git a/debian/control b/debian/control
index 28dc1e976f703b913f6e97854bb5573348efb4ad..d251798b6fb3681aa6ca0740ab22e94d07c004ca 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: tvheadend
-Section: main
+Section: video
 Priority: extra
 Maintainer: Andreas Öman <andreas@lonelycoder.com>
-Build-Depends: debhelper (>= 7.0.50)
+Build-Depends: debhelper (>= 7.0.50), pkg-config, libavahi-client-dev, libssl-dev
 Standards-Version: 3.7.3
 
 Package: tvheadend

diff --git a/debian/rules b/debian/rules
index 76591cd5444ba3f1c4a5735bd61e485864a6f394..2bae8172d753b0628f7a4030d32c7823056b88c1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,10 +25,14 @@ override_dh_auto_build:
        $(MAKE)
 
 override_dh_install:
-       $(MAKE) prefix=$(CURDIR)/debian/tvheadend/usr install
+       $(MAKE) DESTDIR=$(CURDIR)/debian/tvheadend install
 
 override_dh_installinit:
        dh_installinit --name tvheadend 
 
 override_dh_strip:
-        dh_strip --dbg-package=tvheadend-dbg
+       dh_strip --dbg-package=tvheadend-dbg
+
+override_dh_autotest:
+       echo "skipped autotest"
+

diff --git a/support/posix.mk b/support/posix.mk
index 995afc9faba79aa46c2470c85f1c35202f901dff..fae471071641b4ba229e34f7c97434871824888a 100644 (file)
--- a/support/posix.mk
+++ b/support/posix.mk
@@ -1,23 +1,21 @@
 
 INSTBIN=  ${DESTDIR}${INSTALLPREFIX}/bin
 INSTMAN=  ${DESTDIR}${INSTALLPREFIX}/share/man1
-INSTDBG=  ${DESTDIR}/usr/lib/debug/${INSTALLPREFIX}/bin
+INSTDBG=  ${DESTDIR}${INSTALLPREFIX}/lib/debug/bin
 MAN=man/tvheadend.1
 
 install: ${PROG} ${MAN}
        mkdir -p ${INSTBIN}
-       mkdir -p ${INSTDBG}
        install -T ${PROG} ${INSTBIN}/tvheadend
+       mkdir -p ${INSTMAN}
+       install ${MAN} ${INSTMAN}
 
+install-debug: ${PROG}
+       mkdir -p ${INSTDBG}
        objcopy --only-keep-debug ${INSTBIN}/tvheadend ${INSTDBG}/tvheadend.debug
        strip -g ${INSTBIN}/tvheadend
-
        objcopy --add-gnu-debuglink=${INSTDBG}/tvheadend.debug ${INSTBIN}/tvheadend
 
-
-       mkdir -p ${INSTMAN}
-       install ${MAN} ${INSTMAN}
-
 uninstall:
        rm -f ${INSTBIN}/tvheadend
        rm -f ${INSTDBG}/tvheadend.debug