Install kppp-options into /etc instead of /opt/trinity/etc on Debian and Ubuntu

Default kppp-options moved from tde-packaging into tdenetwork
This resolves Bug 2529

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 48ab8a653e890c49969f154821569c125aaf5c9b)

9 files changed, 15 insertions, 18 deletions

diff --git a/debian/lenny/tdenetwork/debian/kppp-options b/debian/lenny/tdenetwork/debian/kppp-options
deleted file mode 100644
index 32ec05f0e..000000000
--- a/debian/lenny/tdenetwork/debian/kppp-options
+++ /dev/null
@@ -1 +0,0 @@
-noauth
diff --git a/debian/lenny/tdenetwork/debian/kppp-trinity.install b/debian/lenny/tdenetwork/debian/kppp-trinity.install
index bfebdd004..7c2f9d141 100644
--- a/debian/lenny/tdenetwork/debian/kppp-trinity.install
+++ b/debian/lenny/tdenetwork/debian/kppp-trinity.install
@@ -1,3 +1,4 @@
+debian/tmp/etc/ppp/peers/kppp-options
 debian/tmp/opt/trinity/bin/kppp
 debian/tmp/opt/trinity/bin/kppplogview
 debian/tmp/opt/trinity/share/applications/tde/Kppp.desktop
@@ -530,4 +531,3 @@ debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kppp.png
 
 debian/icons/kppp-16.xpm	/opt/trinity/share/pixmaps
 debian/icons/kppp.xpm		/opt/trinity/share/pixmaps
-debian/kppp-options	opt/trinity/etc/ppp/peers/
diff --git a/debian/lenny/tdenetwork/debian/rules b/debian/lenny/tdenetwork/debian/rules
index 5be156f6f..42026b275 100755
--- a/debian/lenny/tdenetwork/debian/rules
+++ b/debian/lenny/tdenetwork/debian/rules
@@ -30,7 +30,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
  -DCONFIG_INSTALL_DIR="/etc/trinity" \
- -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
  -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
@@ -52,11 +52,11 @@ PACKAGES_WITH_LIBS := librss1-trinity kopete-trinity ksirc-trinity kwifimanager-
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
 DEB_FIXPERMS_EXCLUDE := opt/trinity/bin/kppp opt/trinity/bin/kppplogview \
-	opt/trinity/etc/ppp/peers/kppp-options
+	etc/ppp/peers/kppp-options
 
 binary-install/kppp-trinity::
 	chown root:dip debian/kppp-trinity/opt/trinity/bin/kppp*
-	chown root:dip debian/kppp-trinity/opt/trinity/etc/ppp/peers/kppp-options
+	chown root:dip debian/kppp-trinity/etc/ppp/peers/kppp-options
 	chmod 4754 debian/kppp-trinity/opt/trinity/bin/kppp
 	chmod 0754 debian/kppp-trinity/opt/trinity/bin/kppplogview
-	chmod 0640 debian/kppp-trinity/opt/trinity/etc/ppp/peers/kppp-options
+	chmod 0640 debian/kppp-trinity/etc/ppp/peers/kppp-options
diff --git a/debian/squeeze/tdenetwork/debian/kppp-options b/debian/squeeze/tdenetwork/debian/kppp-options
deleted file mode 100644
index 32ec05f0e..000000000
--- a/debian/squeeze/tdenetwork/debian/kppp-options
+++ /dev/null
@@ -1 +0,0 @@
-noauth
diff --git a/debian/squeeze/tdenetwork/debian/kppp-trinity.install b/debian/squeeze/tdenetwork/debian/kppp-trinity.install
index bfebdd004..7c2f9d141 100644
--- a/debian/squeeze/tdenetwork/debian/kppp-trinity.install
+++ b/debian/squeeze/tdenetwork/debian/kppp-trinity.install
@@ -1,3 +1,4 @@
+debian/tmp/etc/ppp/peers/kppp-options
 debian/tmp/opt/trinity/bin/kppp
 debian/tmp/opt/trinity/bin/kppplogview
 debian/tmp/opt/trinity/share/applications/tde/Kppp.desktop
@@ -530,4 +531,3 @@ debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kppp.png
 
 debian/icons/kppp-16.xpm	/opt/trinity/share/pixmaps
 debian/icons/kppp.xpm		/opt/trinity/share/pixmaps
