tags 574112 + patch pending
tags 577913 + patch pending
thanks
Dear maintainer,
I've prepared an NMU for shotwell (versioned as 0.5.0+dfsg-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru shotwell-0.5.0+dfsg/debian/changelog shotwell-0.5.0+dfsg/debian/changelog
--- shotwell-0.5.0+dfsg/debian/changelog 2010-03-15 16:25:20.000000000 +0100
+++ shotwell-0.5.0+dfsg/debian/changelog 2010-04-18 23:18:17.000000000 +0200
@@ -1,3 +1,14 @@
+shotwell (0.5.0+dfsg-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/vala_0.8.0.patch:
+ - Build with vala 0.8.0 (Closes: #577913).
+ * debian/control:
+ - Depend on librsvg2-common and dbus-x11 (Closes: #574112).
+ - Bump minimum valac version to 0.8.0.
+
+ -- Luca Falavigna <dktrkr...@debian.org> Sun, 18 Apr 2010 23:16:32 +0200
+
shotwell (0.5.0+dfsg-1) unstable; urgency=low
* New upstream release.
diff -Nru shotwell-0.5.0+dfsg/debian/control shotwell-0.5.0+dfsg/debian/control
--- shotwell-0.5.0+dfsg/debian/control 2010-03-15 16:24:24.000000000 +0100
+++ shotwell-0.5.0+dfsg/debian/control 2010-04-18 23:18:50.000000000 +0200
@@ -2,7 +2,7 @@
Section: gnome
Priority: extra
Maintainer: Devid Antonio Filoni <d.fil...@ubuntu.com>
-Build-Depends: debhelper (>= 7.0.50~), valac (>= 0.7.10), libgee-dev
+Build-Depends: debhelper (>= 7.0.50~), valac (>= 0.8.0), libgee-dev
(>= 0.5.0), libgtk2.0-dev (>= 2.14.4), libexif-dev (>= 0.6.16),
libsqlite3-dev (>= 3.5.9), libdbus-glib-1-dev (>= 0.76), libgconf2-dev
(>= 2.22.0), libhal-dev (>= 0.5.11), libgphoto2-2-dev (>= 2.4.2),
@@ -13,7 +13,7 @@
Package: shotwell
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, librsvg2-common, dbus-x11
Description: digital photo organizer
Shotwell is a digital photo organizer designed for the GNOME desktop
environment. It allows you to import photos from disk or camera, organize
diff -Nru shotwell-0.5.0+dfsg/debian/patches/series shotwell-0.5.0+dfsg/debian/patches/series
--- shotwell-0.5.0+dfsg/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ shotwell-0.5.0+dfsg/debian/patches/series 2010-04-18 23:11:15.000000000 +0200
@@ -0,0 +1 @@
+vala_0.8.0.patch
diff -Nru shotwell-0.5.0+dfsg/debian/patches/vala_0.8.0.patch shotwell-0.5.0+dfsg/debian/patches/vala_0.8.0.patch
--- shotwell-0.5.0+dfsg/debian/patches/vala_0.8.0.patch 1970-01-01 01:00:00.000000000 +0100
+++ shotwell-0.5.0+dfsg/debian/patches/vala_0.8.0.patch 2010-04-18 23:16:25.000000000 +0200
@@ -0,0 +1,42 @@
+Description: Build with vala 0.8.0
+Origin: upstream, http://trac.yorba.org/changeset?new=1415&old=1414
+
+Index: shotwell-0.5.0+dfsg/Makefile
+===================================================================
+--- shotwell-0.5.0+dfsg.orig/Makefile 2010-04-18 23:12:55.158183639 +0200
++++ shotwell-0.5.0+dfsg/Makefile 2010-04-18 23:12:51.758187599 +0200
+@@ -6,7 +6,7 @@
+ BUILD_ROOT = 1
+
+ VALAC = valac
+-MIN_VALAC_VERSION = 0.7.10
++MIN_VALAC_VERSION = 0.8.0
+ INSTALL_PROGRAM = install
+ INSTALL_DATA = install -m 644
+
+Index: shotwell-0.5.0+dfsg/src/Page.vala
+===================================================================
+--- shotwell-0.5.0+dfsg.orig/src/Page.vala 2010-04-18 23:12:55.914202123 +0200
++++ shotwell-0.5.0+dfsg/src/Page.vala 2010-04-18 23:12:51.738201949 +0200
+@@ -48,7 +48,7 @@
+ }
+
+ private void destroy_ui_manager_widgets(Gtk.UIManagerItemType item_type) {
+- unowned SList<Gtk.Widget> toplevels = ui.get_toplevels(item_type);
++ SList<weak Gtk.Widget> toplevels = ui.get_toplevels(item_type);
+ for (int ctr = 0; ctr < toplevels.length(); ctr++)
+ toplevels.nth(ctr).data.destroy();
+ }
+Index: shotwell-0.5.0+dfsg/src/Sidebar.vala
+===================================================================
+--- shotwell-0.5.0+dfsg.orig/src/Sidebar.vala 2010-04-18 23:12:55.618199613 +0200
++++ shotwell-0.5.0+dfsg/src/Sidebar.vala 2010-04-18 23:12:51.750203001 +0200
+@@ -69,7 +69,7 @@
+
+ Gtk.TreeSelection selection = get_selection();
+ selection.set_mode(Gtk.SelectionMode.BROWSE);
+- selection.set_select_function(on_selection, null);
++ selection.set_select_function(on_selection);
+
+ enable_model_drag_dest(LibraryWindow.get_drop_target_entries(), Gdk.DragAction.ASK);
+
