[arch-commits] Commit in libcanberra/repos (12 files)

Jan Steffens heftig at archlinux.org
Sat Oct 1 09:46:12 EDT 2011


    Date: Saturday, October 1, 2011 @ 09:46:12
  Author: heftig
Revision: 139194

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  libcanberra/repos/extra-i686/PKGBUILD
    (from rev 139193, libcanberra/trunk/PKGBUILD)
  libcanberra/repos/extra-i686/libcanberra.install
    (from rev 139193, libcanberra/trunk/libcanberra.install)
  libcanberra/repos/extra-i686/libcanberra.xinit
    (from rev 139193, libcanberra/trunk/libcanberra.xinit)
  libcanberra/repos/extra-x86_64/PKGBUILD
    (from rev 139193, libcanberra/trunk/PKGBUILD)
  libcanberra/repos/extra-x86_64/libcanberra.install
    (from rev 139193, libcanberra/trunk/libcanberra.install)
  libcanberra/repos/extra-x86_64/libcanberra.xinit
    (from rev 139193, libcanberra/trunk/libcanberra.xinit)
Deleted:
  libcanberra/repos/extra-i686/PKGBUILD
  libcanberra/repos/extra-i686/libcanberra-gtk-module.sh
  libcanberra/repos/extra-i686/libcanberra.install
  libcanberra/repos/extra-x86_64/PKGBUILD
  libcanberra/repos/extra-x86_64/libcanberra-gtk-module.sh
  libcanberra/repos/extra-x86_64/libcanberra.install

----------------------------------------+
 extra-i686/PKGBUILD                    |  140 +++++++++++++++----------------
 extra-i686/libcanberra-gtk-module.sh   |   15 ---
 extra-i686/libcanberra.install         |   46 +++++-----
 extra-i686/libcanberra.xinit           |   17 +++
 extra-x86_64/PKGBUILD                  |  140 +++++++++++++++----------------
 extra-x86_64/libcanberra-gtk-module.sh |   15 ---
 extra-x86_64/libcanberra.install       |   46 +++++-----
 extra-x86_64/libcanberra.xinit         |   17 +++
 8 files changed, 220 insertions(+), 216 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-10-01 13:43:09 UTC (rev 139193)
