[arch-commits] Commit in systemd/trunk (PKGBUILD locale.sh)

[Tom Gundersen]

    Date: Monday, August 27, 2012 @ 16:27:44
  Author: tomegun
Revision: 165636

upgpkg: systemd 189-3

kill locale.sh, as it is now in filesystem

Modified:
  systemd/trunk/PKGBUILD
Deleted:
  systemd/trunk/locale.sh

-----------+
 PKGBUILD  |    8 ++------
 locale.sh |   60 ------------------------------------------------------------
 2 files changed, 2 insertions(+), 66 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-27 20:17:08 UTC (rev 165635)
+++ PKGBUILD	2012-08-27 20:27:44 UTC (rev 165636)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
 pkgver=189
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -16,14 +16,12 @@
         'initcpio-hook-udev'
         'initcpio-install-udev'
         'initcpio-install-timestamp'
-        'locale.sh'
         '0001-Reinstate-TIMEOUT-handling.patch'
         'use-split-usr-path.patch')
 md5sums=('ac2eb313f5dce79622f60aac56bca66d'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          '59e91c4d7a69b7bf12c86a9982e37ced'
          'df69615503ad293c9ddf9d8b7755282d'
-         'f15956945052bb911e5df81cf5e7e5dc'
          '5543be25f205f853a21fa5ee68e03f0d'
          '482dba45a783f06c2239f1355f4ce72f')
 
@@ -132,7 +130,7 @@
 
 package_systemd-sysvcompat() {
   pkgdesc="sysvinit compat for systemd"
-  conflicts=('sysvinit' 'initscripts')
+  conflicts=('sysvinit')
 
   mv "$srcdir/_sysvcompat"/* "$pkgdir"
 
@@ -142,8 +140,6 @@
   done
 
   ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init"
-
-  install -Dm755 "$srcdir/locale.sh" "$pkgdir/etc/profile.d/locale.sh"
 }
 
 # vim: ft=sh syn=sh et

Deleted: locale.sh
===================================================================
--- locale.sh	2012-08-27 20:17:08 UTC (rev 165635)
+++ locale.sh	2012-08-27 20:27:44 UTC (rev 165636)
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-if [ ! -r /etc/locale.conf ]; then
-  return
-fi
-
-. /etc/locale.conf
-
-if [ "${LANG+x}" = 'x' ]; then
-  export LANG
-fi
-
-if [ "${LC_CTYPE+x}" = 'x' ]; then
-  export LC_CTYPE
-fi
-
-if [ "${LC_NUMERIC+x}" = 'x' ]; then
-  export LC_NUMERIC
-fi
-
-if [ "${LC_TIME+x}" = 'x' ]; then
-  export LC_TIME
-fi
-
-if [ "${LC_COLLATE+x}" = 'x' ]; then
-  export LC_COLLATE
-fi
-
-if [ "${LC_MONETARY+x}" = 'x' ]; then
-  export LC_MONETARY
-fi
-
-if [ "${LC_MESSAGES+x}" = 'x' ]; then
-  export LC_MESSAGES
-fi
-
-if [ "${LC_PAPER+x}" = 'x' ]; then
-  export LC_PAPER
-fi
-
-if [ "${LC_NAME+x}" = 'x' ]; then
-  export LC_NAME
-fi
-
-if [ "${LC_ADDRESS+x}" = 'x' ]; then
-  export LC_ADDRESS
-fi
-
-if [ "${LC_TELEPHONE+x}" = 'x' ]; then
-  export LC_TELEPHONE
-fi
-
-if [ "${LC_MEASUREMENT+x}" = 'x' ]; then
-  export LC_MEASUREMENT
-fi
-
-if [ "${LC_IDENTIFICATION+x}" = 'x' ]; then
-  export LC_IDENTIFICATION
-fi
-