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

« back to all changes in this revision

Viewing changes to debian/patches/fix-FTBFS-with-gcc-4.5.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
* 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:
 
1
Description: Fix FTBFS with gcc 4.5.
 
2
Origin: vendor
 
3
Bug-Debian: http://bugs.debian.org/614440
 
4
Bug-Ubuntu: https://launchpad.net/bugs/626184
 
5
Forwarded: no
 
6
Author: Author: Bhavani Shankar <bhavi@ubuntu.com>
 
7
Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
 
8
Last-Update: 2011-04-15
 
9
 
 
10
--- a/src/alarm_runner.h
 
11
+++ b/src/alarm_runner.h
 
12
@@ -30,4 +30,4 @@
 
13
 void
 
14
 run_alarm(gchar *name);
 
15
 
 
16
-GKeyFile *alarm;
 
17
+//GKeyFile *alarm;