+++ extra-i686/PKGBUILD	2011-10-01 13:46:12 UTC (rev 139194)
@@ -1,70 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=libcanberra
-pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
-pkgver=0.28
-pkgrel=1
-pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('libvorbis' 'libtool' 'alsa-lib' 'tdb')
-makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3')
-options=(!emptydirs)
-url=http://0pointer.de/lennart/projects/libcanberra
-source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz
-        libcanberra-gtk-module.sh)
-md5sums=('c198b4811598c4c161ff505e4531b02c'
-         '21141257a1be80f3bc329829ff13b314')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
-      --disable-static --with-builtin=dso --enable-null --disable-oss \
-      --enable-alsa --enable-gstreamer --enable-pulse \
-      --with-systemdsystemunitdir=/lib/systemd/system
-  make
-}
-
-package_libcanberra() {
-  install=libcanberra.install
-  optdepends=("$pkgbase-pulse: PulseAudio driver"
-              "$pkgbase-gstreamer: GStreamer driver")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -j1 DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}"/usr/lib/libcanberra-gtk*.la
-  rm -f "${pkgdir}"/usr/lib/gtk-{2,3}.0/modules/*.la
-  
-  install -d "${pkgdir}/usr/share/gconf" 
-  mv "${pkgdir}/etc/gconf/schemas" "${pkgdir}/usr/share/gconf/"
-
-  install -D "${srcdir}/libcanberra-gtk-module.sh" \
-    "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module"
-
-  # Split plugins
-  for _p in pulse gstreamer; do
-    mkdir $_p-plugin
-    mv "${pkgdir}"/usr/lib/${pkgbase}-${pkgver}/${pkgbase}-$_p.* $_p-plugin
-  done
-}
-
-package_libcanberra-pulse() {
-  pkgdesc="PulseAudio plugin for libcanberra"
-  depends=("$pkgbase=$pkgver-$pkgrel" 'libpulse')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
-  mv pulse-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" 
-}
-
-package_libcanberra-gstreamer() {
-  pkgdesc="GStreamer plugin for libcanberra"
-  depends=("$pkgbase=$pkgver-$pkgrel" 'gstreamer0.10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
-  mv gstreamer-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" 
-}

Copied: libcanberra/repos/extra-i686/PKGBUILD (from rev 139193, libcanberra/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-10-01 13:46:12 UTC (rev 139194)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=libcanberra
+pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
+pkgver=0.28
+pkgrel=2
+pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification"
+arch=(i686 x86_64)
+license=('LGPL')
+depends=('libvorbis' 'libtool' 'alsa-lib' 'tdb')
+makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3')
+options=(!emptydirs)
+url=http://0pointer.de/lennart/projects/libcanberra
+source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz
+        libcanberra.xinit)
+sha256sums=('eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c'
+            '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3')
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
+      --disable-static --with-builtin=dso --enable-null --disable-oss \
+      --enable-alsa --enable-gstreamer --enable-pulse \
+      --with-systemdsystemunitdir=/lib/systemd/system
+  make
+}
+
+package_libcanberra() {
+  install=libcanberra.install
+  optdepends=("$pkgbase-pulse: PulseAudio driver"
+              "$pkgbase-gstreamer: GStreamer driver")
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make -j1 DESTDIR="${pkgdir}" install
+  rm -f "${pkgdir}"/usr/lib/libcanberra-gtk*.la
+  rm -f "${pkgdir}"/usr/lib/gtk-{2,3}.0/modules/*.la
+  
+  install -d "${pkgdir}/usr/share/gconf" 
+  mv "${pkgdir}/etc/gconf/schemas" "${pkgdir}/usr/share/gconf/"
+
+  install -D "${srcdir}/libcanberra.xinit" \
+    "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module"
+
+  # Split plugins
+  for _p in pulse gstreamer; do
+    mkdir $_p-plugin
+    mv "${pkgdir}"/usr/lib/${pkgbase}-${pkgver}/${pkgbase}-$_p.* $_p-plugin
+  done
+}
+
+package_libcanberra-pulse() {
+  pkgdesc="PulseAudio plugin for libcanberra"
+  depends=("$pkgbase=$pkgver-$pkgrel" 'libpulse')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
+  mv pulse-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" 
+}
+
+package_libcanberra-gstreamer() {
+  pkgdesc="GStreamer plugin for libcanberra"
+  depends=("$pkgbase=$pkgver-$pkgrel" 'gstreamer0.10')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
+  mv gstreamer-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" 
+}

Deleted: extra-i686/libcanberra-gtk-module.sh
===================================================================
--- extra-i686/libcanberra-gtk-module.sh	2011-10-01 13:43:09 UTC (rev 139193)
+++ extra-i686/libcanberra-gtk-module.sh	2011-10-01 13:46:12 UTC (rev 139194)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case "$SESSION" in
-  GNOME)
-    # Done by gnome-settings-daemon
-    ;;
-  *)
-    if [ -z "$GTK_MODULES" ]; then
-      GTK_MODULES="canberra-gtk-module"
-    else
-      GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
-    fi
-    export GTK_MODULES
-    ;;
-esac

Deleted: extra-i686/libcanberra.install
===================================================================
--- extra-i686/libcanberra.install	2011-10-01 13:43:09 UTC (rev 139193)
+++ extra-i686/libcanberra.install	2011-10-01 13:46:12 UTC (rev 139194)
@@ -1,23 +0,0 @@
-pkgname=libcanberra
-
-post_install() {
-  if [ -x usr/sbin/gconfpkg ]; then
-    usr/sbin/gconfpkg --install ${pkgname}
-  fi
-}
-
-pre_upgrade() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    pre_remove
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  if [ -x usr/sbin/gconfpkg ]; then
-    usr/sbin/gconfpkg --uninstall ${pkgname}
-  fi
-}

Copied: libcanberra/repos/extra-i686/libcanberra.install (from rev 139193, libcanberra/trunk/libcanberra.install)
===================================================================
--- extra-i686/libcanberra.install	                        (rev 0)
+++ extra-i686/libcanberra.install	2011-10-01 13:46:12 UTC (rev 139194)
@@ -0,0 +1,23 @@
+pkgname=libcanberra
+
+post_install() {
+  if [ -x usr/sbin/gconfpkg ]; then
+    usr/sbin/gconfpkg --install ${pkgname}
+  fi
+}
+
+pre_upgrade() {
+  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+    pre_remove
+  fi
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  if [ -x usr/sbin/gconfpkg ]; then
+    usr/sbin/gconfpkg --uninstall ${pkgname}
+  fi
+}

Copied: libcanberra/repos/extra-i686/libcanberra.xinit (from rev 139193, libcanberra/trunk/libcanberra.xinit)
===================================================================
--- extra-i686/libcanberra.xinit	                        (rev 0)
+++ extra-i686/libcanberra.xinit	2011-10-01 13:46:12 UTC (rev 139194)
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+case "$DESKTOP_SESSION" in
+  gnome) # Done by gnome-settings-daemon
+  ;;
+  *)
+    # Extra check in case DESKTOP_SESSION is not set correctly
+    if [[ -z $GNOME_DESKTOP_SESSION_ID ]]; then
+      if [[ -z $GTK_MODULES ]]; then
+        GTK_MODULES="canberra-gtk-module"
+      else
+        GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
+      fi
+      export GTK_MODULES
+    fi
+  ;;
+esac

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-10-01 13:43:09 UTC (rev 139193)
+++ extra-x86_64/PKGBUILD	2011-10-01 13:46:12 UTC (rev 139194)
@@ -1,70 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=libcanberra
-pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
-pkgver=0.28
-pkgrel=1
-pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('libvorbis' 'libtool' 'alsa-lib' 'tdb')
-makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3')
-options=(!emptydirs)
-url=http://0pointer.de/lennart/projects/libcanberra
-source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz
-        libcanberra-gtk-module.sh)
-md5sums=('c198b4811598c4c161ff505e4531b02c'
-         '21141257a1be80f3bc329829ff13b314')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
-      --disable-static --with-builtin=dso --enable-null --disable-oss \
-      --enable-alsa --enable-gstreamer --enable-pulse \
-      --with-systemdsystemunitdir=/lib/systemd/system
-  make
-}
-
-package_libcanberra() {
-  install=libcanberra.install
-  optdepends=("$pkgbase-pulse: PulseAudio driver"
-              "$pkgbase-gstreamer: GStreamer driver")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -j1 DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}"/usr/lib/libcanberra-gtk*.la
-  rm -f "${pkgdir}"/usr/lib/gtk-{2,3}.0/modules/*.la
-  
-  install -d "${pkgdir}/usr/share/gconf" 
-  mv "${pkgdir}/etc/gconf/schemas" "${pkgdir}/usr/share/gconf/"
-
-  install -D "${srcdir}/libcanberra-gtk-module.sh" \
-    "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module"
-
-  # Split plugins
-  for _p in pulse gstreamer; do
-    mkdir $_p-plugin
-    mv "${pkgdir}"/usr/lib/${pkgbase}-${pkgver}/${pkgbase}-$_p.* $_p-plugin
-  done
-}
-
-package_libcanberra-pulse() {
-  pkgdesc="PulseAudio plugin for libcanberra"
-  depends=("$pkgbase=$pkgver-$pkgrel" 'libpulse')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
-  mv pulse-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" 
-}
-
-package_libcanberra-gstreamer() {
-  pkgdesc="GStreamer plugin for libcanberra"
-  depends=("$pkgbase=$pkgver-$pkgrel" 'gstreamer0.10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
-  mv gstreamer-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" 
-}

Copied: libcanberra/repos/extra-x86_64/PKGBUILD (from rev 139193, libcanberra/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2011-10-01 13:46:12 UTC (rev 139194)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=libcanberra
+pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
+pkgver=0.28
+pkgrel=2
+pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification"
+arch=(i686 x86_64)
+license=('LGPL')
+depends=('libvorbis' 'libtool' 'alsa-lib' 'tdb')
+makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3')
+options=(!emptydirs)
+url=http://0pointer.de/lennart/projects/libcanberra
+source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz
+        libcanberra.xinit)
+sha256sums=('eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c'
+            '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3')
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
+      --disable-static --with-builtin=dso --enable-null --disable-oss \
+      --enable-alsa --enable-gstreamer --enable-pulse \
+      --with-systemdsystemunitdir=/lib/systemd/system
+  make
+}
+
+package_libcanberra() {
+  install=libcanberra.install
+  optdepends=("$pkgbase-pulse: PulseAudio driver"
+              "$pkgbase-gstreamer: GStreamer driver")
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make -j1 DESTDIR="${pkgdir}" install
+  rm -f "${pkgdir}"/usr/lib/libcanberra-gtk*.la
+  rm -f "${pkgdir}"/usr/lib/gtk-{2,3}.0/modules/*.la
+  
+  install -d "${pkgdir}/usr/share/gconf" 
+  mv "${pkgdir}/etc/gconf/schemas" "${pkgdir}/usr/share/gconf/"
+
+  install -D "${srcdir}/libcanberra.xinit" \
+    "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module"
+
+  # Split plugins
+  for _p in pulse gstreamer; do
+    mkdir $_p-plugin
+    mv "${pkgdir}"/usr/lib/${pkgbase}-${pkgver}/${pkgbase}-$_p.* $_p-plugin
+  done
+}
+
+package_libcanberra-pulse() {
+  pkgdesc="PulseAudio plugin for libcanberra"
+  depends=("$pkgbase=$pkgver-$pkgrel" 'libpulse')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
+  mv pulse-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" 
+}
+
+package_libcanberra-gstreamer() {
+  pkgdesc="GStreamer plugin for libcanberra"
+  depends=("$pkgbase=$pkgver-$pkgrel" 'gstreamer0.10')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
+  mv gstreamer-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" 
+}

Deleted: extra-x86_64/libcanberra-gtk-module.sh
===================================================================
--- extra-x86_64/libcanberra-gtk-module.sh	2011-10-01 13:43:09 UTC (rev 139193)
+++ extra-x86_64/libcanberra-gtk-module.sh	2011-10-01 13:46:12 UTC (rev 139194)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case "$SESSION" in
-  GNOME)
-    # Done by gnome-settings-daemon
-    ;;
-  *)
-    if [ -z "$GTK_MODULES" ]; then
-      GTK_MODULES="canberra-gtk-module"
-    else
-      GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
-    fi
-    export GTK_MODULES
-    ;;
-esac

Deleted: extra-x86_64/libcanberra.install
===================================================================
--- extra-x86_64/libcanberra.install	2011-10-01 13:43:09 UTC (rev 139193)
+++ extra-x86_64/libcanberra.install	2011-10-01 13:46:12 UTC (rev 139194)
@@ -1,23 +0,0 @@
-pkgname=libcanberra
-
-post_install() {
-  if [ -x usr/sbin/gconfpkg ]; then
-    usr/sbin/gconfpkg --install ${pkgname}
-  fi
-}
-
-pre_upgrade() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    pre_remove
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  if [ -x usr/sbin/gconfpkg ]; then
-    usr/sbin/gconfpkg --uninstall ${pkgname}
-  fi
-}

Copied: libcanberra/repos/extra-x86_64/libcanberra.install (from rev 139193, libcanberra/trunk/libcanberra.install)
===================================================================
--- extra-x86_64/libcanberra.install	                        (rev 0)
+++ extra-x86_64/libcanberra.install	2011-10-01 13:46:12 UTC (rev 139194)
@@ -0,0 +1,23 @@
+pkgname=libcanberra
+
+post_install() {
+  if [ -x usr/sbin/gconfpkg ]; then
+    usr/sbin/gconfpkg --install ${pkgname}
+  fi
+}
+
+pre_upgrade() {
+  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+    pre_remove
+  fi
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  if [ -x usr/sbin/gconfpkg ]; then
+    usr/sbin/gconfpkg --uninstall ${pkgname}
+  fi
+}

Copied: libcanberra/repos/extra-x86_64/libcanberra.xinit (from rev 139193, libcanberra/trunk/libcanberra.xinit)
===================================================================
--- extra-x86_64/libcanberra.xinit	                        (rev 0)
+++ extra-x86_64/libcanberra.xinit	2011-10-01 13:46:12 UTC (rev 139194)
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+case "$DESKTOP_SESSION" in
+  gnome) # Done by gnome-settings-daemon
+  ;;
+  *)
+    # Extra check in case DESKTOP_SESSION is not set correctly
+    if [[ -z $GNOME_DESKTOP_SESSION_ID ]]; then
+      if [[ -z $GTK_MODULES ]]; then
+        GTK_MODULES="canberra-gtk-module"
+      else
+        GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
+      fi
+      export GTK_MODULES
+    fi
+  ;;
+esac



More information about the arch-commits mailing list