TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source 
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 48ab8a653e)
pull/92/head
Slávek Banko 9 years ago
parent 176b5c5805
commit c5916c9b9f
9 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File

1
debian/lenny/tdenetwork/debian/kppp-options vendored
Unescape View File

@ -1 +0,0 @@
noauth

2
debian/lenny/tdenetwork/debian/kppp-trinity.install vendored
Unescape View File

@ -1,3 +1,4 @@
debian/tmp/etc/ppp/peers/kppp-options
debian/tmp/opt/trinity/bin/kppp debian/tmp/opt/trinity/bin/kppp
debian/tmp/opt/trinity/bin/kppplogview debian/tmp/opt/trinity/bin/kppplogview
debian/tmp/opt/trinity/share/applications/tde/Kppp.desktop 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-16.xpm /opt/trinity/share/pixmaps
debian/icons/kppp.xpm /opt/trinity/share/pixmaps debian/icons/kppp.xpm /opt/trinity/share/pixmaps
debian/kppp-options opt/trinity/etc/ppp/peers/

8
debian/lenny/tdenetwork/debian/rules vendored
Unescape View File

@ -30,7 +30,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
DEB_CMAKE_EXTRA_FLAGS := \ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_INSTALL_PREFIX="/opt/trinity" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
-DCONFIG_INSTALL_DIR="/etc/trinity" \ -DCONFIG_INSTALL_DIR="/etc/trinity" \
-DSYSCONF_INSTALL_DIR="/etc/trinity" \ -DSYSCONF_INSTALL_DIR="/etc" \
-DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_VERBOSE_MAKEFILE="ON" \ -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))')) #$(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 \ 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:: binary-install/kppp-trinity::
chown root:dip debian/kppp-trinity/opt/trinity/bin/kppp* 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 4754 debian/kppp-trinity/opt/trinity/bin/kppp
chmod 0754 debian/kppp-trinity/opt/trinity/bin/kppplogview 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

1
debian/squeeze/tdenetwork/debian/kppp-options vendored
Unescape View File

@ -1 +0,0 @@
noauth

2
debian/squeeze/tdenetwork/debian/kppp-trinity.install vendored
Unescape View File

@ -1,3 +1,4 @@
debian/tmp/etc/ppp/peers/kppp-options
debian/tmp/opt/trinity/bin/kppp debian/tmp/opt/trinity/bin/kppp
debian/tmp/opt/trinity/bin/kppplogview debian/tmp/opt/trinity/bin/kppplogview
debian/tmp/opt/trinity/share/applications/tde/Kppp.desktop 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-16.xpm /opt/trinity/share/pixmaps
debian/icons/kppp.xpm /opt/trinity/share/pixmaps debian/icons/kppp.xpm /opt/trinity/share/pixmaps
debian/kppp-options opt/trinity/etc/ppp/peers/

8
debian/squeeze/tdenetwork/debian/rules vendored
Unescape View File

@ -30,7 +30,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
DEB_CMAKE_EXTRA_FLAGS := \ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_INSTALL_PREFIX="/opt/trinity" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
-DCONFIG_INSTALL_DIR="/etc/trinity" \ -DCONFIG_INSTALL_DIR="/etc/trinity" \
-DSYSCONF_INSTALL_DIR="/etc/trinity" \ -DSYSCONF_INSTALL_DIR="/etc" \
-DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_VERBOSE_MAKEFILE="ON" \ -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))')) #$(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 \ 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:: binary-install/kppp-trinity::
chown root:dip debian/kppp-trinity/opt/trinity/bin/kppp* 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 4754 debian/kppp-trinity/opt/trinity/bin/kppp
chmod 0754 debian/kppp-trinity/opt/trinity/bin/kppplogview 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

1
ubuntu/maverick/tdenetwork/debian/kppp-options
Unescape View File

@ -1 +0,0 @@
noauth

2
ubuntu/maverick/tdenetwork/debian/kppp-trinity.install
Unescape View File

@ -1,3 +1,4 @@
debian/tmp/etc/ppp/peers/kppp-options
debian/tmp/opt/trinity/bin/kppp debian/tmp/opt/trinity/bin/kppp
debian/tmp/opt/trinity/bin/kppplogview debian/tmp/opt/trinity/bin/kppplogview
debian/tmp/opt/trinity/share/applications/tde/Kppp.desktop 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-16.xpm /opt/trinity/share/pixmaps
debian/icons/kppp.xpm /opt/trinity/share/pixmaps debian/icons/kppp.xpm /opt/trinity/share/pixmaps
debian/kppp-options opt/trinity/etc/ppp/peers/

8
ubuntu/maverick/tdenetwork/debian/rules
Unescape View File

@ -30,7 +30,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
DEB_CMAKE_EXTRA_FLAGS := \ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_INSTALL_PREFIX="/opt/trinity" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
-DCONFIG_INSTALL_DIR="/etc/trinity" \ -DCONFIG_INSTALL_DIR="/etc/trinity" \
-DSYSCONF_INSTALL_DIR="/etc/trinity" \ -DSYSCONF_INSTALL_DIR="/etc" \
-DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_VERBOSE_MAKEFILE="ON" \ -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))')) #$(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 \ 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:: binary-install/kppp-trinity::
chown root:dip debian/kppp-trinity/opt/trinity/bin/kppp* 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 4754 debian/kppp-trinity/opt/trinity/bin/kppp
chmod 0754 debian/kppp-trinity/opt/trinity/bin/kppplogview 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

Write Preview
Loading…
Cancel
Save