[arch-commits] Commit in xchat-gnome/repos (3 files)

[Allan McRae]

    Date: Tuesday, February 3, 2009 @ 06:35:18
  Author: allan
Revision: 26168

fix svn conflict

Modified:
  xchat-gnome/repos/extra-x86_64/	(properties)
  xchat-gnome/repos/extra-x86_64/PKGBUILD
Deleted:
  xchat-gnome/repos/extra-x86_64/it.po.patch

-------------+
 PKGBUILD    |   34 ++++++++++++++++++----------------
 it.po.patch |   22 ----------------------
 2 files changed, 18 insertions(+), 38 deletions(-)


Property changes on: xchat-gnome/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xchat-gnome/trunk:1
   + /xchat-gnome/trunk:1-26167

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-02-03 11:19:31 UTC (rev 26167)
+++ extra-x86_64/PKGBUILD	2009-02-03 11:35:18 UTC (rev 26168)
@@ -1,27 +1,29 @@
 # $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
 pkgname=xchat-gnome
-pkgver=0.18
-pkgrel=2
+pkgver=0.24.3.1
+pkgrel=1
 pkgdesc="GNOME frontend to the popular X-Chat IRC client."
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://xchat-gnome.navi.cx/"
 depends=('libgnomeui>=2.18.1-2' 'libsexy>=0.1.11' 'gconf>=2.18.0.1-4'
-         'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('gettext' 'perlxml' 'python' 'tcl' 'libnotify' 'gnome-doc-utils>=0.10.3')
+         'hicolor-icon-theme' 'desktop-file-utils' 'libcanberra')
+makedepends=('gettext' 'perlxml' 'python' 'tcl' 'libnotify' 'gnome-doc-utils>=0.10.3'
+             'intltool' 'pkgconfig')
+optdepends=('libnotify: notifications'
+            'python: plugin'
+            'tcl: plugin')
 install=xchat-gnome.install
-source=(http://releases.navi.cx/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-	tcl-plugin.patch it.po.patch)
-md5sums=('4976cd34a0e9115c800b5d317e121182'
-         'accd91263965d9202b356a9fa53d733e'
-         '89a041a01f7039440b0af1c013945d4c')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.24/${pkgname}-${pkgver}.tar.gz)
+md5sums=('e17126262a718c91258b14d2559b0fa9')
 options=('!libtool')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ../tcl-plugin.patch || return 1
-  patch -Np0 -i ../it.po.patch || return 1
+  #patch -Np1 -i ../tcl-plugin.patch || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
@@ -30,8 +32,8 @@
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
   
-  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas \
-    ${startdir}/pkg/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  mkdir -p $pkgdir/usr/share/gconf/schemas
+  gconf-merge-schema $pkgdir/usr/share/gconf/schemas/${pkgname}.schemas \
+    $pkgdir/etc/gconf/schemas/*.schemas
+  rm -f $pkgdir/etc/gconf/schemas/*.schemas
 }

Deleted: extra-x86_64/it.po.patch
===================================================================
--- extra-x86_64/it.po.patch	2009-02-03 11:19:31 UTC (rev 26167)
+++ extra-x86_64/it.po.patch	2009-02-03 11:35:18 UTC (rev 26168)
@@ -1,22 +0,0 @@
-Index: it.po
-===================================================================
---- po/it.po	(revisione 2588)
-+++ po/it.po	(copia locale)
-@@ -12,7 +12,7 @@
- "Project-Id-Version: xchat-gnome\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2007-05-16 00:00+0200\n"
--"PO-Revision-Date: 2007-04-29 10:36+0200\n"
-+"PO-Revision-Date: 2007-10-29 18:42+0100\n"
- "Last-Translator: Milo Casagrande <milo_casagrande at yahoo.it>\n"
- "Language-Team: Italian <tp at lists.linux.it>\n"
- "MIME-Version: 1.0\n"
-@@ -2233,7 +2233,7 @@
- 
- #: ../src/common/textevents.h:273
- msgid "-%C10-%C11-%O$tNotify list is empty."
--msgstr "-%C10-%C11-%O$L'elenco di notifica è vuoto."
-+msgstr "-%C10-%C11-%O$tL'elenco di notifica è vuoto."
- 
- #: ../src/common/textevents.h:276
- msgid "%C24,18 %B  Notify List                           "