[packagekit] packagekit: Branch 'master' - 5 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Fri Dec 28 15:37:02 PST 2007
Makefile.am | 13 ++++++------
configure.ac | 4 +--
data/Makefile.am | 6 +++++
data/org.freedesktop.PackageKit.conf.in | 33 ++++++++++++++++++++++++++++++++
data/packagekit.pc.in | 13 ++++++++++++
data/wscript_build | 19 ++++++++++++++++++
org.freedesktop.PackageKit.conf.in | 33 --------------------------------
packagekit.pc.in | 13 ------------
src/pk-backend.c | 3 +-
wscript | 19 ------------------
10 files changed, 82 insertions(+), 74 deletions(-)
New commits:
commit 8632d0036067ddace5a8d28ec00fe048d7c3ec7e
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Dec 28 23:36:35 2007 +0000
only show the daemon warning of no status if an error has not been set
diff --git a/src/pk-backend.c b/src/pk-backend.c
index 0f21004..c53ad40 100644
--- a/src/pk-backend.c
+++ b/src/pk-backend.c
@@ -1108,7 +1108,8 @@ pk_backend_finished (PkBackend *backend)
}
/* check we sent at least one status calls */
- if (backend->priv->status == PK_STATUS_ENUM_SETUP) {
+ if (backend->priv->set_error == FALSE &&
+ backend->priv->status == PK_STATUS_ENUM_SETUP) {
pk_backend_message (backend, PK_MESSAGE_ENUM_DAEMON,
"Backends should send status <value> signals to update the UI!\n"
"If you are:\n"
commit 5711b076bbc7818087cadc8b5e00178e8ad4c2a6
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Dec 28 20:25:55 2007 +0000
oops, fix configure
diff --git a/configure.ac b/configure.ac
index 5c1c3ff..e66e874 100755
--- a/configure.ac
+++ b/configure.ac
@@ -462,7 +462,6 @@ dnl ---------------------------------------------------------------------------
dnl - Makefiles, etc.
dnl ---------------------------------------------------------------------------
AC_OUTPUT([
-packagekit.pc
Makefile
etc/Makefile
man/Makefile
@@ -491,6 +490,8 @@ backends/pisi/Makefile
backends/pisi/helpers/Makefile
backends/zypp/Makefile
data/Makefile
+data/packagekit.pc
+data/org.freedesktop.PackageKit.conf
data/tests/Makefile
libselftest/Makefile
libgbus/Makefile
@@ -500,7 +501,6 @@ src/Makefile
client/Makefile
python/Makefile
python/packagekit/Makefile
-org.freedesktop.PackageKit.conf
])
dnl ==========================================================================
commit 70ebed33bbc41831e20c8905712bd61ba5f078ae
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Dec 28 20:20:52 2007 +0000
fix the waf build
diff --git a/data/wscript_build b/data/wscript_build
index 6ae4d41..0beaf52 100644
--- a/data/wscript_build
+++ b/data/wscript_build
@@ -25,6 +25,25 @@ obj.fun = misc.subst_func
obj.install_var = 'PREFIX'
obj.install_subdir = 'usr/share/dbus-1/system-services'
+#set the user in packagekit.pc.in and install
+obj=bld.create_obj('subst')
+obj.source = 'packagekit.pc.in'
+obj.target = 'packagekit.pc'
+#TODO: set these correctly
+obj.dict = {'VERSION': 'dave', 'prefix':'PREFIX', 'exec_prefix':'PREFIX', 'libdir':'usr/lib', 'includedir':'usr/include'}
+obj.fun = misc.subst_func
+obj.install_var = 'PREFIX'
+obj.install_subdir = 'usr/lib/pkgconfig'
+
+#set the user in org.freedesktop.PackageKit.conf.in and install
+obj=bld.create_obj('subst')
+obj.source = 'org.freedesktop.PackageKit.conf.in'
+obj.target = 'org.freedesktop.PackageKit.conf'
+obj.dict = {'PACKAGEKIT_USER': Params.g_options.user}
+obj.fun = misc.subst_func
+obj.install_var = 'PREFIX'
+obj.install_subdir = 'etc/dbus-1/system.d'
+
#install the data files
Common.install_files('PREFIX', os.path.join('var', 'run', 'PackageKit'), 'job_count.dat')
Common.install_files('PREFIX', os.path.join('var', 'lib', 'PackageKit'), 'transactions.db')
diff --git a/wscript b/wscript
index 1fbc82c..e7ee389 100644
--- a/wscript
+++ b/wscript
@@ -116,25 +116,6 @@ def build(bld):
# man python
bld.add_subdirs('libpackagekit backends client libgbus libselftest etc policy po data src docs contrib')
- #set the user in packagekit.pc.in and install
- obj=bld.create_obj('subst')
- obj.source = 'packagekit.pc.in'
- obj.target = 'packagekit.pc'
- #TODO: set these correctly
- obj.dict = {'VERSION': 'dave', 'prefix':'PREFIX', 'exec_prefix':'PREFIX', 'libdir':'usr/lib', 'includedir':'usr/include'}
- obj.fun = misc.subst_func
- obj.install_var = 'PREFIX'
- obj.install_subdir = 'usr/lib/pkgconfig'
-
- #set the user in org.freedesktop.PackageKit.conf.in and install
- obj=bld.create_obj('subst')
- obj.source = 'org.freedesktop.PackageKit.conf.in'
- obj.target = 'org.freedesktop.PackageKit.conf'
- obj.dict = {'PACKAGEKIT_USER': Params.g_options.user}
- obj.fun = misc.subst_func
- obj.install_var = 'PREFIX'
- obj.install_subdir = 'etc/dbus-1/system.d'
-
def shutdown():
env = Params.g_build.env()
if env['HAVE_GCOV']:
commit 4c3f319e1c22f7d41f9610a46c1240481c985e10
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Dec 28 20:13:30 2007 +0000
move the data files to data/
diff --git a/Makefile.am b/Makefile.am
index 3cf710e..57f5517 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,12 +18,6 @@ SUBDIRS = \
docs \
$(NULL)
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = packagekit.pc
-
-dbusdir = ${SYSCONFDIR}/dbus-1/system.d
-dist_dbus_DATA = org.freedesktop.PackageKit.conf
-
EXTRA_DIST = \
org.freedesktop.PackageKit.conf.in \
packagekit.pc.in \
diff --git a/data/Makefile.am b/data/Makefile.am
index c2d02d6..118d6f8 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,6 +7,12 @@ SUBDIRS = \
tests \
$(NULL)
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = packagekit.pc
+
+dbusdir = ${SYSCONFDIR}/dbus-1/system.d
+dist_dbus_DATA = org.freedesktop.PackageKit.conf
+
servicedir = $(DBUS_SERVICES_DIR)
service_in_files = org.freedesktop.PackageKit.service.in
service_DATA = $(service_in_files:.service.in=.service)
diff --git a/data/org.freedesktop.PackageKit.conf.in b/data/org.freedesktop.PackageKit.conf.in
new file mode 100644
index 0000000..708f2eb
--- /dev/null
+++ b/data/org.freedesktop.PackageKit.conf.in
@@ -0,0 +1,33 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+ <!-- This configuration file specifies the required security policies
+ for the PackageKit to work. -->
+
+ <!-- Only root or user @PACKAGEKIT_USER@ can own the PackageKit service -->
+ <policy user="@PACKAGEKIT_USER@">
+ <allow own="org.freedesktop.PackageKit"/>
+ </policy>
+ <policy user="root">
+ <allow own="org.freedesktop.PackageKit"/>
+ </policy>
+
+ <!-- Allow anyone to invoke methods on the Manager and Device interfaces -->
+ <policy context="default">
+ <deny send_interface="org.freedesktop.PackageKit"/>
+ </policy>
+
+ <!-- This will not work if pam_console support is not enabled -->
+ <policy at_console="true">
+ <allow send_interface="org.freedesktop.PackageKit"/>
+ </policy>
+
+ <!-- You can change this to a more suitable user, or make per-group -->
+ <policy user="0">
+ <allow send_interface="org.freedesktop.PackageKit"/>
+ </policy>
+
+</busconfig>
+
diff --git a/data/packagekit.pc.in b/data/packagekit.pc.in
new file mode 100644
index 0000000..ebe57ff
--- /dev/null
+++ b/data/packagekit.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: packagekit
+Description: PackageKit is a system daemon for installing stuff.
+Version: @VERSION@
+Requires.private: dbus-1, gthread-2.0
+Requires: glib-2.0, gobject-2.0
+Libs: -L${libdir} -lpackagekit
+Cflags: -I${includedir}/packagekit
+
diff --git a/org.freedesktop.PackageKit.conf.in b/org.freedesktop.PackageKit.conf.in
deleted file mode 100644
index 708f2eb..0000000
--- a/org.freedesktop.PackageKit.conf.in
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
- <!-- This configuration file specifies the required security policies
- for the PackageKit to work. -->
-
- <!-- Only root or user @PACKAGEKIT_USER@ can own the PackageKit service -->
- <policy user="@PACKAGEKIT_USER@">
- <allow own="org.freedesktop.PackageKit"/>
- </policy>
- <policy user="root">
- <allow own="org.freedesktop.PackageKit"/>
- </policy>
-
- <!-- Allow anyone to invoke methods on the Manager and Device interfaces -->
- <policy context="default">
- <deny send_interface="org.freedesktop.PackageKit"/>
- </policy>
-
- <!-- This will not work if pam_console support is not enabled -->
- <policy at_console="true">
- <allow send_interface="org.freedesktop.PackageKit"/>
- </policy>
-
- <!-- You can change this to a more suitable user, or make per-group -->
- <policy user="0">
- <allow send_interface="org.freedesktop.PackageKit"/>
- </policy>
-
-</busconfig>
-
diff --git a/packagekit.pc.in b/packagekit.pc.in
deleted file mode 100644
index ebe57ff..0000000
--- a/packagekit.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: packagekit
-Description: PackageKit is a system daemon for installing stuff.
-Version: @VERSION@
-Requires.private: dbus-1, gthread-2.0
-Requires: glib-2.0, gobject-2.0
-Libs: -L${libdir} -lpackagekit
-Cflags: -I${includedir}/packagekit
-
commit 4b67796ea0433b65ceb7ffd5d8c9b70dcecc0cf7
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Dec 28 20:10:26 2007 +0000
remove some generated files in make distclean
diff --git a/Makefile.am b/Makefile.am
index b8f8b72..3cf710e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,6 +68,13 @@ DISTCLEANFILES = \
intltool-extract \
intltool-merge \
intltool-update \
+ gcov.txt \
+ gprof.txt \
+ packagekit-decl-list.txt \
+ packagekit-decl.txt \
+ packagekit-overrides.txt \
+ packagekit-sections.txt \
+ packagekit.types \
$(NULL)
MAINTAINERCLEANFILES = \
More information about the PackageKit
mailing list