-debian/kppp-options	opt/trinity/etc/ppp/peers/
diff --git a/debian/squeeze/tdenetwork/debian/rules b/debian/squeeze/tdenetwork/debian/rules
index ec0abfcde..a0a8e11bb 100755
--- a/debian/squeeze/tdenetwork/debian/rules
+++ b/debian/squeeze/tdenetwork/debian/rules
@@ -30,7 +30,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
  -DCONFIG_INSTALL_DIR="/etc/trinity" \
- -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
  -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
@@ -52,11 +52,11 @@ PACKAGES_WITH_LIBS := librss1-trinity kopete-trinity ksirc-trinity kwifimanager-
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
 DEB_FIXPERMS_EXCLUDE := opt/trinity/bin/kppp opt/trinity/bin/kppplogview \
-	opt/trinity/etc/ppp/peers/kppp-options
+	etc/ppp/peers/kppp-options
 
 binary-install/kppp-trinity::
 	chown root:dip debian/kppp-trinity/opt/trinity/bin/kppp*
-	chown root:dip debian/kppp-trinity/opt/trinity/etc/ppp/peers/kppp-options
+	chown root:dip debian/kppp-trinity/etc/ppp/peers/kppp-options
 	chmod 4754 debian/kppp-trinity/opt/trinity/bin/kppp
 	chmod 0754 debian/kppp-trinity/opt/trinity/bin/kppplogview
-	chmod 0640 debian/kppp-trinity/opt/trinity/etc/ppp/peers/kppp-options
+	chmod 0640 debian/kppp-trinity/etc/ppp/peers/kppp-options
diff --git a/ubuntu/maverick/tdenetwork/debian/kppp-options b/ubuntu/maverick/tdenetwork/debian/kppp-options
deleted file mode 100644
index 32ec05f0e..000000000
--- a/ubuntu/maverick/tdenetwork/debian/kppp-options
+++ /dev/null
@@ -1 +0,0 @@
-noauth
diff --git a/ubuntu/maverick/tdenetwork/debian/kppp-trinity.install b/ubuntu/maverick/tdenetwork/debian/kppp-trinity.install
index bfebdd004..7c2f9d141 100644
--- a/ubuntu/maverick/tdenetwork/debian/kppp-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/kppp-trinity.install
@@ -1,3 +1,4 @@
+debian/tmp/etc/ppp/peers/kppp-options
 debian/tmp/opt/trinity/bin/kppp
 debian/tmp/opt/trinity/bin/kppplogview
 debian/tmp/opt/trinity/share/applications/tde/Kppp.desktop
@@ -530,4 +531,3 @@ debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kppp.png
 
 debian/icons/kppp-16.xpm	/opt/trinity/share/pixmaps
 debian/icons/kppp.xpm		/opt/trinity/share/pixmaps
-debian/kppp-options	opt/trinity/etc/ppp/peers/
diff --git a/ubuntu/maverick/tdenetwork/debian/rules b/ubuntu/maverick/tdenetwork/debian/rules
index ec0abfcde..a0a8e11bb 100755
--- a/ubuntu/maverick/tdenetwork/debian/rules
+++ b/ubuntu/maverick/tdenetwork/debian/rules
@@ -30,7 +30,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
  -DCONFIG_INSTALL_DIR="/etc/trinity" \
- -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
  -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
@@ -52,11 +52,11 @@ PACKAGES_WITH_LIBS := librss1-trinity kopete-trinity ksirc-trinity kwifimanager-
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
 DEB_FIXPERMS_EXCLUDE := opt/trinity/bin/kppp opt/trinity/bin/kppplogview \
-	opt/trinity/etc/ppp/peers/kppp-options
+	etc/ppp/peers/kppp-options
 
 binary-install/kppp-trinity::
 	chown root:dip debian/kppp-trinity/opt/trinity/bin/kppp*
-	chown root:dip debian/kppp-trinity/opt/trinity/etc/ppp/peers/kppp-options
+	chown root:dip debian/kppp-trinity/etc/ppp/peers/kppp-options
 	chmod 4754 debian/kppp-trinity/opt/trinity/bin/kppp
 	chmod 0754 debian/kppp-trinity/opt/trinity/bin/kppplogview
-	chmod 0640 debian/kppp-trinity/opt/trinity/etc/ppp/peers/kppp-options
+	chmod 0640 debian/kppp-trinity/etc/ppp/peers/kppp-options