diff -Nru baobab-3.8.2/debian/changelog baobab-3.14.1/debian/changelog --- baobab-3.8.2/debian/changelog 2014-03-12 04:47:24.000000000 +1100 +++ baobab-3.14.1/debian/changelog 2015-03-06 17:30:13.000000000 +1100 @@ -1,3 +1,68 @@ +baobab (3.14.1-1ubuntu1) vivid; urgency=low + + * Merge from Debian unstable. (LP: #1268721) Remaining changes: + - Add patch to use the traditional menubar under Unity + * Add patch from upstream stable git to fix top level pie chart. LP: #1393333 + + -- Jackson Doak Wed, 15 Oct 2014 23:15:13 +0000 + +baobab (3.14.1-1) unstable; urgency=medium + + * New upstream release. + * debian/control.in: Bump Standards-Version to 3.9.6 (no further changes) + + -- Laurent Bigonville Wed, 15 Oct 2014 21:34:35 +0200 + +baobab (3.14.0-1) unstable; urgency=medium + + * New upstream release. + * Update build-dependencies according to configure.ac changes: + + Bump libgtk-3-dev to >= 3.13.2 + + Bump valac to >= 0.25.1 + + -- Andreas Henriksson Wed, 24 Sep 2014 16:45:04 +0200 + +baobab (3.13.91-1) experimental; urgency=medium + + * New upstream release + + -- Sjoerd Simons Sat, 06 Sep 2014 23:40:28 +0200 + +baobab (3.12.1-1) unstable; urgency=medium + + [ Laurent Bigonville ] + * debian/control.in: Bump libglib2.0-dev build-dependency to 2.40, this is + needed for "GVariantDict" + + [ Andreas Henriksson ] + * New upstream release. + + -- Andreas Henriksson Sat, 26 Apr 2014 19:28:23 +0200 + +baobab (3.12.0-1) unstable; urgency=medium + + * New upstream version. + - Bump valac build-dependency to >= 0.23.3 + * debian/control.in: Update Homepage URL + + -- Laurent Bigonville Sat, 05 Apr 2014 02:02:25 +0200 + +baobab (3.10.1-1) unstable; urgency=low + + [ Jean Schurger ] + * New upstream version. + * Bump Build-Depends on libgtk-3-dev to (>= 3.9.10) + and libglib2.0-dev (>= 2.37.5). + * Drop debian/patches/01-remove-rpath.patch: Fixed upstream. + * Bump Standards-Version to 3.9.5. No further changes. + + [ Jeremy Bicha ] + * debian/control.in: + - Drop libgtop2-dev from build-depends + - Update homepage + + -- Laurent Bigonville Sun, 16 Feb 2014 15:58:21 +0100 + baobab (3.8.2-1ubuntu1) trusty; urgency=medium * debian/patches/use_traditional_menubar.patch: @@ -762,7 +827,7 @@ which cannot coexist with the GNOME 1.4 version. -- Jochen Voss Sun, 26 May 2002 16:52:33 +0200 - + gnome-utils (1.4.1.2-4) unstable; urgency=low * Depend on scrollkeeper as requested by Matt Zimmerman . @@ -1196,3 +1261,4 @@ * Initial Release. -- Jim Pick Wed, 17 Jun 1998 19:13:52 -0700 + diff -Nru baobab-3.8.2/debian/control baobab-3.14.1/debian/control --- baobab-3.8.2/debian/control 2014-03-12 04:47:39.000000000 +1100 +++ baobab-3.14.1/debian/control 2015-03-06 17:30:57.000000000 +1100 @@ -7,22 +7,21 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Debian GNOME Maintainers , Jordi Mallach , Michael Biebl +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Laurent Bigonville , Michael Biebl , Sjoerd Simons Build-Depends: cdbs, debhelper (>= 8), gnome-pkg-tools (>= 0.10), autotools-dev, intltool (>= 0.40.0), - libglib2.0-dev (>= 2.30.0), - libgtk-3-dev (>= 3.8.0), - libgtop2-dev (>= 2.12.0), + libglib2.0-dev (>= 2.40), + libgtk-3-dev (>= 3.13.2), yelp-tools, - valac (>= 0.17.4), + valac (>= 0.25.1), libgirepository1.0-dev, gobject-introspection -Standards-Version: 3.9.4 -Homepage: http://live.gnome.org/GnomeUtils -Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/baobab +Standards-Version: 3.9.6 +Homepage: https://wiki.gnome.org/Apps/Baobab +Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/baobab Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/baobab Package: baobab diff -Nru baobab-3.8.2/debian/control.in baobab-3.14.1/debian/control.in --- baobab-3.8.2/debian/control.in 2014-03-12 04:47:36.000000000 +1100 +++ baobab-3.14.1/debian/control.in 2015-03-06 17:30:13.000000000 +1100 @@ -9,16 +9,15 @@ gnome-pkg-tools (>= 0.10), autotools-dev, intltool (>= 0.40.0), - libglib2.0-dev (>= 2.30.0), - libgtk-3-dev (>= 3.8.0), - libgtop2-dev (>= 2.12.0), + libglib2.0-dev (>= 2.40), + libgtk-3-dev (>= 3.13.2), yelp-tools, - valac (>= 0.17.4), + valac (>= 0.25.1), libgirepository1.0-dev, gobject-introspection -Standards-Version: 3.9.4 -Homepage: http://live.gnome.org/GnomeUtils -Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/baobab +Standards-Version: 3.9.6 +Homepage: https://wiki.gnome.org/Apps/Baobab +Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/baobab Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/baobab Package: baobab diff -Nru baobab-3.8.2/debian/patches/01-remove-rpath.patch baobab-3.14.1/debian/patches/01-remove-rpath.patch --- baobab-3.8.2/debian/patches/01-remove-rpath.patch 2013-05-26 15:43:21.000000000 +1000 +++ baobab-3.14.1/debian/patches/01-remove-rpath.patch 1970-01-01 10:00:00.000000000 +1000 @@ -1,28 +0,0 @@ -Description: Remove RPATH -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=701028 -Index: baobab-3.8.2/src/Makefile.am -=================================================================== ---- baobab-3.8.2.orig/src/Makefile.am 2013-05-26 07:42:30.497194486 +0200 -+++ baobab-3.8.2/src/Makefile.am 2013-05-26 07:42:30.493194434 +0200 -@@ -62,7 +62,7 @@ - -Wno-unused-variable \ - $(NULL) - --baobab_LDFLAGS = -export-dynamic -rpath $(libdir) -+baobab_LDFLAGS = -export-dynamic - baobab_LDADD = \ - -lm \ - $(BAOBAB_LIBS) \ -Index: baobab-3.8.2/src/Makefile.in -=================================================================== ---- baobab-3.8.2.orig/src/Makefile.in 2013-05-13 19:42:32.000000000 +0200 -+++ baobab-3.8.2/src/Makefile.in 2013-05-26 07:42:41.901341627 +0200 -@@ -405,7 +405,7 @@ - -Wno-unused-variable \ - $(NULL) - --baobab_LDFLAGS = -export-dynamic -rpath $(libdir) -+baobab_LDFLAGS = -export-dynamic - baobab_LDADD = \ - -lm \ - $(BAOBAB_LIBS) \ diff -Nru baobab-3.8.2/debian/patches/git_fix_pie_chart.patch baobab-3.14.1/debian/patches/git_fix_pie_chart.patch --- baobab-3.8.2/debian/patches/git_fix_pie_chart.patch 1970-01-01 10:00:00.000000000 +1000 +++ baobab-3.14.1/debian/patches/git_fix_pie_chart.patch 2015-03-06 17:22:53.000000000 +1100 @@ -0,0 +1,24 @@ +From b220da708bf3c4f0c103d10ac9f91dcb8632d225 Mon Sep 17 00:00:00 2001 +From: Stefano Facchini +Date: Mon, 17 Nov 2014 13:41:41 +0100 +Subject: Exclude mountpoints when handling commandline arguments + +This is the intended default behavior. + +https://bugzilla.gnome.org/show_bug.cgi?id=740245 + +--- + src/baobab-application.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/baobab-application.vala ++++ b/src/baobab-application.vala +@@ -43,7 +43,7 @@ namespace Baobab { + protected override void open (File[] files, string hint) { + foreach (var file in files) { + var window = new Window (this); +- window.scan_directory (file); ++ window.scan_directory (file, ScanFlags.EXCLUDE_MOUNTS); + } + } + diff -Nru baobab-3.8.2/debian/patches/series baobab-3.14.1/debian/patches/series --- baobab-3.8.2/debian/patches/series 2014-03-12 04:44:29.000000000 +1100 +++ baobab-3.14.1/debian/patches/series 2015-03-06 17:19:54.000000000 +1100 @@ -1,2 +1,2 @@ -01-remove-rpath.patch -use_traditional_menubar.patch +use_traditional_titlebars_in_unity.patch +git_fix_pie_chart.patch diff -Nru baobab-3.8.2/debian/patches/use_traditional_menubar.patch baobab-3.14.1/debian/patches/use_traditional_menubar.patch --- baobab-3.8.2/debian/patches/use_traditional_menubar.patch 2014-03-12 04:43:50.000000000 +1100 +++ baobab-3.14.1/debian/patches/use_traditional_menubar.patch 1970-01-01 10:00:00.000000000 +1000 @@ -1,13 +0,0 @@ -diff --git a/src/baobab-application.vala b/src/baobab-application.vala -index 769894f..e372264 100644 ---- a/src/baobab-application.vala -+++ b/src/baobab-application.vala -@@ -91,7 +91,7 @@ namespace Baobab { - } catch (Error e) { - error ("loading menu builder file: %s", e.message); - } -- if (gtk_settings.gtk_shell_shows_app_menu) { -+ if (gtk_settings.gtk_shell_shows_app_menu && !gtk_settings.gtk_shell_shows_menubar) { - var app_menu = builder.get_object ("appmenu") as MenuModel; - set_app_menu (app_menu); - } else { diff -Nru baobab-3.8.2/debian/patches/use_traditional_titlebars_in_unity.patch baobab-3.14.1/debian/patches/use_traditional_titlebars_in_unity.patch --- baobab-3.8.2/debian/patches/use_traditional_titlebars_in_unity.patch 1970-01-01 10:00:00.000000000 +1000 +++ baobab-3.14.1/debian/patches/use_traditional_titlebars_in_unity.patch 2015-03-06 17:30:51.000000000 +1100 @@ -0,0 +1,747 @@ +--- a/src/baobab-main-window.ui ++++ b/src/baobab-main-window.ui +@@ -44,362 +44,370 @@ + + + +-