diff options
Diffstat (limited to 'ubuntu/_base/core/tdebase/debian/rules')
| -rwxr-xr-x | ubuntu/_base/core/tdebase/debian/rules | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/ubuntu/_base/core/tdebase/debian/rules b/ubuntu/_base/core/tdebase/debian/rules index b23216492..8cdb710e0 100755 --- a/ubuntu/_base/core/tdebase/debian/rules +++ b/ubuntu/_base/core/tdebase/debian/rules @@ -30,10 +30,12 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" \ - -DWITH_GCC_VISIBILITY="ON" \ + -DBUILD_TDM_SYSTEMD_UNIT_FILE="ON" \ + -DSYSTEMDSYSTEMUNITDIR="/lib/systemd/system" \ -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \ -DTDM_PAM_SERVICE="tdm-trinity" \ -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \ + -DWITH_GCC_VISIBILITY="ON" \ -DWITH_USBIDS="/usr/share/misc/usb.ids" \ -DWITH_ARTS="ON" \ -DWITH_PAM="ON" \ @@ -43,6 +45,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="ON" \ -DWITH_LDAP="ON" \ -DWITH_SAMBA="ON" \ + -DWITH_SFTP="ON" \ -DWITH_LIBUSB="ON" \ -DWITH_LIBRAW1394="ON" \ -DWITH_OPENEXR="ON" \ @@ -52,7 +55,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_XRANDR="ON" \ -DWITH_XINERAMA="ON" \ -DWITH_SENSORS="ON" \ - -DWITH_HAL="OFF" \ -DWITH_TDEHWLIB="ON" \ -DWITH_XDMCP="ON" \ -DWITH_XRENDER="ON" \ @@ -73,8 +75,8 @@ DEB_FIXPERMS_EXCLUDE := \ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) +DEB_DH_INSTALLINIT_ARGS := --no-start --no-stop-on-upgrade --no-restart-after-upgrade +DEB_DH_SYSTEMD_START_ARGS := --no-start --no-stop-on-upgrade --no-restart-after-upgrade DOC_HTML_PRUNE := ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop @@ -84,15 +86,6 @@ PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-t #shlibs_ver = 4:3.5.0-1 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))')) -makebuilddir:: - touch kcontrol/energy/pics/energybig.png - touch kcontrol/energy/pics/lo-energy.png - uudecode -o kcontrol/pics/cr128-app-energy_star.png debian/img/cr128-app-energy_star.png.uu - uudecode -o kcontrol/pics/cr16-app-energy_star.png debian/img/cr16-app-energy_star.png.uu - uudecode -o kcontrol/pics/cr32-app-energy_star.png debian/img/cr32-app-energy_star.png.uu - uudecode -o kcontrol/pics/cr48-app-energy_star.png debian/img/cr48-app-energy_star.png.uu - uudecode -o kcontrol/pics/cr64-app-energy_star.png debian/img/cr64-app-energy_star.png.uu - common-install-prehook-arch:: grep -v -e joystick -e view1394 debian/kcontrol-trinity.install > debian/kcontrol-trinity.install.kfreebsd-i386 grep -v -e joystick -e view1394 debian/kcontrol-trinity.install > debian/kcontrol-trinity.install.kfreebsd-amd64 @@ -101,7 +94,6 @@ common-install-prehook-arch:: clean:: rm -f debian/kcontrol-trinity.install.kfreebsd* debian/tdebase-tdeio-plugins-trinity.install.kfreebs* - rm -f kcontrol/pics/cr*-app-energy_star.png kcontrol/energy/pics/energybig.png kcontrol/energy/pics/lo-energy.png binary-install/tdebase-data-trinity:: # hack the oui.db install, as under kfreebsd it does not get installed and then breaks at dh_install time |