tag 614440 + pending tag 595775 + pending thanks Dear Ryan,
I've prepared an NMU for alarm-clock (versioned as 1.2.5-1.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards Salvatore
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,17 @@ +alarm-clock (1.2.5-1.1) unstable; urgency=low + + * 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). + + -- Salvatore Bonaccorso <car...@debian.org> Fri, 15 Apr 2011 21:46:44 +0200 + 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 @@ -4,7 +4,7 @@ Maintainer: Ryan Niebur <r...@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/ +Homepage: http://gnome-automate.net/ Vcs-Git: git://git.ryan52.info/git/alarm-clock Vcs-Browser: http://git.ryan52.info/?p=alarm-clock;a=summary 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-FTBFS-with-gcc-4.5.patch +fix-desktop-file.patch only in patch2: unchanged: --- alarm-clock-1.2.5.orig/debian/patches/fix-FTBFS-with-gcc-4.5.patch +++ alarm-clock-1.2.5/debian/patches/fix-FTBFS-with-gcc-4.5.patch @@ -0,0 +1,17 @@ +Description: Fix FTBFS with gcc 4.5. +Origin: vendor +Bug-Debian: http://bugs.debian.org/614440 +Bug-Ubuntu: https://launchpad.net/bugs/626184 +Forwarded: no +Author: Author: Bhavani Shankar <bh...@ubuntu.com> +Reviewed-by: Salvatore Bonaccorso <car...@debian.org> +Last-Update: 2011-04-15 + +--- a/src/alarm_runner.h ++++ b/src/alarm_runner.h +@@ -30,4 +30,4 @@ + void + run_alarm(gchar *name); + +-GKeyFile *alarm; ++//GKeyFile *alarm; 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,17 @@ +Description: fix desktop file type association +Origin: vendor +Bug-Debian: http://bugs.debian.org/595775 +Bug-Ubuntu: https://launchpad.net/bugs/502871 +Forwarded: no +Author: Bhavani Shankar <bh...@ubuntu.com> +Reviewed-by: Salvatore Bonaccorso <car...@debian.org> +Last-Update: 2011-04-15 + +--- a/alarm-clock.desktop ++++ b/alarm-clock.desktop +@@ -18,5 +18,4 @@ + Categories=GNOME;GTK;Utility; + Icon=alarm-clock + StartupNotify=false +-MimeType=text/plain; + OnlyShowIn=GNOME;
signature.asc
Description: Digital signature
