diff -u muse-0.7.1+0.7.2pre5/debian/changelog muse-0.7.1+0.7.2pre5/debian/changelog
--- muse-0.7.1+0.7.2pre5/debian/changelog
+++ muse-0.7.1+0.7.2pre5/debian/changelog
@@ -1,10 +1,20 @@
-muse (0.7.1+0.7.2pre5-1ubuntu1) dapper; urgency=low
+muse (0.7.1+0.7.2pre5-2ubuntu1) dapper; urgency=low
 
-  * Added a .desktop file from Emmet Hikory (Closes: #28874)
-  * Sponsered upload for Dana Olson <dana@ubuntustudio.com>
-  * debian/rules: Removed config.guess and .sub rules.
+  * Synchronised with new Debian version
+  * Reapplied changes from 1.7.1+0.7.2pre5-1ubuntu1
+  - Added a .desktop file
+  - debian/rules: Removed config.guess and .sub rules.
 
- -- Jonathan Patrick Davies <jpatrick@ubuntu.com>  Fri, 24 Feb 2006 17:21:00 +0100
+ -- Emmet Hikory <emmet.hikory@gmail.com>  Wed,  3 May 2006 18:37:49 +0900
+
+muse (0.7.1+0.7.2pre5-2) unstable; urgency=medium
+
+  * Added patches:
+    + [10_amd64_rtctimer_segfault_fix_CVS] From upstream CVS.
+      Do not read 64bits of input into a 32bit variable. Fixes a timer
+      related segfault on 64bit archs. Closes: #351477
+
+ -- Daniel Kobras <kobras@debian.org>  Mon,  6 Feb 2006 21:38:06 +0100
 
 muse (0.7.1+0.7.2pre5-1) unstable; urgency=low
 
diff -u muse-0.7.1+0.7.2pre5/debian/patches/00list muse-0.7.1+0.7.2pre5/debian/patches/00list
--- muse-0.7.1+0.7.2pre5/debian/patches/00list
+++ muse-0.7.1+0.7.2pre5/debian/patches/00list
@@ -1 +1,2 @@
+10_amd64_rtctimer_segfault_fix_CVS
 20_allow_system_timer
only in patch2:
unchanged:
--- muse-0.7.1+0.7.2pre5.orig/debian/patches/10_amd64_rtctimer_segfault_fix_CVS.dpatch
+++ muse-0.7.1+0.7.2pre5/debian/patches/10_amd64_rtctimer_segfault_fix_CVS.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_amd64_rtctimer_segfault_fix_CVS.dpatch by Daniel Kobras <kobras@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Do not read a 64bit timer tick value into a 32bit variable on 64bit
+## DP: architectures. Fixes a segfault on amd64.
+## DP: From upstream CVS.
+
+@DPATCH@
+Index: rtctimer.cpp
+===================================================================
+RCS file: /cvsroot/lmuse/muse/muse/driver/rtctimer.cpp,v
+retrieving revision 1.1.2.7
+retrieving revision 1.1.2.8
+diff -u -w -b -r1.1.2.7 -r1.1.2.8
+--- muse/muse/driver/rtctimer.cpp	30 Dec 2005 12:43:43 -0000	1.1.2.7
++++ muse/muse/driver/rtctimer.cpp	13 Jan 2006 18:10:55 -0000	1.1.2.8
+@@ -141,7 +141,7 @@
+     {
+     if(TIMER_DEBUG)
+       printf("getTimerTicks()\n");
+-    unsigned int nn;
++    unsigned long int nn;
+     if (timerFd==-1) {
+         fprintf(stderr,"RtcTimer::getTimerTicks(): no RTC open to read!\n");
+         return 0;