[arch-commits] Commit in kde-common/repos (5 files)

[Thayer Williams]

    Date: Friday, May 30, 2008 @ 14:23:30
  Author: thayer
Revision: 2284

Merged revisions 2-2283 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/kde-common/trunk

........
  r356 | aaron | 2008-04-18 15:56:27 -0700 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r2282 | thayer | 2008-05-30 09:35:49 -0700 (Fri, 30 May 2008) | 2 lines
  
  upgpkg: kde-common 3.5.9-2
      artwork has been moved to archlinux-themes-kde
........

Modified:
  kde-common/repos/extra-x86_64/	(properties)
  kde-common/repos/extra-x86_64/PKGBUILD
  kde-common/repos/extra-x86_64/kde-defaults.tar
  kde-common/repos/extra-x86_64/kdm.kdmrc
Deleted:
  kde-common/repos/extra-x86_64/kdm.backgroundrc

------------------+
 PKGBUILD         |   51 ++++++++++-----------------------------------------
 kdm.backgroundrc |    3 ---
 kdm.kdmrc        |    2 +-
 3 files changed, 11 insertions(+), 45 deletions(-)


Property changes on: kde-common/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /kde-common/trunk:1
   + /kde-common/trunk:1-2283

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-05-30 16:36:20 UTC (rev 2283)
+++ extra-x86_64/PKGBUILD	2008-05-30 18:23:30 UTC (rev 2284)
@@ -4,26 +4,19 @@
 pkgname=kde-common
 pkgver=3.5.9
 kdever=3.5.9 # if minor is 0, then without .0
-pkgrel=1
-pkgdesc="Artwork and config stuff for KDE"
+pkgrel=2
+pkgdesc="Daemon scripts and misc configs for KDE"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://www.kde.org"
 groups=('kde')
 depends=('bash' 'archlinux-menus')
-backup=('opt/kde/share/apps/kdm/faces/.default.face.icon' \
-	'opt/kde/share/config/kdm/kdmrc' 'opt/kde/share/config/kdm/backgroundrc' \
-	'etc/pam.d/kde-np' 'etc/pam.d/kde')
+backup=('opt/kde/share/config/kdm/kdmrc' 'opt/kde/share/config/kdm/backgroundrc' \
+  'etc/pam.d/kde-np' 'etc/pam.d/kde')
 install=kde-common.install
-source=(kdm etc.pam \
-	ftp://ftp.archlinux.org/other/kde-graphics/arch-default-background.svg \
-	ftp://ftp.archlinux.org/other/kde-graphics/arch-kdeshutdown.png \
-	ftp://ftp.archlinux.org/other/kde-graphics/arch-kdm.png \
-	ftp://ftp.archlinux.org/other/kde-graphics/kde-arch-splash-0.7.2.tar.bz2 \
-	kde-defaults.tar kde.profile kde.tcsh \
-	agent-shutdown.sh agent-startup.sh kdm.kdmrc kdm.backgroundrc kde.pam kde-dbus.conf)
+source=(kdm etc.pam kde-defaults.tar kde.profile kde.tcsh \
+	agent-shutdown.sh agent-startup.sh kdm.kdmrc kde.pam kde-dbus.conf)
 
