merge of '64e4141742ce7b9bb873c115920491a60d6fd60d'

     and 'df4c815de2b1a6e7b275ed3aa47c0dd906e8001d'

diff --git a/packages/poptop/poptop_1.3.4.bb b/packages/poptop/poptop_1.3.4.bb
index 9e4f317..5c6a71b 100644 (file)
--- a/packages/poptop/poptop_1.3.4.bb
+++ b/packages/poptop/poptop_1.3.4.bb
@@ -8,7 +8,7 @@ SECTION = "network"
 LICENSE = "GPL"
 RDEPENDS_${PN} = "ppp"
 RDEPENDS_${PN}-logwtmp-plugin = "${PN}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/poptop/pptpd-${PV}.tar.gz \
            file://fix-plugins-install.patch;patch=1 \
@@ -26,12 +26,13 @@ do_install_append() {
         install -d ${D}${sbindir} ${D}/${sysconfdir} ${D}/${sysconfdir}/ppp
         install -m 0644 samples/options.pptpd ${D}/${sysconfdir}/ppp/
         install -m 0644 samples/pptpd.conf ${D}/${sysconfdir}/
+        # broken
+        rm -f ${D}${libdir}/pptpd/pptpd-logwtmp.so
 }
 
-PACKAGES = "${PN}-dbg ${PN}-bcrelay ${PN}-logwtmp-plugin ${PN} ${PN}-doc"
+PACKAGES = "${PN}-dbg ${PN}-bcrelay ${PN} ${PN}-doc"
 
 FILES_${PN}-bcrelay = "${sbindir}/bcrelay"
-FILES_${PN}-logwtmp-plugin = "${libdir}/pptpd/pptpd-logwtmp.so"
 
 CONFFILES_${PN} = "${sysconfdir}/pptpd.conf \
                    ${sysconfdir}/ppp/options.pptpd"