diff -u alarm-clock-1.2.5/debian/changelog alarm-clock-1.2.5/debian/changelog
--- alarm-clock-1.2.5/debian/changelog
+++ alarm-clock-1.2.5/debian/changelog
@@ -1,3 +1,15 @@
+alarm-clock (1.2.5-1ubuntu1) maverick; urgency=low
+
+  * debian/patches/fix-desktop-file.patch:
+    + change MIME type to application/octet-stream to avoid alarm-clock
+      associating with text files (LP: #502871)
+  * debian/patches/fix-ftbfs.patch:
+    + rename alarm to alarm_struct in src/alarm_runner.h to fix 'alarm' 
+      redeclared as different kind of symbol gcc error and hence FTBFS
+      (LP: #626184)  
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Sun, 29 Aug 2010 15:00:32 +0530
+
 alarm-clock (1.2.5-1) unstable; urgency=low
 
   * update watch file
diff -u alarm-clock-1.2.5/debian/control alarm-clock-1.2.5/debian/control
--- alarm-clock-1.2.5/debian/control
+++ alarm-clock-1.2.5/debian/control
@@ -1,7 +1,8 @@
 Source: alarm-clock
 Section: utils
 Priority: optional
-Maintainer: Ryan Niebur <ryan@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ryan Niebur <ryan@debian.org>
 Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7), automake, intltool, libgstreamer0.10-dev, libgtk2.0-dev, libnotify-dev, libglib2.0-dev
 Standards-Version: 3.8.3
 Homepage: http://www.alarm-clock.pl/
diff -u alarm-clock-1.2.5/debian/patches/series alarm-clock-1.2.5/debian/patches/series
--- alarm-clock-1.2.5/debian/patches/series
+++ alarm-clock-1.2.5/debian/patches/series
@@ -1,0 +2,2 @@
+fix-desktop-file.patch
+fix-ftbfs.patch
only in patch2:
unchanged:
--- alarm-clock-1.2.5.orig/debian/patches/fix-ftbfs.patch
+++ alarm-clock-1.2.5/debian/patches/fix-ftbfs.patch
@@ -0,0 +1,14 @@
+Index: alarm-clock-1.2.5/src/alarm_runner.h
+==============================================
+--- alarm-clock-1.2.5.orig/src/alarm_runner.h
++++ alarm-clock-1.2.5/src/alarm_runner.h
+@@ -28,6 +28,6 @@
+ gboolean running_snooze;
+ 
+ void
+-run_alarm(gchar *name);
++run_alarm_struct(gchar *name);
+ 
+-GKeyFile *alarm;
++GKeyFile *alarm_struct;
+
only in patch2:
unchanged:
--- alarm-clock-1.2.5.orig/debian/patches/fix-desktop-file.patch
+++ alarm-clock-1.2.5/debian/patches/fix-desktop-file.patch
@@ -0,0 +1,12 @@
+Index: alarm-clock-1.2.5/alarm-clock.desktop
+===============================================
+--- alarm-clock-1.2.5.orig/alarm-clock.desktop
++++ alarm-clock-1.2.5/alarm-clock.desktop
+@@ -18,5 +18,5 @@
+ Categories=GNOME;GTK;Utility;
+ Icon=alarm-clock
+ StartupNotify=false
+-MimeType=text/plain;
++MimeType=application/octet-stream;
+ OnlyShowIn=GNOME;
+