-
 build() {
   # Add kdm startup script to /etc/rc.d and a pam script
   install -D -m755 -o root -g root $startdir/src/kdm $startdir/pkg/etc/rc.d/kdm
@@ -46,30 +39,9 @@
   install -D -m 644 $startdir/src/kdeglobals 	$startdir/pkg/opt/kde/share/config/kdeglobals
   install -D -m 644 $startdir/src/kdesktoprc 	$startdir/pkg/opt/kde/share/config/kdesktoprc
   install -D -m 644 $startdir/src/konquerorrc 	$startdir/pkg/opt/kde/share/config/konquerorrc
-  # Adding Arch graphics for kde
-  install -D -m 644 $startdir/src/arch-default-background.svg \
-  $startdir/pkg/opt/kde/share/wallpapers/arch-default-background.svg
 
-  install -D -m 644 $startdir/src/arch-kdm.png \
-  $startdir/pkg/opt/kde/share/apps/kdm/faces/.default.face.icon
-
-  install -D -m 644 $startdir/src/arch-kdm.png \
-  $startdir/pkg/opt/kde/share/apps/kdm/pics/users/arch-kdm.png
-
-  install -D -m 644 $startdir/src/arch-kdeshutdown.png \
-  $startdir/pkg/opt/kde/share/apps/ksmserver/pics/shutdownkonq.png
-
-  # Adding arch splash screen
-  cd $startdir/src/kde-arch-splash-0.7.2
-  for i in *.png; do
-  install -D -m 644 $i $startdir/pkg/opt/kde/share/apps/ksplash/Themes/kde-arch-splash-0.7.2/$i
-  done
-  install -D -m 644 Theme.rc $startdir/pkg/opt/kde/share/apps/ksplash/Themes/kde-arch-splash-0.7.2/Theme.rc
-  install -D -m 644 ksplashrc $startdir/pkg/opt/kde/share/config/ksplashrc
-
   # Adding KDM config
   install -D -m 644 $startdir/src/kdm.kdmrc $startdir/pkg/opt/kde/share/config/kdm/kdmrc
-  install -D -m 644 $startdir/src/kdm.backgroundrc $startdir/pkg/opt/kde/share/config/kdm/backgroundrc
 
   # Adding startup/shutdown agents for ssh and gpg-agent
   install -m644 -D $startdir/src/agent-startup.sh $startdir/pkg/opt/kde/env/agent-startup.sh
@@ -85,18 +57,15 @@
   cd ..
   done
 }
+
 md5sums=('31c5c02fc1bdc65dc3d86c9a0c89a48a'
          '39ee0904b253dc5d80d693f1f04cdd8f'
-         '23432d7861d68fa6e0d46e2f1fd71ab6'
-         '2c7e8532ed900d73d47ed439ce2b76a8'
-         '7f8c4745bdc4cc35104ffac76d584f1c'
-         '7326ea4e34aecc4fd602947be16df225'
-         '6f98e9e211c2edf3a7e542c4570bac90'
+         'f18d247f62f331bb85e521f29a6044f2'
          'a6fa157bd78625b8e62d73ff3b037f06'
          '253960d9ebf4f9cb002199b793845e03'
          '18e8d01124b19f7df2937c06e177bf7f'
          'c963ef6e37c9051119972a58c67f05fb'
-         'e36ec25f8d21ce6f22bfb8afddd4094a'
-         'e5f64a946c2c04005cc8148373762b5c'
+         'c3312a87b1dd5bbacf1ba02874c95c67'
          '89128638fc255594830e38e1d60c8e89'
          'd08b320ab4f7508fb8d6b841117fb6fa')
+

Modified: extra-x86_64/kde-defaults.tar
===================================================================
(Binary files differ)

Deleted: extra-x86_64/kdm.backgroundrc
===================================================================
--- extra-x86_64/kdm.backgroundrc	2008-05-30 16:36:20 UTC (rev 2283)
+++ extra-x86_64/kdm.backgroundrc	2008-05-30 18:23:30 UTC (rev 2284)
@@ -1,3 +0,0 @@
-[Desktop0]
-Wallpaper=/opt/kde/share/wallpapers/arch-default-background.svg
-WallpaperMode=Scaled

Modified: extra-x86_64/kdm.kdmrc
===================================================================
--- extra-x86_64/kdm.kdmrc	2008-05-30 16:36:20 UTC (rev 2283)
+++ extra-x86_64/kdm.kdmrc	2008-05-30 18:23:30 UTC (rev 2284)
@@ -46,7 +46,7 @@
 HiddenUsers=root
 Language=
 LogoArea=None
-LogoPixmap=/opt/kde/share/apps/kdm/pics/arch-kdm-logo.png
+LogoPixmap=
 MaxShowUID=65000
 MinShowUID=500
 PreselectUser=None