diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-05-07 22:31:25 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-05-07 22:31:25 -0300 |
| commit | 9f7fb9c12e84f20cd108b933f1a51e216f76cd98 (patch) | |
| tree | 06520d9024b40745b94f02d0d3419386e6496863 /libre/calibre-libre/desktop_integration.patch | |
| parent | 6cc893589a6bd208f2b7711f985e17df7a6df816 (diff) | |
| parent | a86ff663185661ee304bb1f6d00d982102dd706d (diff) | |
Merge branch 'master' of gparabola:abslibre-mips64el
Diffstat (limited to 'libre/calibre-libre/desktop_integration.patch')
| -rw-r--r-- | libre/calibre-libre/desktop_integration.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch index 4c756f5d4..2c6f07672 100644 --- a/libre/calibre-libre/desktop_integration.patch +++ b/libre/calibre-libre/desktop_integration.patch @@ -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(): |