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,14 @@
+alarm-clock (1.2.5-1ubuntu1) maverick; urgency=low
+
+  * debian/patches/fix-desktop-file.patch:
+    + remove MIME type declaration to avoid alarm-clock associating with 
+      text files (LP: #502871)
+  * debian/patches/fix-ftbfs-with-gcc4.5.patch:
+    + comment out unused "alarm" variable in src/alarm_runner.h which clashes
+      with the alarm() function declared in unistd.h (LP: #626184)
+  
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Mon, 13 Sep 2010 19:34:34 +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-with-gcc4.5.patch
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,16 @@
+Author: Bhavani Shankar <bhavi@ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/502871
+Bug-Debian: http://bugs.debian.org/595775
+Description: fix desktop file type association 
+
+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,4 @@
+ Categories=GNOME;GTK;Utility;
+ Icon=alarm-clock
+ StartupNotify=false
+-MimeType=text/plain;
+ OnlyShowIn=GNOME;
+
only in patch2:
unchanged:
--- alarm-clock-1.2.5.orig/debian/patches/fix-ftbfs-with-gcc4.5.patch
+++ alarm-clock-1.2.5/debian/patches/fix-ftbfs-with-gcc4.5.patch
@@ -0,0 +1,15 @@
+Author: Bhavani Shankar <bhavi@ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/626184
+Bug-Debian: http://bugs.debian.org/595775
+Description: fix ftbfs with gcc 4.5
+
+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
+@@ -30,4 +30,4 @@
+ void
+ run_alarm(gchar *name);
+ 
+-GKeyFile *alarm;
++//GKeyFile *alarm;