[arch-commits] Commit in dvdisaster/trunk (3 files)

[Eric Bélanger]

    Date: Thursday, September 12, 2013 @ 05:38:01
  Author: eric
Revision: 97060

upgpkg: dvdisaster 0.72.4-2

Switch to upstream desktop file (close FS#36893), Add more icons

Added:
  dvdisaster/trunk/dvdisaster.install
Modified:
  dvdisaster/trunk/PKGBUILD
Deleted:
  dvdisaster/trunk/dvdisaster.desktop

--------------------+
 PKGBUILD           |   26 ++++++++++++++++----------
 dvdisaster.desktop |   10 ----------
 dvdisaster.install |   11 +++++++++++
 3 files changed, 27 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-12 00:34:19 UTC (rev 97059)
+++ PKGBUILD	2013-09-12 03:38:01 UTC (rev 97060)
@@ -3,19 +3,25 @@
 
 pkgname=dvdisaster
 pkgver=0.72.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides a margin of safety against data loss on CD and DVD media caused by aging or scratches"
 arch=('i686' 'x86_64')
 url="http://www.dvdisaster.com/"
 license=('GPL')
-depends=('gtk2')
+depends=('gtk2' 'hicolor-icon-theme')
 options=('!makeflags')
-source=(http://dvdisaster.net/downloads/${pkgname}-${pkgver}.tar.bz2 dvdisaster.desktop)
+install=dvdisaster.install
+source=(http://dvdisaster.net/downloads/${pkgname}-${pkgver}.tar.bz2{,.gpg})
 sha1sums=('2b47fb5a5535d90641f24a599cd8ae8ffd86b972'
-          'a802dfcee3aa35bdc4b0b5ecabcf32760cd8b992')
+          'SKIP')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed -i 's/dvdisaster48/dvdisaster/' contrib/dvdisaster.desktop
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
     --mandir=/usr/share/man --docdir=/usr/share/doc \
     --localedir=/usr/share/locale \
@@ -24,12 +30,12 @@
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
   make BUILDROOT="${pkgdir}" install
   rm -f "${pkgdir}/usr/bin/dvdisaster-uninstall.sh"
-  install -D -m 644 "${srcdir}/dvdisaster.desktop" \
-    "${pkgdir}/usr/share/applications/dvdisaster.desktop"
-  install -D -m 644 icons/create.png \
-    "${pkgdir}/usr/share/pixmaps/dvdisaster.png"
+  install -D -m 644 contrib/dvdisaster.desktop "${pkgdir}/usr/share/applications/dvdisaster.desktop"
+  for i in 16 24 32 48 64 ; do
+    install -D -m 644 contrib/dvdisaster${i}.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/dvdisaster.png"
+  done
 }

Deleted: dvdisaster.desktop
===================================================================
--- dvdisaster.desktop	2013-09-12 00:34:19 UTC (rev 97059)
+++ dvdisaster.desktop	2013-09-12 03:38:01 UTC (rev 97060)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=dvdisaster
-GenericName=DVD Recovery Tool
-Icon=dvdisaster
-Name=dvdisaster
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=AudioVideo;GTK;

Added: dvdisaster.install
===================================================================
--- dvdisaster.install	                        (rev 0)
+++ dvdisaster.install	2013-09-12 03:38:01 UTC (rev 97060)
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}