Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=1f547306d1fd822525ac197be9fe75f6ec2da937
commit 1f547306d1fd822525ac197be9fe75f6ec2da937
Merge: 37fb5f3 7f05f89
Author: bouleetbil <bouleet...@frogdev.info>
Date: Thu Mar 3 19:58:26 2011 +0100
Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
Conflicts:
source/base/systemd/FrugalBuild
source/devel-extra/python-3.0/FrugalBuild
source/gnome/gdm/FrugalBuild
diff --cc source/base/systemd/FrugalBuild
index 82b890a,82b8ccb..30dd093
--- a/source/base/systemd/FrugalBuild
+++ b/source/base/systemd/FrugalBuild
@@@ -7,8 -7,8 +7,8 @@@ USE_TCP=${USE_TCP:-"n"
USE_GUI=${USE_GUI:-"y"}
pkgname=systemd
- pkgver=18
- pkgrel=4
+ pkgver=19
-pkgrel=1
++pkgrel=2
pkgdesc="A System and Service Manager"
url="http://www.freedesktop.org/wiki/Software/systemd";
depends=('dbus' 'udev' 'pam' 'coreutils' 'libcap' 'sysvinit-initscripts'
'sysvinit-tools')
diff --cc source/devel-extra/python-3.0/FrugalBuild
index aa2bb73,8e45720..dfab290
--- a/source/devel-extra/python-3.0/FrugalBuild
+++ b/source/devel-extra/python-3.0/FrugalBuild
@@@ -4,12 -4,12 +4,12 @@@
USE_GUI=${USE_GUI:-"y"}
pkgname=python-3.0
- pkgver=3.1.3
- shortpkgver=3.1 # 2.3 if $pkgver=2.3.4
- pkgrel=2
+ pkgver=3.2
+ shortpkgver=3.2 # 2.3 if $pkgver=2.3.4
+ pkgrel=1
pkgdesc="A high-level scripting language"
url="http://www.python.org";
-depends=('glibc>=2.8-3' 'bzip2>=1.0.5-2' 'gdbm>=1.8.3-5' 'openssl>=1.0.0'
'glib2>=2.16.4-2')
+depends=('libxml2>=2.7.8' 'glibc>=2.8-3' 'bzip2>=1.0.5-2' 'gdbm>=1.8.3-5'
'openssl>=1.0.0' 'glib2>=2.16.4-2')
makedepends=('sqlite3')
Fuse $USE_GUI && makedepends=(${makedepends[@]} 'tk>=8.5' 'gtk+2')
groups=('devel-extra')
diff --cc source/gnome/gdm/FrugalBuild
index 1053bbe,ebda67c..e74996c
--- a/source/gnome/gdm/FrugalBuild
+++ b/source/gnome/gdm/FrugalBuild
@@@ -7,14 -7,15 +7,15 @@@ pkgrel=
pkgdesc="GNOME Display Manager"
url="http://www.gnome.org/";
backup=(etc/gdm/custom.conf etc/pam.d/gdm etc/pam.d/gdm-autologin)
-depends=('zenity>=2.32.0' 'libgnomeui>=2.24.3' 'libxi' 'fontconfig'
'libxrandr>=1.2.2' \
- 'librsvg>=2.26.0-2' 'gnome-keyring>=2.32.0' 'consolekit-x11>=0.3.0-3'
'libcanberra-gtk' \
- 'libxinerama' 'libxcursor' 'libxevie' 'xorg-server>=1.6.1'
'gnome-applets' \
- 'pam')
+depends=('libxml2>=2.7.8' 'zenity>=2.91.0' 'libxi' 'fontconfig'
'libxrandr>=1.2.2' \
+ 'librsvg>=2.26.0-2' 'gnome-keyring>=2.91.0' 'consolekit-x11>=0.3.0-3'
'libcanberra-gtk' \
+ 'libxinerama' 'libxcursor' 'libxevie' 'xorg-server>=1.6.1' \
+ 'pam' 'accountsservice' 'upower')
rodepends=('xsm' 'sessreg' 'xmessage')
makedepends=('intltool' 'gnome-doc-utils')
-groups=('gnome' 'gnome-minimal')
+groups=('gnome')
archs=('i686' 'x86_64' 'ppc')
+ options=('force')
Finclude gnome
source=(${source[@]} \
polkit-gnome-authentication-agent-1.desktop)
diff --cc source/xapps/firefox/FrugalBuild
index 2c66b99,cab89fa..0912e12
--- a/source/xapps/firefox/FrugalBuild
+++ b/source/xapps/firefox/FrugalBuild
@@@ -3,12 -3,12 +3,12 @@@
# Contributor: VMiklos <vmik...@frugalware.org>
pkgname=firefox
- pkgver=3.6.13
+ pkgver=3.6.14
pathver=${pkgver} # version used in path names
-pkgrel=1
+pkgrel=2
pkgdesc="Mozilla Firefox web browser"
url="http://www.mozilla.org/products/firefox/";
-depends=('gtk+2>=2.20.0-2' 'libidl' 'desktop-file-utils' 'nss>=3.12'
'glibc>=2.6' 'dbus-glib' 'curl>=7.19.0' 'nspr>=4.8.6' \
+depends=('libxml2>=2.7.8' 'gtk+2>=2.20.0-2' 'libidl' 'desktop-file-utils'
'nss>=3.12' 'glibc>=2.6' 'dbus-glib' 'curl>=7.19.0' 'nspr>=4.8.6' \
'lcms' 'libxau>=1.0.4' 'libxdmcp' 'libxft>=2.1.13-2' 'libxt' 'libstdc++'
'libxdamage' 'libice' 'bzip2' 'alsa-lib' \
'libnotify' 'wireless_tools')
makedepends=('zip')
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
