git » poppler.git » commit 2a761f2

fix file conflict

author Andreas Radke
2011-01-30 14:00:58 UTC
committer Andreas Radke
2011-01-30 14:00:58 UTC
parent 4500d4d0ea47aa57b06557eb43cee7a727e45d38

fix file conflict

PKGBUILD +2 -1

diff --git a/PKGBUILD b/PKGBUILD
index 4ddb846..8393785 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
 pkgver=0.16.2
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 license=('GPL')
 makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms')
@@ -36,6 +36,7 @@ package_poppler() {
   rm -f "${pkgdir}"/usr/lib/libpoppler-{glib,qt4}.so*
   rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc
   rm -rf "${pkgdir}/usr/share/gtk-doc"
+  rm -f "${pkgdir}"/usr/bin/poppler-glib-demo
 }
 
 package_poppler-glib() {