summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extra/polkit/.footprint9
-rw-r--r--[-rwxr-xr-x]extra/polkit/.md5sum2
-rwxr-xr-xextra/polkit/Pkgfile2
-rwxr-xr-xkde/kde/Pkgfile8
4 files changed, 17 insertions, 4 deletions
diff --git a/extra/polkit/.footprint b/extra/polkit/.footprint
index a7b9d6f6e..6a7316fe1 100644
--- a/extra/polkit/.footprint
+++ b/extra/polkit/.footprint
@@ -7,11 +7,16 @@ drwxr-xr-x root/root etc/pam.d/
drwxr-xr-x root/root etc/polkit-1/
drwxr-xr-x root/root etc/polkit-1/localauthority.conf.d/
-rw-r--r-- root/root etc/polkit-1/localauthority.conf.d/50-localauthority.conf
+drwx------ root/root etc/polkit-1/localauthority/
+drwxr-xr-x root/root etc/polkit-1/localauthority/10-vendor.d/
+drwxr-xr-x root/root etc/polkit-1/localauthority/20-org.d/
+drwxr-xr-x root/root etc/polkit-1/localauthority/30-site.d/
+drwxr-xr-x root/root etc/polkit-1/localauthority/50-local.d/
+drwxr-xr-x root/root etc/polkit-1/localauthority/90-mandatory.d/
drwxr-xr-x root/root etc/polkit-1/nullbackend.conf.d/
-rw-r--r-- root/root etc/polkit-1/nullbackend.conf.d/50-nullbackend.conf
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
--rwxr-xr-x root/root usr/bin/pk-example-frobnicate
-rwxr-xr-x root/root usr/bin/pkaction
-rwxr-xr-x root/root usr/bin/pkcheck
-rwsr-xr-x root/root usr/bin/pkexec
@@ -21,6 +26,7 @@ drwxr-xr-x root/root usr/include/polkit-1/polkit/
-rw-r--r-- root/root usr/include/polkit-1/polkit/polkit.h
-rw-r--r-- root/root usr/include/polkit-1/polkit/polkitactiondescription.h
-rw-r--r-- root/root usr/include/polkit-1/polkit/polkitauthority.h
+-rw-r--r-- root/root usr/include/polkit-1/polkit/polkitauthorityfeatures.h
-rw-r--r-- root/root usr/include/polkit-1/polkit/polkitauthorizationresult.h
-rw-r--r-- root/root usr/include/polkit-1/polkit/polkitcheckauthorizationflags.h
-rw-r--r-- root/root usr/include/polkit-1/polkit/polkitdetails.h
@@ -104,7 +110,6 @@ drwxr-xr-x root/root usr/share/man/man8/
-rw-r--r-- root/root usr/share/man/man8/polkitd.8.gz
drwxr-xr-x root/root usr/share/polkit-1/
drwxr-xr-x root/root usr/share/polkit-1/actions/
--rw-r--r-- root/root usr/share/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy
-rw-r--r-- root/root usr/share/polkit-1/actions/org.freedesktop.policykit.policy
drwxr-xr-x root/root var/
drwxr-xr-x root/root var/lib/
diff --git a/extra/polkit/.md5sum b/extra/polkit/.md5sum
index 69fbf3590..a8354b8da 100755..100644
--- a/extra/polkit/.md5sum
+++ b/extra/polkit/.md5sum
@@ -1 +1 @@
-5abc9f858e7b614ef41161db36d53915 polkit-0.94.tar.gz
+e0a06da501b04ed3bab986a9df5b5aa2 polkit-0.96.tar.gz
diff --git a/extra/polkit/Pkgfile b/extra/polkit/Pkgfile
index 61f2416cc..13bf735ce 100755
--- a/extra/polkit/Pkgfile
+++ b/extra/polkit/Pkgfile
@@ -5,7 +5,7 @@
# Depends on: dbus-glib, expat, eggdbus, gobject-introspection, linux-pam
name=polkit
-version=0.94
+version=0.96
release=1
source=(http://hal.freedesktop.org/releases/$name-$version.tar.gz)
build() {
diff --git a/kde/kde/Pkgfile b/kde/kde/Pkgfile
index 80629df24..137461c9d 100755
--- a/kde/kde/Pkgfile
+++ b/kde/kde/Pkgfile
@@ -2,7 +2,15 @@
# URL: http://www.kde.org/
# Maintainer: NuTyX packager team
# Packager: lesibel at free dot fr
+<<<<<<< HEAD:kde/kde/Pkgfile
# Depends on: curl, xorg, kdelibs, kdepimlibs, kdeadmin, kdegraphics, kdemultimedia, kdeutils, kdenetwork, kde-l10n-fr, kdebase, kdepim, kdepim-runtime, kdeplasma-addons, kdetoys, kdebindings, phonon, desktop-file-utils, xorg, shared-mime-info, nas, atk, xine-lib, taglib, qimageblitz, pilot-link, gnokii, libical, akonadi, gpgme, boost, lcms, oxygen-icons, soprano, strigi, eigen, eigen, libspectre
+=======
+<<<<<<< HEAD
+# Depends on: curl, xorg, kdelibs, kdepimlibs, kdeadmin, kdegraphics, kdemultimedia, kdeutils, kdenetwork, kde-l10n-fr, kdebase, kdepim, kdepim-runtime, kdeplasma-addons, kdetoys, kdebindings, phonon, desktop-file-utils, xorg, shared-mime-info, nas, atk, xine-lib, taglib, qimageblitz, pilot-link, gnokii, libical, akonadi, gpgme, boost, lcms, oxygen-icons, soprano, strigi, eigen, eigen, libspectre
+=======
+# Depends on: xorg, kdelibs, kdepimlibs, kdeadmin, kdegraphics, kdemultimedia, kdeutils, kdegames, kdenetwork, kde-l10n-fr, kdebase, kdepim, kdeplasma-addons, kdetoys, kdebindings, phonon-xine, k3b, kdesdk, amarok, desktop-file-utils, xorg, shared-mime-info, nas, atk, xine-lib, taglib, qimageblitz, pilot-link, gnokii, libical, akonadi, gpgme, boost, lcms, oxygen-icons, soprano, strigi, eigen, eigen2, gestpkg
+>>>>>>> nutyx-2009/master
+>>>>>>> lesibel/master:kde/kde/Pkgfile
name=kde
version=4.4.0