[arch-commits] Commit in xournal/repos (4 files)

[Eric Bélanger]

    Date: Saturday, October 31, 2009 @ 06:34:22
  Author: eric
Revision: 57037

Merged revisions 356,57029,57036 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xournal/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r57029 | eric | 2009-10-31 06:17:34 -0400 (Sat, 31 Oct 2009) | 2 lines
  
  upgpkg: xournal 0.4.5-1
      Upstream update, added shared-mime-info and poppler-glib depends, fixed .desktop file (close FS#14443), added .install file for mime and icon cache
........
  r57036 | eric | 2009-10-31 06:34:02 -0400 (Sat, 31 Oct 2009) | 1 line
........

Added:
  xournal/repos/extra-i686/xournal.install
    (from rev 57036, xournal/trunk/xournal.install)
Modified:
  xournal/repos/extra-i686/	(properties)
  xournal/repos/extra-i686/PKGBUILD
Deleted:
  xournal/repos/extra-i686/xournal.desktop

-----------------+
 PKGBUILD        |   32 ++++++++++++--------------------
 xournal.desktop |   11 -----------
 xournal.install |   13 +++++++++++++
 3 files changed, 25 insertions(+), 31 deletions(-)


Property changes on: xournal/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xournal/trunk:1
   + /xournal/trunk:1-57036

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-31 10:34:02 UTC (rev 57036)
+++ extra-i686/PKGBUILD	2009-10-31 10:34:22 UTC (rev 57037)
@@ -3,30 +3,22 @@
 # Maintainer: 
 
 pkgname=xournal
-pkgver=0.4.2.1
+pkgver=0.4.5
 pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
 pkgdesc="Notetaking and sketching application"
+arch=('i686' 'x86_64')
 url="http://math.mit.edu/~auroux/software/xournal/"
-source=(http://math.mit.edu/~auroux/software/xournal/xournal-$pkgver.tar.gz \
-	xournal.desktop)
-depends=('libgnomecanvas' 'libgnomeprintui' 'poppler>=0.6' 'ghostscript')
+license=('GPL')
+depends=('libgnomecanvas' 'libgnomeprintui' 'poppler' 'ghostscript' \
+         'shared-mime-info' 'poppler-glib')
+install=xournal.install
+source=(http://math.mit.edu/~auroux/software/xournal/xournal-${pkgver}.tar.gz)
+md5sums=('795e4396ded2b67766eb2926be1fb4a9')
+sha1sums=('390cb275774469ed1b04b7268dd625bd456c895e')
 
-
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./autogen.sh
-  ./configure --prefix=/usr
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  # install some freedesktop.org compatibility
-  install -D -m644 $startdir/src/$pkgname.desktop \
-  $startdir/pkg/usr/share/applications/$pkgname.desktop
+  make DESTDIR="${pkgdir}" install desktop-install || return 1
 }
-
-
-
-
-md5sums=('b56b1403b68b60a5a27b028d91a38e88'
-         '9842b3979e4cc665bbdf3bc656260d47')

Deleted: extra-i686/xournal.desktop
===================================================================
--- extra-i686/xournal.desktop	2009-10-31 10:34:02 UTC (rev 57036)
+++ extra-i686/xournal.desktop	2009-10-31 10:34:22 UTC (rev 57037)
@@ -1,11 +0,0 @@
-[Desktop Entry] 
-Encoding=UTF-8 
-Name=Xournal Notetaking 
-Comment=Take notes with your stylus 
-Exec=xournal %f 
-Terminal=false 
-Type=Application 
-StartupNotify=true 
-MimeType=application/x-xoj; 
-Icon=/usr/share/xournal/pixmaps/xournal.png 
-Categories=GNOME;GTK;Utility;TextEditor;

Copied: xournal/repos/extra-i686/xournal.install (from rev 57036, xournal/trunk/xournal.install)
===================================================================
--- extra-i686/xournal.install	                        (rev 0)
+++ extra-i686/xournal.install	2009-10-31 10:34:22 UTC (rev 57037)
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}