diff -Nru pdfmod-0.8.3/debian/changelog pdfmod-0.8.3/debian/changelog --- pdfmod-0.8.3/debian/changelog 2010-09-22 03:36:45.000000000 +0200 +++ pdfmod-0.8.3/debian/changelog 2011-02-22 10:31:31.000000000 +0100 @@ -1,3 +1,12 @@ +pdfmod (0.8.3-1ubuntu0.1) maverick-proposed; urgency=low + + * debian/patches/0004-Avoid_XDG-related_crash_in_file_chooser.patch: + Backported upstream commit 1bf89353c53ee111c0088462557e2cc693dcdbbb + Avoid crash when XDG_DOCUMENTS_DIR or XDG_DOWNLOADS_DIR is not set + (LP: #645137) + + -- Marcel Stimberg Tue, 22 Feb 2011 10:31:31 +0100 + pdfmod (0.8.3-1build2) maverick; urgency=low * Really rebuild against libpoppler-glib5 and diff -Nru pdfmod-0.8.3/debian/control pdfmod-0.8.3/debian/control --- pdfmod-0.8.3/debian/control 2010-09-22 03:27:12.000000000 +0200 +++ pdfmod-0.8.3/debian/control 2011-02-22 10:21:49.000000000 +0100 @@ -1,7 +1,8 @@ Source: pdfmod Section: gnome Priority: optional -Maintainer: Debian CLI Applications Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian CLI Applications Team Uploaders: Chow Loong Jin Build-Depends: debhelper (>= 7.0.50), autotools-dev, @@ -28,4 +29,3 @@ remove and reoder pages via drag and drop. Multiple documents may be combined via drag and drop. You may also edit the title, subject, author and keywords of a PDF document using PDF Mod. - diff -Nru pdfmod-0.8.3/debian/patches/0004-Avoid_XDG-related_crash_in_file_chooser.patch pdfmod-0.8.3/debian/patches/0004-Avoid_XDG-related_crash_in_file_chooser.patch --- pdfmod-0.8.3/debian/patches/0004-Avoid_XDG-related_crash_in_file_chooser.patch 1970-01-01 01:00:00.000000000 +0100 +++ pdfmod-0.8.3/debian/patches/0004-Avoid_XDG-related_crash_in_file_chooser.patch 2011-02-22 10:21:49.000000000 +0100 @@ -0,0 +1,31 @@ +Index: pdfmod/src/PdfMod/Gui/Client.cs +=================================================================== +--- pdfmod.orig/src/PdfMod/Gui/Client.cs 2011-02-13 12:40:55.426117998 +0100 ++++ pdfmod/src/PdfMod/Gui/Client.cs 2011-02-13 12:41:09.316117998 +0100 +@@ -377,14 +377,23 @@ + chooser.AddFilter (GtkUtilities.GetFileFilter ("PDF Documents", new string [] {"pdf"})); + chooser.AddFilter (GtkUtilities.GetFileFilter (Catalog.GetString ("All Files"), new string [] {"*"})); + +- var dirs = new string [] { "DOWNLOAD", "DOCUMENTS" }.Select (s => +- XdgBaseDirectorySpec.GetXdgDirectoryUnderHome (String.Format ("XDG_{0}_DIR", s), null) +- ).Where (d => d != null).ToArray (); ++ var dirs = new string [] { "DOWNLOAD", "DOCUMENTS" }.Select (s => GetXdgDir (s)) ++ .Where (d => d != null) ++ .ToArray (); + Hyena.Gui.GtkUtilities.SetChooserShortcuts (chooser, dirs); + + return chooser; + } + ++ private string GetXdgDir (string type) ++ { ++ try { ++ return XdgBaseDirectorySpec.GetXdgDirectoryUnderHome (String.Format ("XDG_{0}_DIR", type), null); ++ } catch { ++ return null; ++ } ++ } ++ + static void OnLogNotify (LogNotifyArgs args) + { + ThreadAssist.ProxyToMain (delegate { diff -Nru pdfmod-0.8.3/debian/patches/series pdfmod-0.8.3/debian/patches/series --- pdfmod-0.8.3/debian/patches/series 2010-09-22 03:27:12.000000000 +0200 +++ pdfmod-0.8.3/debian/patches/series 2011-02-22 10:21:49.000000000 +0100 @@ -1,3 +1,4 @@ 0001-Autodetect-external-poppler-sharp.patch 0002-Fix-PDFMod-s-compilation-to-choose-correct-Poppler.patch 0003-Make-POPPLER_SHARP_DLL_CONFIG-conditional.patch +0004-Avoid_XDG-related_crash_in_file_chooser.patch