From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 7 Oct 2010 15:21:18 +0000 (+0000)
Subject: [backfire] merge r23253, r23254 and r23255
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=626cfe45155119d4115657bf7b5f4eda47f3f19e;p=openwrt%2Fsvn-archive%2Farchive.git

[backfire] merge r23253, r23254 and r23255


SVN-Revision: 23299
---

diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index a55309bf51..9b67c90df5 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -25,10 +25,14 @@ define Package/pptp
   DEPENDS:=+ppp +kmod-gre
 endef
 
-define Package/pptp/daemon
+define Package/pptp/description
  This package contains a PPTP (Point-to-Point Tunneling Protocol) client.
 endef
 
+define Package/pptp/conffiles
+/etc/ppp/options.pptp
+endef
+
 define Package/pptp/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/pptp $(1)/usr/sbin/
diff --git a/package/udev/Makefile b/package/udev/Makefile
index 26bfe8bba2..3f90208ff1 100644
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -34,6 +34,10 @@ define Package/udev/description
 	provides the ability to have persistent device names.
 endef
 
+define Package/udev/conffiles
+/etc/udev/udev.conf
+endef
+
 define Package/udev/config
 	source "$(SOURCE)/Config.in"
 endef
diff --git a/package/wprobe/Makefile b/package/wprobe/Makefile
index ab34f50d6b..aafe731dc0 100644
--- a/package/wprobe/Makefile
+++ b/package/wprobe/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -67,6 +67,10 @@ define Package/wprobe-export/description
   wireless driver measurement data via the IPFIX protocol
 endef
 
+define Package/wprobe-export/conffiles
+/etc/config/wprobe
+endef
+
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 	$(CP) src/* $(PKG_BUILD_DIR)/