diff -u solfege-3.10.3/debian/rules solfege-3.10.3/debian/rules
--- solfege-3.10.3/debian/rules
+++ solfege-3.10.3/debian/rules
@@ -7,17 +7,19 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpatch/dpatch.make
+
 export DH_PYCOMPAT=2
 
 build: build-stamp
-build-stamp:
+build-stamp: patch-stamp
 	dh_testdir
 	./configure --sysconfdir=/etc --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-tuner --with-gtkhtml --with-local-xmlcatalog
 	# Add here commands to compile the package.
 	xvfb-run $(MAKE) skipmanual=yes
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
diff -u solfege-3.10.3/debian/changelog solfege-3.10.3/debian/changelog
--- solfege-3.10.3/debian/changelog
+++ solfege-3.10.3/debian/changelog
@@ -1,3 +1,14 @@
+solfege (3.10.3-1ubuntu1) intrepid; urgency=low
+
+  * Pick two fixes from the new Debian version (LP: 269894):
+    - debian/patches/filesystem-getcwd-bug.dpatch - use os.getcwdu()
+      instead of getcwd(), which is not defined.
+    - debian/patches/xsltproc-nonet.dpatch - tell xsltproc not to use
+      net access.
+  * Add dpatch, as that is what is used in the new upstream version.
+
+ -- James Westby <james.westby@canonical.com>  Mon, 15 Sep 2008 11:33:02 +0100
+
 solfege (3.10.3-1) unstable; urgency=low
 
   * New upstream release
diff -u solfege-3.10.3/debian/control solfege-3.10.3/debian/control
--- solfege-3.10.3/debian/control
+++ solfege-3.10.3/debian/control
@@ -1,8 +1,9 @@
 Source: solfege
 Section: gnome
 Priority: optional
-Maintainer: Tom Cato Amundsen <tca@debian.org>
-Build-Depends: swig, gettext, python-dev, debhelper (>=5.0.37.2), m4, texinfo, python-gnome2 (>=1.99.11), python-gtk2 (>=1.99.11), python-gtk2-dev (>=2.6.1), python-gnome2-dev (>=2.10.0), librsvg2-bin, txt2man, pkg-config, libglib2.0-dev (>= 2.8.0), python-support (>=0.3), xvfb, xbase-clients, xfonts-base
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Tom Cato Amundsen <tca@debian.org>
+Build-Depends: swig, gettext, python-dev, debhelper (>=5.0.37.2), m4, texinfo, python-gnome2 (>=1.99.11), python-gtk2 (>=1.99.11), python-gtk2-dev (>=2.6.1), python-gnome2-dev (>=2.10.0), librsvg2-bin, txt2man, pkg-config, libglib2.0-dev (>= 2.8.0), python-support (>=0.3), xvfb, xbase-clients, xfonts-base, dpatch
 Standards-Version: 3.7.3.0
 Homepage: http://www.solfege.org
 
only in patch2:
unchanged:
--- solfege-3.10.3.orig/debian/patches/00list
+++ solfege-3.10.3/debian/patches/00list
@@ -0,0 +1,2 @@
+filesystem-getcwd-bug.dpatch
+xsltproc-nonet
only in patch2:
unchanged:
--- solfege-3.10.3.orig/debian/patches/filesystem-getcwd-bug.dpatch
+++ solfege-3.10.3/debian/patches/filesystem-getcwd-bug.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## filesystem-getcwd-bug.dpatch by  <tca@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad solfege-3.11.3~/src/filesystem.py solfege-3.11.3/src/filesystem.py
+--- solfege-3.11.3~/src/filesystem.py	2008-07-14 08:19:15.000000000 +0200
++++ solfege-3.11.3/src/filesystem.py	2008-07-31 23:01:01.000000000 +0200
+@@ -69,7 +69,7 @@
+     if not os.path.exists(path1):
+         if not os.path.exists(path2):
+             if not os.path.exists(path3):
+-                return getcwd()
++                return os.getcwdu()
+             else: return path3
+         else: return path2
+     else: return path1
only in patch2:
unchanged:
--- solfege-3.10.3.orig/debian/patches/xsltproc-nonet.dpatch
+++ solfege-3.10.3/debian/patches/xsltproc-nonet.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## xsltproc-nonet.dpatch by  <tca@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad solfege-3.11.3~/help/Makefile solfege-3.11.3/help/Makefile
+--- solfege-3.11.3~/help/Makefile	2008-07-14 08:19:15.000000000 +0200
++++ solfege-3.11.3/help/Makefile	2008-08-15 09:26:33.000000000 +0200
+@@ -10,6 +10,7 @@
+ --param use.id.as.filename 1 \
+ --param xref.with.number.and.title 0 \
+ --xinclude \
++--nonet \
+ --stringparam html.stylesheet "../style.css"
+ 
+ dist_files += help/Makefile help/README \