[arch-commits] Commit in calibre/trunk (PKGBUILD desktop_integration.patch)

[Giovanni Scafora]

    Date: Sunday, March 3, 2013 @ 15:19:19
  Author: giovanni
Revision: 85582

upgpkg: calibre 0.9.21-2

improved desktop_integration patch

Modified:
  calibre/trunk/PKGBUILD
  calibre/trunk/desktop_integration.patch

---------------------------+
 PKGBUILD                  |    4 ++--
 desktop_integration.patch |   12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-03 11:25:38 UTC (rev 85581)
+++ PKGBUILD	2013-03-03 14:19:19 UTC (rev 85582)
@@ -5,7 +5,7 @@
 
 pkgname=calibre
 pkgver=0.9.21
-pkgrel=1
+pkgrel=2
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
 url="http://calibre-ebook.com/"
@@ -23,7 +23,7 @@
         'desktop_integration.patch'
         'calibre-mount-helper')
 md5sums=('ee0e2d2dc735efcc573d1f77d64acf7e'
-         '42c07b43d575b5e7e7524bd7b9528f0e'
+         '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
 
 build() {

Modified: desktop_integration.patch
===================================================================
--- desktop_integration.patch	2013-03-03 11:25:38 UTC (rev 85581)
+++ desktop_integration.patch	2013-03-03 14:19:19 UTC (rev 85582)
@@ -1,6 +1,6 @@
---- a/src/calibre/linux.py	2012-09-21 06:56:20.000000000 +0200
-+++ b/src/calibre/linux.py	2012-09-22 18:51:12.000000000 +0200
-@@ -179,19 +179,6 @@
+--- a/src/calibre/linux.py	2013-03-01 05:49:28.000000000 +0100
++++ b/src/calibre/linux.py	2013-03-03 14:53:05.000000000 +0100
+@@ -447,19 +447,6 @@
              self.setup_completion()
          if islinux or isbsd:
              self.setup_desktop_integration()
@@ -20,7 +20,7 @@
          if warn is None and self.warnings:
              self.info('There were %d warnings'%len(self.warnings))
              for args, kwargs in self.warnings:
-@@ -237,7 +224,7 @@
+@@ -508,7 +495,7 @@
                  if isnetbsd:
                      f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
                  else:
@@ -28,8 +28,8 @@
 +                    f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre')
              if not os.path.exists(os.path.dirname(f)):
                  os.makedirs(os.path.dirname(f))
-             self.manifest.append(f)
-@@ -357,63 +344,39 @@
+             if zsh.dest:
+@@ -651,63 +638,39 @@
  
              with TemporaryDirectory() as tdir, CurrentDir(tdir), \
                                  PreserveMIMEDefaults():