From 4064f8cdc65469d5003709524765783874edee61 Mon Sep 17 00:00:00 2001 From: tnut Date: Fri, 12 Feb 2010 13:58:38 +0100 Subject: kde, maj des dépendances MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kde/kde/Pkgfile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'kde') diff --git a/kde/kde/Pkgfile b/kde/kde/Pkgfile index 137461c9d..120911c19 100755 --- a/kde/kde/Pkgfile +++ b/kde/kde/Pkgfile @@ -2,15 +2,7 @@ # 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 +# Depends on: curl, xorg, kdelibs, kdepimlibs, kdeadmin, kdegraphics, kdemultimedia, kdeutils, kdenetwork, kde-l10n-fr, kdebase, kdepim, kdepim-runtime, kdeplasma-addons, kdetoys, phonon, desktop-file-utils, shared-mime-info, nas, atk, xine-lib, taglib, qimageblitz, pilot-link, gnokii, libical, akonadi, gpgme, boost, lcms, oxygen-icons, soprano, strigi, eigen, eigen, libspectre name=kde version=4.4.0 -- cgit v1.2.3-70-g09d2