← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/alarm-clock/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/fix-desktop-file.patch

  • Committer: Bazaar Package Importer
  • Author(s): Salvatore Bonaccorso
  • Date: 2011-04-15 21:46:44 UTC
  • mfrom: (9.2.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110415214644-vi64gophx7ml4r8i
Tags: 1.2.5-1.1
http://bugs.debian.org/595775
https://launchpad.net/bugs/502871
https://launchpad.net/bugs/626184
http://bugs.debian.org/614440
http://bugs.debian.org/622907
* Non-maintainer upload.
* debian/patches/fix-desktop-file.patch:
  + remove MIME type declaration to avoid alarm-clock associating with 
    text files (LP: #502871), (Closes: #595775).
* debian/patches/fix-FTBFS-with-gcc-4.5.patch:
  + comment out unused "alarm" variable in src/alarm_runner.h which clashes
    with the alarm() function declared in unistd.h (LP: #626184),
    (Closes: #614440).
* debian/control: Correct Homepage field (Closes: #622907).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-desktop-file.patch
 
1
Description: fix desktop file type association
 
2
Origin: vendor
 
3
Bug-Debian: http://bugs.debian.org/595775
 
4
Bug-Ubuntu: https://launchpad.net/bugs/502871
 
5
Forwarded: no
1
6
Author: Bhavani Shankar <bhavi@ubuntu.com>
2
 
Bug-Ubuntu: https://launchpad.net/bugs/502871
3
 
Bug-Debian: http://bugs.debian.org/595775
4
 
Description: fix desktop file type association 
 
7
Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
 
8
Last-Update: 2011-04-15
5
9
 
6
 
Index: alarm-clock-1.2.5/alarm-clock.desktop
7
 
===============================================
8
 
--- alarm-clock-1.2.5.orig/alarm-clock.desktop
9
 
+++ alarm-clock-1.2.5/alarm-clock.desktop
 
10
--- a/alarm-clock.desktop
 
11
+++ b/alarm-clock.desktop
10
12
@@ -18,5 +18,4 @@
11
13
 Categories=GNOME;GTK;Utility;
12
14
 Icon=alarm-clock
13
15
 StartupNotify=false
14
16
-MimeType=text/plain;
15
17
 OnlyShowIn=GNOME;
16