r24294 - in /desktop/unstable/evince/debian: changelog patches/ patches/01_dotdir_crash.patch patches/series rules source/ source/format

[joss at users.alioth.debian.org]

Author: joss
Date: Fri May  7 17:17:49 2010
New Revision: 24294

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24294
Log:
* Switch to 3.0 source format.
* 01_dotdir_crash.patch: stolen upstream. Fix a crash when 
  .gnome2/evince doesn’t exist. Closes: #580647.

Added:
    desktop/unstable/evince/debian/patches/
    desktop/unstable/evince/debian/patches/01_dotdir_crash.patch
    desktop/unstable/evince/debian/patches/series
    desktop/unstable/evince/debian/source/
    desktop/unstable/evince/debian/source/format
Modified:
    desktop/unstable/evince/debian/changelog
    desktop/unstable/evince/debian/rules

Modified: desktop/unstable/evince/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/changelog?rev=24294&op=diff
==============================================================================
--- desktop/unstable/evince/debian/changelog [utf-8] (original)
+++ desktop/unstable/evince/debian/changelog [utf-8] Fri May  7 17:17:49 2010
@@ -1,3 +1,11 @@
+evince (2.30.1-3) UNRELEASED; urgency=low
+
+  * Switch to 3.0 source format.
+  * 01_dotdir_crash.patch: stolen upstream. Fix a crash when 
+    .gnome2/evince doesn’t exist. Closes: #580647.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 07 May 2010 19:15:52 +0200
+
 evince (2.30.1-2) unstable; urgency=low
 
   * Upload to unstable.

Added: desktop/unstable/evince/debian/patches/01_dotdir_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/patches/01_dotdir_crash.patch?rev=24294&op=file
==============================================================================
--- desktop/unstable/evince/debian/patches/01_dotdir_crash.patch (added)
+++ desktop/unstable/evince/debian/patches/01_dotdir_crash.patch [utf-8] Fri May  7 17:17:49 2010
@@ -1,0 +1,22 @@
+From 0ac70b958c575996f760fdd987718649398fd51b Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <carlosgc at gnome.org>
+Date: Thu, 29 Apr 2010 09:53:26 +0000
+Subject: Make sure dot_dir exists before creating last_settings file
+
+Fixes bug #617154.
+---
+diff --git a/shell/ev-window.c b/shell/ev-window.c
+index fb40f70..4c4c460 100644
+--- a/shell/ev-window.c
++++ b/shell/ev-window.c
+@@ -6107,7 +6107,7 @@ ev_window_create_last_settings_metadata (EvWindow *window)
+ 	GFile *file;
+ 	gchar *path;
+ 
+-	path = g_build_filename (ev_application_get_dot_dir (EV_APP, FALSE), "last_settings", NULL);
++	path = g_build_filename (ev_application_get_dot_dir (EV_APP, TRUE), "last_settings", NULL);
+ 	file = g_file_new_for_path (path);
+ 	g_free (path);
+ 
+--
+cgit v0.8.3.1

Added: desktop/unstable/evince/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/patches/series?rev=24294&op=file
==============================================================================
--- desktop/unstable/evince/debian/patches/series (added)
+++ desktop/unstable/evince/debian/patches/series [utf-8] Fri May  7 17:17:49 2010
@@ -1,0 +1,1 @@
+01_dotdir_crash.patch

Modified: desktop/unstable/evince/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/rules?rev=24294&op=diff
==============================================================================
--- desktop/unstable/evince/debian/rules [utf-8] (original)
+++ desktop/unstable/evince/debian/rules [utf-8] Fri May  7 17:17:49 2010
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk

Added: desktop/unstable/evince/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/source/format?rev=24294&op=file
==============================================================================
--- desktop/unstable/evince/debian/source/format (added)
+++ desktop/unstable/evince/debian/source/format [utf-8] Fri May  7 17:17:49 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)