92 lines
2.9 KiB
Diff
92 lines
2.9 KiB
Diff
--- data/Makefile.am
|
|
+++ data/Makefile.am
|
|
@@ -10,12 +10,6 @@
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
pkgconfig_DATA = packagekit.pc
|
|
|
|
-cronfiledir = ${SYSCONFDIR}/cron.daily
|
|
-cronfile_SCRIPTS = packagekit-background.cron
|
|
-
|
|
-crondatadir = ${SYSCONFDIR}/sysconfig
|
|
-crondata_SCRIPTS = packagekit-background
|
|
-
|
|
pmutilsdir = $(libdir)/pm-utils/sleep.d
|
|
pmutils_DATA = 95packagekit
|
|
|
|
@@ -38,8 +32,6 @@
|
|
dbusdir = ${SYSCONFDIR}/dbus-1/system.d
|
|
dist_dbus_DATA = \
|
|
org.freedesktop.PackageKit.conf \
|
|
- org.freedesktop.PackageKitTestBackend.conf \
|
|
- org.freedesktop.PackageKitAptBackend.conf \
|
|
$(NULL)
|
|
|
|
servicemaindir = $(DBUS_SERVICES_DIR)
|
|
@@ -48,18 +40,6 @@
|
|
$(servicemain_DATA): $(servicemain_in_files) Makefile
|
|
@sed -e "s|\@servicedir\@|$(sbindir)|" -e "s|\@PACKAGEKIT_USER\@|$(PACKAGEKIT_USER)|" $< > $@
|
|
|
|
-servicetestdir = $(DBUS_SERVICES_DIR)
|
|
-servicetest_in_files = org.freedesktop.PackageKitTestBackend.service.in
|
|
-servicetest_DATA = $(servicetest_in_files:.service.in=.service)
|
|
-$(servicetest_DATA): $(servicetest_in_files) Makefile
|
|
- @sed -e "s|\@servicedir\@|$(libexecdir)|" -e "s|\@PK_BACKEND_USER\@|$(PK_BACKEND_USER)|" $< > $@
|
|
-
|
|
-serviceaptdir = $(DBUS_SERVICES_DIR)
|
|
-serviceapt_in_files = org.freedesktop.PackageKitAptBackend.service.in
|
|
-serviceapt_DATA = $(serviceapt_in_files:.service.in=.service)
|
|
-$(serviceapt_DATA): $(serviceapt_in_files) Makefile
|
|
- @sed -e "s|\@servicedir\@|$(libexecdir)|" -e "s|\@PK_BACKEND_USER\@|$(PK_BACKEND_USER)|" $< > $@
|
|
-
|
|
localcachedir = $(localstatedir)/run/PackageKit
|
|
localcache_DATA = \
|
|
job_count.dat \
|
|
@@ -72,16 +52,10 @@
|
|
|
|
EXTRA_DIST = \
|
|
95packagekit \
|
|
- packagekit-background \
|
|
- packagekit-background.cron \
|
|
org.freedesktop.PackageKit.conf.in \
|
|
- org.freedesktop.PackageKitTestBackend.conf.in \
|
|
- org.freedesktop.PackageKitAptBackend.conf.in \
|
|
packagekit.pc.in \
|
|
20packagekit \
|
|
$(servicemain_in_files) \
|
|
- $(servicetest_in_files) \
|
|
- $(serviceapt_in_files) \
|
|
$(mime_in_files) \
|
|
$(localcache_DATA) \
|
|
$(database_DATA) \
|
|
@@ -97,8 +71,6 @@
|
|
DISTCLEANFILES = \
|
|
$(mime_DATA) \
|
|
org.freedesktop.PackageKit.service \
|
|
- org.freedesktop.PackageKitTestBackend.service \
|
|
- org.freedesktop.PackageKitAptBackend.service \
|
|
$(NULL)
|
|
|
|
MAINTAINERCLEANFILES = \
|
|
--- etc/PackageKit.conf.in
|
|
+++ etc/PackageKit.conf.in
|
|
@@ -23,7 +23,7 @@
|
|
# Shut down the daemon after this many seconds idle. 0 means don't shutdown.
|
|
#
|
|
# default=300
|
|
-ShutdownTimeout=300
|
|
+ShutdownTimeout=15
|
|
|
|
# Unlock the backend after this many seconds idle.
|
|
#
|
|
--- etc/Vendor.conf
|
|
+++ etc/Vendor.conf
|
|
@@ -12,7 +12,7 @@
|
|
# If the value is set to 'none' then no link is shown.
|
|
#
|
|
# default=http://www.packagekit.org/pk-package-not-found.html
|
|
-DefaultUrl=http://www.packagekit.org/pk-package-not-found.html
|
|
+DefaultUrl=none
|
|
|
|
# The URL which is shown to the user when a codec could not be found.
|
|
# It should explain why certain codecs cannot be used, and perhaps show
|