diffstat of debian/ for shotwell_0.11.5-1 shotwell_0.12.2-0ubuntu2 changelog | 112 ++++++++++++++++ control | 20 +- patches/01_lpi.patch | 227 ++++++++++++++++++++++++++++++++++ patches/02_desktop_translations.patch | 25 +++ patches/03_appmenu_no_stubs.patch | 18 ++ patches/04_no_resize_grip.patch | 26 +++ patches/05-gomp-linking.patch | 16 ++ patches/gettext.patch | 32 ---- patches/series | 8 - patches/sidebar-bg-color.patch | 26 --- rules | 4 11 files changed, 444 insertions(+), 70 deletions(-) diff -Nru shotwell-0.11.5/debian/changelog shotwell-0.12.2/debian/changelog --- shotwell-0.11.5/debian/changelog 2011-10-22 23:47:02.000000000 +0000 +++ shotwell-0.12.2/debian/changelog 2012-04-13 06:33:32.000000000 +0000 @@ -1,3 +1,115 @@ +shotwell (0.12.2-0ubuntu2) precise; urgency=low + + * debian/control: + - Add build-depends on libunity-dev + * debian/rules: + - Build with --unity-support (LP: #980532) + + -- Robert Ancell Fri, 13 Apr 2012 09:11:15 +1000 + +shotwell (0.12.2-0ubuntu1) precise; urgency=low + + * New upstream release: + - Corrects an issue where graphical corruption of the UI could + occur if the user navigated away from a camera page while camera + previews were being generated. + - Adds enhanced support for the Unity desktop environment. + - Clarified several strings. + - The application now recovers gracefully from corrupted tag data. + + -- Robert Ancell Thu, 12 Apr 2012 10:44:07 +1000 + +shotwell (0.12.1-0ubuntu2) precise; urgency=low + + * debian/control: + - build with current gexiv2 to pick the current soname (lp: #971468) + + -- Sebastien Bacher Mon, 02 Apr 2012 15:35:03 +0200 + +shotwell (0.12.1-0ubuntu1) precise-proposed; urgency=low + + * New upstream release: + - Corrects a critical issue where the application could not be started in + direct-edit mode. + + -- Robert Ancell Thu, 29 Mar 2012 11:37:01 +1100 + +shotwell (0.12.0-0ubuntu1) precise-proposed; urgency=low + + * New upstream release: + (Changes since 0.11.6) + - Adds straighten tool + - Ported from GTK 2 to GTK 3 + - Better handling of importing from Android devices + - Facebook and Flickr login now use OAuth authentication + - Numerous enhancements to the plugin subsystem + - The F-Spot importer is now implemented as a plugin + - Many, many bugfixes and stability enhancements + * debian/control: + - Bump build-depends on gexiv2 + + -- Robert Ancell Wed, 28 Mar 2012 11:59:51 +1100 + +shotwell (0.11.93-0ubuntu2) precise; urgency=low + + * debian/control: build-depends on librest-dev, the publishing makefile + requires it + + -- Sebastien Bacher Wed, 07 Mar 2012 16:08:00 +0100 + +shotwell (0.11.93-0ubuntu1) precise; urgency=low + + * New upstream release + + -- Robert Ancell Wed, 07 Mar 2012 10:27:48 +1100 + +shotwell (0.11.92-0ubuntu1) precise; urgency=low + + * New upstream release + + -- Robert Ancell Tue, 21 Feb 2012 13:52:58 +1100 + +shotwell (0.11.91-0ubuntu2) precise; urgency=low + + * debian/control: use the correct liblaunchpad-integration version + + -- Sebastien Bacher Thu, 12 Jan 2012 11:58:24 +0100 + +shotwell (0.11.91-0ubuntu1) precise; urgency=low + + * New upstream version using GTK3 (lp: #871034), + should fix lp: #800459, #881896, #887357, #888363, #898028 + * Refreshed patches for the new version + * debian/control: + - updated build-dependencies for GTK3 + * debian/patches/99git_libraw_api.patch: + - dropped, the patch is in the new version + + -- Sebastien Bacher Wed, 11 Jan 2012 15:59:04 +0100 + +shotwell (0.11.6-0ubuntu2) precise; urgency=low + + * debian/patches/99git_libraw_api.patch: cherry-pick changes from git to work + with libraw 0.14.0. + * debian/patches/05-gomp-linking.patch: we also need to link shotwell against + GOMP now, apparently, so add -fopenmp to the Makefile's relevant rule. + * debian/shotwell-video-thumbnailer.1: added, it was missing from the previous + upload and referred to by debian/manpages. + + -- Mathieu Trudel-Lapierre Fri, 25 Nov 2011 12:31:19 -0500 + +shotwell (0.11.6-0ubuntu1) precise; urgency=low + + * New upstream version + * Resynchronize on Debian + * debian/control.in: + - build-depends on python-scour, liblaunchpad-integration-dev + - don't build-depends on locales-all + * debian/rules: + - use configure option --disable-icon-update and dh option --with-scour + + -- Sebastien Bacher Wed, 23 Nov 2011 21:19:35 +0100 + shotwell (0.11.5-1) unstable; urgency=low * New upstream release (Closes: 645942). diff -Nru shotwell-0.11.5/debian/control shotwell-0.12.2/debian/control --- shotwell-0.11.5/debian/control 2011-10-22 23:45:58.000000000 +0000 +++ shotwell-0.12.2/debian/control 2012-04-13 06:33:32.000000000 +0000 @@ -1,23 +1,23 @@ Source: shotwell Section: gnome Priority: optional -Maintainer: Debian Shotwell Maintainers +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Debian Shotwell Maintainers Uploaders: Devid Antonio Filoni Build-Depends: debhelper (>= 7.0.50~), m4, - valac-0.12 (>= 0.11.7), + valac-0.16 (>= 0.15), libgee-dev (>= 0.5.0), - libgtk2.0-dev (>= 2.18.0), + libgtk-3-dev (>= 3.0.11), libexif-dev (>= 0.6.16), libsqlite3-dev (>= 3.5.9), - libgexiv2-dev (>= 0.2.2-4), + libgexiv2-dev (>= 0.4.1-1build1), libgnomevfs2-dev (>= 2.24.2), - libgconf2-dev (>= 2.22.0), libgphoto2-2-dev (>= 2.4.2), libsoup2.4-dev (>= 2.26.0), libxml2 (>= 2.6.32), - libunique-dev (>= 1.0.0), - libwebkitgtk-dev (>= 1.1.5), + libunique-3.0-dev (>= 1.0.0), + libwebkitgtk-3.0-dev (>= 1.1.5), libgudev-1.0-dev (>= 145), libdbus-glib-1-dev (>= 0.80), libraw-dev (>= 0.13.1-2), @@ -25,10 +25,14 @@ libjson-glib-dev (>= 0.7.6), libgstreamer0.10-dev (>= 0.10.28), libgstreamer-plugins-base0.10-dev (>= 0.10.32), - locales-all + python-scour, + libunity-dev, + liblaunchpad-integration-3.0-dev (>= 0.1.36), + librest-dev DM-Upload-Allowed: yes Standards-Version: 3.9.2 Homepage: http://yorba.org/shotwell/ +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/shotwell/ubuntu Package: shotwell Architecture: linux-any diff -Nru shotwell-0.11.5/debian/patches/01_lpi.patch shotwell-0.12.2/debian/patches/01_lpi.patch --- shotwell-0.11.5/debian/patches/01_lpi.patch 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.12.2/debian/patches/01_lpi.patch 2012-04-13 06:33:32.000000000 +0000 @@ -0,0 +1,227 @@ +Description: Add Launchpad integration +Author: Robert Ancell + +Index: shotwell-0.12.0/Makefile +=================================================================== +--- shotwell-0.12.0.orig/Makefile 2012-03-28 07:59:45.000000000 +1100 ++++ shotwell-0.12.0/Makefile 2012-03-28 12:05:42.975285181 +1100 +@@ -279,6 +279,7 @@ + gstreamer-base-0.10 \ + gstreamer-pbutils-0.10 \ + gtk+-3.0 \ ++ launchpad-integration-3.0 \ + gudev-1.0 \ + libexif \ + libgphoto2 \ +Index: shotwell-0.12.0/src/CollectionPage.vala +=================================================================== +--- shotwell-0.12.0.orig/src/CollectionPage.vala 2012-03-28 05:43:09.000000000 +1100 ++++ shotwell-0.12.0/src/CollectionPage.vala 2012-03-28 12:05:42.975285181 +1100 +@@ -32,6 +32,9 @@ + public CollectionPage(string page_name) { + base (page_name); + ++ LaunchpadIntegration.set_sourcepackagename("shotwell"); ++ LaunchpadIntegration.add_ui(ui, "/MenuBar/HelpMenu/LaunchpadItems"); ++ + get_view().items_altered.connect(on_photos_altered); + + init_item_context_menu("/CollectionContextMenu"); +Index: shotwell-0.12.0/src/events/EventsDirectoryPage.vala +=================================================================== +--- shotwell-0.12.0.orig/src/events/EventsDirectoryPage.vala 2012-03-28 05:43:09.000000000 +1100 ++++ shotwell-0.12.0/src/events/EventsDirectoryPage.vala 2012-03-28 12:05:42.975285181 +1100 +@@ -45,6 +45,9 @@ + public EventsDirectoryPage(string page_name, ViewManager view_manager, + Gee.Collection? initial_events) { + base (page_name); ++ ++ LaunchpadIntegration.set_sourcepackagename("shotwell"); ++ LaunchpadIntegration.add_ui(ui, "/MenuBar/HelpMenu/LaunchpadItems"); + + // set comparator before monitoring source collection, to prevent a re-sort + get_view().set_comparator(get_event_comparator(Config.Facade.get_instance().get_events_sort_ascending()), +Index: shotwell-0.12.0/src/camera/ImportPage.vala +=================================================================== +--- shotwell-0.12.0.orig/src/camera/ImportPage.vala 2012-03-28 12:04:39.467285787 +1100 ++++ shotwell-0.12.0/src/camera/ImportPage.vala 2012-03-28 12:05:42.975285181 +1100 +@@ -681,6 +681,9 @@ + + tracker = new CameraViewTracker(get_view()); + ++ LaunchpadIntegration.set_sourcepackagename("shotwell"); ++ LaunchpadIntegration.add_ui(ui, "/MenuBar/HelpMenu/LaunchpadItems"); ++ + // Get camera name. + if (null != display_name) { + camera_name = display_name; +@@ -726,6 +729,9 @@ + + init_item_context_menu("/ImportContextMenu"); + init_page_context_menu("/ImportContextMenu"); ++ ++ LaunchpadIntegration.set_sourcepackagename("shotwell"); ++ LaunchpadIntegration.add_ui(ui, "/MenuBar/HelpMenu/LaunchpadItems"); + } + + ~ImportPage() { +Index: shotwell-0.12.0/src/PhotoPage.vala +=================================================================== +--- shotwell-0.12.0.orig/src/PhotoPage.vala 2012-03-28 12:05:29.667285310 +1100 ++++ shotwell-0.12.0/src/PhotoPage.vala 2012-03-28 12:05:42.975285181 +1100 +@@ -2284,6 +2284,9 @@ + public LibraryPhotoPage() { + base(LibraryPhoto.global, "Photo"); + ++ LaunchpadIntegration.set_sourcepackagename("shotwell"); ++ LaunchpadIntegration.add_ui(ui, "/MenuBar/HelpMenu/LaunchpadItems"); ++ + // monitor view to update UI elements + get_view().items_altered.connect(on_photos_altered); + +Index: shotwell-0.12.0/src/library/TrashPage.vala +=================================================================== +--- shotwell-0.12.0.orig/src/library/TrashPage.vala 2012-03-28 05:43:09.000000000 +1100 ++++ shotwell-0.12.0/src/library/TrashPage.vala 2012-03-28 12:05:42.975285181 +1100 +@@ -34,6 +34,9 @@ + + tracker = new MediaViewTracker(get_view()); + ++ LaunchpadIntegration.set_sourcepackagename("shotwell"); ++ LaunchpadIntegration.add_ui(ui, "/MenuBar/HelpMenu/LaunchpadItems"); ++ + // monitor trashcans and initialize view with all items in them + LibraryPhoto.global.trashcan_contents_altered.connect(on_trashcan_contents_altered); + Video.global.trashcan_contents_altered.connect(on_trashcan_contents_altered); +Index: shotwell-0.12.0/ui/direct.ui +=================================================================== +--- shotwell-0.12.0.orig/ui/direct.ui 2012-03-28 05:43:09.000000000 +1100 ++++ shotwell-0.12.0/ui/direct.ui 2012-03-28 12:05:42.975285181 +1100 +@@ -56,6 +56,8 @@ + + + ++ ++ + + + +Index: shotwell-0.12.0/ui/events_directory.ui +=================================================================== +--- shotwell-0.12.0.orig/ui/events_directory.ui 2012-03-28 05:43:09.000000000 +1100 ++++ shotwell-0.12.0/ui/events_directory.ui 2012-03-28 12:05:42.979285180 +1100 +@@ -44,6 +44,8 @@ + + + ++ ++ + + + +Index: shotwell-0.12.0/ui/import.ui +=================================================================== +--- shotwell-0.12.0.orig/ui/import.ui 2012-03-28 05:43:09.000000000 +1100 ++++ shotwell-0.12.0/ui/import.ui 2012-03-28 12:05:42.979285180 +1100 +@@ -51,6 +51,8 @@ + + + ++ ++ + + + +Index: shotwell-0.12.0/ui/import_queue.ui +=================================================================== +--- shotwell-0.12.0.orig/ui/import_queue.ui 2012-03-28 05:43:09.000000000 +1100 ++++ shotwell-0.12.0/ui/import_queue.ui 2012-03-28 12:05:42.979285180 +1100 +@@ -25,6 +25,8 @@ + + + ++ ++ + + + +Index: shotwell-0.12.0/ui/photo.ui +=================================================================== +--- shotwell-0.12.0.orig/ui/photo.ui 2012-03-28 05:43:09.000000000 +1100 ++++ shotwell-0.12.0/ui/photo.ui 2012-03-28 12:05:42.979285180 +1100 +@@ -108,6 +108,8 @@ + + + ++ ++ + + + +Index: shotwell-0.12.0/ui/trash.ui +=================================================================== +--- shotwell-0.12.0.orig/ui/trash.ui 2012-03-28 05:43:09.000000000 +1100 ++++ shotwell-0.12.0/ui/trash.ui 2012-03-28 12:05:42.979285180 +1100 +@@ -52,6 +52,8 @@ + + + ++ ++ + + + +Index: shotwell-0.12.0/ui/media.ui +=================================================================== +--- shotwell-0.12.0.orig/ui/media.ui 2012-03-28 05:43:09.000000000 +1100 ++++ shotwell-0.12.0/ui/media.ui 2012-03-28 12:05:42.979285180 +1100 +@@ -114,6 +114,8 @@ + + + ++ ++ + + + +Index: shotwell-0.12.0/ui/offline.ui +=================================================================== +--- shotwell-0.12.0.orig/ui/offline.ui 2012-03-28 05:43:09.000000000 +1100 ++++ shotwell-0.12.0/ui/offline.ui 2012-03-28 12:05:42.979285180 +1100 +@@ -50,6 +50,8 @@ + + + ++ ++ + + + +Index: shotwell-0.12.0/src/MediaPage.vala +=================================================================== +--- shotwell-0.12.0.orig/src/MediaPage.vala 2012-03-28 05:43:09.000000000 +1100 ++++ shotwell-0.12.0/src/MediaPage.vala 2012-03-28 12:05:42.979285180 +1100 +@@ -232,6 +232,9 @@ + public MediaPage(string page_name) { + base (page_name); + ++ LaunchpadIntegration.set_sourcepackagename("shotwell"); ++ LaunchpadIntegration.add_ui(ui, "/MenuBar/HelpMenu/LaunchpadItems"); ++ + tracker = new MediaViewTracker(get_view()); + + get_view().items_altered.connect(on_media_altered); +Index: shotwell-0.12.0/src/library/OfflinePage.vala +=================================================================== +--- shotwell-0.12.0.orig/src/library/OfflinePage.vala 2012-03-28 05:43:09.000000000 +1100 ++++ shotwell-0.12.0/src/library/OfflinePage.vala 2012-03-28 12:05:42.979285180 +1100 +@@ -27,6 +27,9 @@ + + public OfflinePage() { + base (NAME); ++ ++ LaunchpadIntegration.set_sourcepackagename("shotwell"); ++ LaunchpadIntegration.add_ui(ui, "/MenuBar/HelpMenu/LaunchpadItems"); + + init_item_context_menu("/OfflineContextMenu"); + init_toolbar("/OfflineToolbar"); diff -Nru shotwell-0.11.5/debian/patches/02_desktop_translations.patch shotwell-0.12.2/debian/patches/02_desktop_translations.patch --- shotwell-0.11.5/debian/patches/02_desktop_translations.patch 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.12.2/debian/patches/02_desktop_translations.patch 2012-04-13 06:33:32.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Don't translate the .desktop files, they work with gettext and the build system translates them all into English +Bug-Ubuntu: https://bugs.launchpad.net/bugs/760978 + +Index: shotwell-0.12.0/Makefile +=================================================================== +--- shotwell-0.12.0.orig/Makefile 2012-03-28 12:05:42.975285181 +1100 ++++ shotwell-0.12.0/Makefile 2012-03-28 12:05:46.239285148 +1100 +@@ -532,17 +532,6 @@ + install: + cp misc/shotwell.desktop.head misc/shotwell.desktop + cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop +- $(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \ +- LANGUAGE=$(lang) gettext --domain=shotwell $(DESKTOP_APP_FULL_NAME)` \ +- >> misc/shotwell.desktop ; \ +- echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) \ +- gettext --domain=shotwell $(DESKTOP_APPLICATION_CLASS)` >> misc/shotwell.desktop ; \ +- echo Comment[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \ +- --domain=shotwell $(DESKTOP_APPLICATION_COMMENT)` >> misc/shotwell.desktop ; \ +- echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \ +- --domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` >> misc/shotwell-viewer.desktop ; \ +- echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \ +- --domain=shotwell $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/shotwell-viewer.desktop ;) + touch $(LANG_STAMP) + mkdir -p $(DESTDIR)$(PREFIX)/bin + $(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin diff -Nru shotwell-0.11.5/debian/patches/03_appmenu_no_stubs.patch shotwell-0.12.2/debian/patches/03_appmenu_no_stubs.patch --- shotwell-0.11.5/debian/patches/03_appmenu_no_stubs.patch 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.12.2/debian/patches/03_appmenu_no_stubs.patch 2012-04-13 06:33:32.000000000 +0000 @@ -0,0 +1,18 @@ +Index: shotwell-0.11.91/misc/shotwell-viewer.desktop.head +=================================================================== +--- shotwell-0.11.91.orig/misc/shotwell-viewer.desktop.head 2012-01-06 02:26:06.000000000 +0100 ++++ shotwell-0.11.91/misc/shotwell-viewer.desktop.head 2012-01-11 15:11:14.909408671 +0100 +@@ -12,3 +12,4 @@ + X-GIO-NoFuse=true + X-GNOME-Gettext-Domain=shotwell + X-GNOME-FullName=Shotwell Photo Viewer ++X-Ayatana-Appmenu-Show-Stubs=false +Index: shotwell-0.11.91/misc/shotwell.desktop.head +=================================================================== +--- shotwell-0.11.91.orig/misc/shotwell.desktop.head 2012-01-06 02:26:06.000000000 +0100 ++++ shotwell-0.11.91/misc/shotwell.desktop.head 2012-01-11 15:11:14.909408671 +0100 +@@ -12,3 +12,4 @@ + X-GIO-NoFuse=true + X-GNOME-Gettext-Domain=shotwell + X-GNOME-FullName=Shotwell Photo Manager ++X-Ayatana-Appmenu-Show-Stubs=false diff -Nru shotwell-0.11.5/debian/patches/04_no_resize_grip.patch shotwell-0.12.2/debian/patches/04_no_resize_grip.patch --- shotwell-0.11.5/debian/patches/04_no_resize_grip.patch 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.12.2/debian/patches/04_no_resize_grip.patch 2012-04-13 06:33:32.000000000 +0000 @@ -0,0 +1,26 @@ +Description: Disable the resize grip, it conflicts with widgets in the bottom corner +Author: Robert Ancell +Bug: https://launchpad.net/bugs/740274 + +Index: shotwell-0.12.0/src/AppWindow.vala +=================================================================== +--- shotwell-0.12.0.orig/src/AppWindow.vala 2012-03-28 05:43:09.000000000 +1100 ++++ shotwell-0.12.0/src/AppWindow.vala 2012-03-28 12:05:48.691285125 +1100 +@@ -413,6 +413,8 @@ + + } + ++extern static void gtk_window_set_has_resize_grip (Gtk.Window window, bool has_grip); ++ + // AppWindow is the parent window for most windows in Shotwell (FullscreenWindow is the exception). + // There are multiple types of AppWindows (LibraryWindow, DirectWindow) for different tasks, but only + // one AppWindow may exist per process. Thus, if the user closes an AppWindow, the program exits. +@@ -442,6 +444,8 @@ + assert(instance == null); + instance = this; + ++ gtk_window_set_has_resize_grip (this, false); ++ + title = Resources.APP_TITLE; + + GLib.List pixbuf_list = new GLib.List(); diff -Nru shotwell-0.11.5/debian/patches/05-gomp-linking.patch shotwell-0.12.2/debian/patches/05-gomp-linking.patch --- shotwell-0.11.5/debian/patches/05-gomp-linking.patch 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.12.2/debian/patches/05-gomp-linking.patch 2012-04-13 06:33:32.000000000 +0000 @@ -0,0 +1,16 @@ +From: Mathieu Trudel-Lapierre +Subject: Link against gomp as well (-lgomp) + +Index: shotwell-0.12.0/Makefile +=================================================================== +--- shotwell-0.12.0.orig/Makefile 2012-03-28 12:05:46.239285148 +1100 ++++ shotwell-0.12.0/Makefile 2012-03-28 12:05:50.063285112 +1100 +@@ -675,7 +675,7 @@ + $(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $< + + $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN) +- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@ ++ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) -fopenmp $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@ + glib-compile-schemas misc + + $(THUMBNAILER_BIN): $(EXPANDED_THUMBNAILER_SRC_FILES) diff -Nru shotwell-0.11.5/debian/patches/gettext.patch shotwell-0.12.2/debian/patches/gettext.patch --- shotwell-0.11.5/debian/patches/gettext.patch 2011-10-22 23:49:55.000000000 +0000 +++ shotwell-0.12.2/debian/patches/gettext.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -Description: show translations in GNOME menu -Author: Hideki Yamane -Bug: http://bugs.debian.org/644905 - -Index: shotwell-0.11.2/Makefile -=================================================================== ---- shotwell-0.11.2.orig/Makefile 2011-09-21 05:33:53.000000000 +0900 -+++ shotwell-0.11.2/Makefile 2011-10-10 22:58:31.153856051 +0900 -@@ -523,6 +523,23 @@ - @$(MAKE) --directory=plugins distclean - - .PHONY: install -+ -+ -+# set gettext to work when LANG=C is define -+ifeq "$(LANG)" "C" -+LANG = en_US.UTF-8 -+endif -+ -+# avoid empty LANG -+ifndef LANG -+LANG = en_US.UTF-8 -+endif -+ -+# avoid LC_ALL=C -+ifeq "$(LC_ALL)" "C" -+LC_ALL= -+endif -+ - install: - cp misc/shotwell.desktop.head misc/shotwell.desktop - cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop diff -Nru shotwell-0.11.5/debian/patches/series shotwell-0.12.2/debian/patches/series --- shotwell-0.11.5/debian/patches/series 2011-10-22 23:44:20.000000000 +0000 +++ shotwell-0.12.2/debian/patches/series 2012-04-13 06:33:32.000000000 +0000 @@ -1,2 +1,6 @@ -sidebar-bg-color.patch -gettext.patch +01_lpi.patch +02_desktop_translations.patch +03_appmenu_no_stubs.patch +04_no_resize_grip.patch +05-gomp-linking.patch + diff -Nru shotwell-0.11.5/debian/patches/sidebar-bg-color.patch shotwell-0.12.2/debian/patches/sidebar-bg-color.patch --- shotwell-0.11.5/debian/patches/sidebar-bg-color.patch 2011-09-13 18:52:48.000000000 +0000 +++ shotwell-0.12.2/debian/patches/sidebar-bg-color.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -Description: do not set sidebar background color -Author: Devid Antonio Filoni -Bug: http://bugs.debian.org/594170 - -Index: shotwell-0.10.1/src/library/LibraryWindow.vala -=================================================================== ---- shotwell-0.10.1.orig/src/library/LibraryWindow.vala 2011-08-21 12:58:57.567348609 +0200 -+++ shotwell-0.10.1/src/library/LibraryWindow.vala 2011-08-21 12:59:50.531349528 +0200 -@@ -69,7 +69,7 @@ - - // special Yorba-selected sidebar background color for standard themes (humanity, - // clearlooks, etc.); dark themes use the theme's native background color -- public static Gdk.Color SIDEBAR_STANDARD_BG_COLOR = parse_color("#EEE"); -+ // public static Gdk.Color SIDEBAR_STANDARD_BG_COLOR = parse_color("#EEE"); - - // Max brightness value to trigger SIDEBAR_STANDARD_BG_COLOR - public const uint16 STANDARD_COMPONENT_MINIMUM = 0xe000; -@@ -1284,7 +1284,7 @@ - // if the current theme is a standard theme (as opposed to a dark theme), then - // use the specially-selected Yorba muted background color for the sidebar. - // otherwise, use the theme's native background color. -- sidebar_tree.modify_base(Gtk.StateType.NORMAL, SIDEBAR_STANDARD_BG_COLOR); -+ // sidebar_tree.modify_base(Gtk.StateType.NORMAL, SIDEBAR_STANDARD_BG_COLOR); - } - - // put the sidebar in a scrolling window diff -Nru shotwell-0.11.5/debian/rules shotwell-0.12.2/debian/rules --- shotwell-0.11.5/debian/rules 2011-09-24 12:26:14.000000000 +0000 +++ shotwell-0.12.2/debian/rules 2012-04-13 06:33:32.000000000 +0000 @@ -1,10 +1,10 @@ #!/usr/bin/make -f %: - dh $@ + dh $@ --with-scour override_dh_auto_configure: - dh_auto_configure -- --disable-schemas-compile + dh_auto_configure -- --disable-schemas-compile --disable-icon-update --unity-support override_dh_installchangelogs: dh_installchangelogs NEWS