diff -u exult-1.2/debian/changelog exult-1.2/debian/changelog
--- exult-1.2/debian/changelog
+++ exult-1.2/debian/changelog
@@ -1,3 +1,11 @@
+exult (1.2-6.1ubuntu1) edgy; urgency=low
+
+  * Re-sync with Debian
+  * fmopldrv.h - Remove extra qualifier
+  * ucfunc.h - same
+
+ -- Barry deFreese <bddebian@comcast.net>  Sat, 29 Jul 2006 11:52:41 -0400
+
 exult (1.2-6.1) unstable; urgency=low
 
   * Non-maintainer upload.
only in patch2:
unchanged:
--- exult-1.2.orig/audio/midi_drivers/fmopldrv.h
+++ exult-1.2/audio/midi_drivers/fmopldrv.h
@@ -76,7 +76,7 @@
 	/* output a packed midi command to the midi stream
 	 * valid only if mode is MO_SIMPLE
 	 */
-	void OplDriver::send(uint32 b);
+	void send(uint32 b);
 
 	/* retrieve a string representation of an error code */
 	static const char *get_error_name(int error_code);
only in patch2:
unchanged:
--- exult-1.2.orig/usecode/ucxt/include/ucfunc.h
+++ exult-1.2/usecode/ucxt/include/ucfunc.h
@@ -206,7 +206,7 @@
 		bool output_list(std::ostream &o, unsigned int funcno, const UCOptions &options);
 		
 		bool output_ucs(std::ostream &o, const FuncMap &funcmap, const std::map<unsigned int, std::string> &intrinsics, const UCOptions &options);
-		std::ostream &UCFunc::output_ucs_funcname(std::ostream &o, const FuncMap &funcmap);
+		std::ostream &output_ucs_funcname(std::ostream &o, const FuncMap &funcmap);
 		std::ostream &output_ucs_funcname(std::ostream &o, const FuncMap &funcmap,
                                     unsigned int funcid,
                                     unsigned int numargs, bool return_var);