summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-08-31 05:44:27 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-08-31 05:44:27 +0200
commitdaf5d1784e5b6709df39de4ea69e213fb16fc13e (patch)
tree024a9f8191e9f3438e71b82172d3a7722747f35c
parent7686bc45dedb8eaed56afdcc7ef51150f4583f35 (diff)
Switch Depends from dbus-x11 to default-dbus-session-bus | dbus-session-bus
-rw-r--r--debian/changelog6
-rw-r--r--debian/control2
-rw-r--r--debian/patches/0100-ios8.patch12
3 files changed, 11 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index fa03ef3..5af630d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-shotwell (0.23.5-1) unstable; urgency=medium
+shotwell (0.23.6-1) unstable; urgency=medium
* New upstream release (Closes: #824164, #825788).
- Renew Patches.
@@ -31,6 +31,8 @@ shotwell (0.23.5-1) unstable; urgency=medium
* debian/control:
- Add itstool to Build-Depends.
- Change minimal version of libgee-0.8 to 0.10.
+ - Switch Depends from dbus-x11 to
+ default-dbus-session-bus | dbus-session-bus (Closes: #836046).
* debian/shotwell.install:
- Remove missing apport/shotwell.py.
* Move debian/manpages to debian/shotwell.manpages and use the
@@ -39,7 +41,7 @@ shotwell (0.23.5-1) unstable; urgency=medium
file installation.
* New patches/0600-remove_wrong_marco.patch to remove the wrong macro 'R'.
- -- Jörg Frings-Fürst <debian@jff-webhosting.net> Tue, 23 Aug 2016 23:35:56 +0200
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Wed, 31 Aug 2016 05:38:35 +0200
shotwell (0.22.1-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index c2b427b..62aaa88 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Depends:
${misc:Depends},
shotwell-common (= ${source:Version}),
dconf-cli,
- dbus-x11,
+ default-dbus-session-bus | dbus-session-bus,
librsvg2-common
Description: digital photo organizer
Shotwell is a digital photo organizer designed for the GNOME desktop
diff --git a/debian/patches/0100-ios8.patch b/debian/patches/0100-ios8.patch
index f438dde..aab9bab 100644
--- a/debian/patches/0100-ios8.patch
+++ b/debian/patches/0100-ios8.patch
@@ -25,7 +25,7 @@ Index: trunk/src/camera/ImportPage.vala
}
public override Gtk.Toolbar get_toolbar() {
-@@ -1152,11 +1161,14 @@ public class ImportPage : CheckerboardPa
+@@ -1154,11 +1163,14 @@ public class ImportPage : CheckerboardPa
update_status(busy, false);
refresh_error = null;
@@ -45,7 +45,7 @@ Index: trunk/src/camera/ImportPage.vala
}
update_status(true, refreshed);
-@@ -1261,13 +1273,15 @@ public class ImportPage : CheckerboardPa
+@@ -1263,13 +1275,15 @@ public class ImportPage : CheckerboardPa
progress_bar.set_ellipsize(Pango.EllipsizeMode.NONE);
progress_bar.set_text("");
progress_bar.set_fraction(0.0);
@@ -61,9 +61,9 @@ Index: trunk/src/camera/ImportPage.vala
+#endif
+
if (refresh_result == GPhoto.Result.OK) {
- update_status(false, true);
- } else {
-@@ -1633,11 +1647,15 @@ public class ImportPage : CheckerboardPa
+ if (import_sources.get_count () == 0) {
+ this.set_page_message (this.get_view_empty_message ());
+@@ -1638,11 +1652,15 @@ public class ImportPage : CheckerboardPa
}
private void import(Gee.Iterable<DataObject> items) {
@@ -84,7 +84,7 @@ Index: trunk/src/camera/ImportPage.vala
}
update_status(true, refreshed);
-@@ -1773,12 +1791,15 @@ public class ImportPage : CheckerboardPa
+@@ -1778,12 +1796,15 @@ public class ImportPage : CheckerboardPa
}
private void close_import() {