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

[Jan de Groot]

    Date: Sunday, April 20, 2008 @ 09:06:11
  Author: jgc
Revision: 524

Merged revisions 2-523 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/evince/trunk

........
  r169 | jgc | 2008-04-12 14:09:20 +0000 (Sat, 12 Apr 2008) | 1 line
  
  upgpkg: evince 2.22.1.1-1
........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........

Modified:
  evince/repos/extra-i686/	(properties)
  evince/repos/extra-i686/PKGBUILD
Deleted:
  evince/repos/extra-i686/evince-no-gnomeprint.patch

----------------------------+
 PKGBUILD                   |    8 +++---
 evince-no-gnomeprint.patch |   54 -------------------------------------------
 2 files changed, 4 insertions(+), 58 deletions(-)


Property changes on: evince/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /evince/trunk:1
   + /evince/trunk:1-523

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-04-20 13:02:08 UTC (rev 523)
+++ extra-i686/PKGBUILD	2008-04-20 13:06:11 UTC (rev 524)
@@ -2,20 +2,20 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=evince
-pkgver=2.22.0
+pkgver=2.22.1.1
 pkgrel=1
 pkgdesc="Simply a document viewer"
 url="http://www.gnome.org"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('ghostscript' 'poppler-glib>=0.6.3' 'libdjvu>=3.5.20' 'gnome-icon-theme>=2.22.0' 't1lib' 'libglade>=2.6.2' 'gnome-keyring>=2.22.0')
-makedepends=('perlxml' 'gnome-doc-utils>=0.12.2' 'nautilus>=2.22.0' 'pkgconfig' 'tetex')
+depends=('ghostscript' 'poppler-glib>=0.8.0' 'libdjvu>=3.5.20' 'gnome-icon-theme>=2.22.0' 't1lib' 'libglade>=2.6.2' 'gnome-keyring>=2.22.1')
+makedepends=('perlxml' 'gnome-doc-utils>=0.12.2' 'nautilus>=2.22.2' 'pkgconfig' 'tetex')
 install=evince.install
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.22/${pkgname}-${pkgver}.tar.bz2)
 replaces=('gpdf')
 groups=('gnome-extra')
-md5sums=('9fc7eb5757549626b7515b853a5f6b97')
+md5sums=('568ff7211a185d71d0e9de15a07f4987')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}

Deleted: extra-i686/evince-no-gnomeprint.patch
===================================================================
--- extra-i686/evince-no-gnomeprint.patch	2008-04-20 13:02:08 UTC (rev 523)
+++ extra-i686/evince-no-gnomeprint.patch	2008-04-20 13:06:11 UTC (rev 524)
@@ -1,54 +0,0 @@
---- configure.ac.orig	2007-07-07 12:05:37.000000000 +0000
-+++ configure.ac	2007-07-07 12:12:35.000000000 +0000
-@@ -71,36 +71,18 @@
- 	    PRINT=$withval,
-             PRINT="auto")
- 
--PKG_CHECK_MODULES(GNOME_PRINT, 
--		  libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED,
--		  enable_gnome_print=yes, enable_gnome_print=no)
- PKG_CHECK_MODULES(GTK_PRINT,
- 		  gtk+-unix-print-2.0 >= $GTK_PRINT_REQUIRED,
- 		  enable_gtk_print=yes, enable_gtk_print=no)
- enable_print=no
--if test x$PRINT = xgnome -a x$enable_gnome_print = xyes; then
--   enable_print=gnome
-+if test x$PRINT = xgtk -a x$enable_gtk_print = xyes; then
-+  enable_print=gtk
- else
--   if test x$PRINT = xgtk -a x$enable_gtk_print = xyes; then
-+  if test x$PRINT = xauto; then
-+    if test x$enable_gtk_print = xyes; then
-       enable_print=gtk
--   else
--      if test x$PRINT = xauto; then
--	 if test x$enable_gtk_print = xyes; then
--	    enable_print=gtk
--	 else
--	    if test x$enable_gnome_print = xyes; then
--	       enable_print=gnome
--	    fi
--	 fi
--      fi
--   fi
--fi
--
--if test x$enable_print = xgnome; then
--   AC_SUBST(GNOME_PRINT_CFLAGS)
--   AC_SUBST(GNOME_PRINT_LIBS)
--   AC_DEFINE([WITH_GNOME_PRINT],[1],[Enable GNOME Print Support.])
--   AC_DEFINE([WITH_PRINT],[1],[Enable Print Support.])
-+    fi
-+  fi
- fi
- 
- if test x$enable_print = xgtk; then   
-@@ -109,7 +91,7 @@
-    AC_DEFINE([WITH_GTK_PRINT],[1],[Enable GTK Print Support.])
-    AC_DEFINE([WITH_PRINT],[1],[Enable Print Support.])
- fi
--   
-+ 
- AM_CONDITIONAL(WITH_GNOME_PRINT, test x$enable_print = xgnome)
- AM_CONDITIONAL(WITH_GTK_PRINT, test x$enable_print = xgtk)
-