3 files changed, 5 insertions, 15 deletions
diff --git a/cmake/debian/debian.cmake b/cmake/debian/debian.cmake
index 5aa8502b..8fe2be28 100644
--- a/cmake/debian/debian.cmake
+++ b/cmake/debian/debian.cmake
@@ -7,11 +7,11 @@ if (BUILD_DRIVER_ONLY)
 	SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian-kmod/postinst")
 	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/driver/driver/pptp.ko DESTINATION lib/modules/${DEBIAN_KDIR}/extra)
 	#SET(CPACK_DEBIAN_PACKAGE_DEPENDS "linux-image (= ${LINUX_IMAGE})")
-else (BUILD_DRIVER_ONLY)	
-	SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.7), libssl0.9.8 (>= 0.9.8)")
-	SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/preinst;${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/postinst")
+else (BUILD_DRIVER_ONLY)
+	SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.7), libssl0.9.8 (>= 0.9.8), libpcre3 (>= 7.6)")
+	SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/postinst")
 
+	INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/accel-pptpd/accel-pptp.conf DESTINATION etc RENAME accel-pptp.conf.dist)
 	INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-pptp-init DESTINATION etc/init.d RENAME accel-pptp)
 	INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-pptp-default DESTINATION etc/default RENAME accel-pptp)
 endif (BUILD_DRIVER_ONLY)
-
diff --git a/cmake/debian/postinst b/cmake/debian/postinst
index c85dc84c..4d1b1846 100755
--- a/cmake/debian/postinst
+++ b/cmake/debian/postinst
@@ -3,9 +3,6 @@
 chmod +x /etc/init.d/accel-pptp
 
 mkdir /var/log/accel-pptp &> /dev/null
-
-if [ -f /tmp/__accel-pptp.conf ]; then
-	mv /tmp/__accel-pptp.conf /etc/accel-pptp.conf
-fi
+mkdir /var/run/accel-pptp &> /dev/null
 
 exit 0
diff --git a/cmake/debian/preinst b/cmake/debian/preinst
deleted file mode 100755
index 765a4dab..00000000
--- a/cmake/debian/preinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ -f /etc/accel-pptp.conf ]; then
-	mv /etc/accel-pptp.conf /tmp/__accel-pptp.conf
-fi
-
-exit 0