Bug#595132: unblock: gnome-disk-utility/2.30.1-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package gnome-disk-utility
I contains a single important bug fix (#589502) which makes g-d-u more
usable on small screens.
It has been successfully built on all archs, is 12 days old and has no new
bugs.
debdiff is attached.
Thanks for considering,
Michael
unblock gnome-disk-utility/2.30.1-2
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
debian/changelog | 10 ++++
debian/control | 7 +--
.../patches/00git-palimpsest-small-screens.patch | 44 ++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 1 -
debian/source/format | 1 +
6 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 95273cf..4192495 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gnome-disk-utility (2.30.1-2) unstable; urgency=low
+
+ * Add 00git-palimpsest-small-screens.patch: Add scrollbars to the right pane
+ if the window is smaller than the contents. This makes palimpsest working
+ on small screens. (Closes: #589502, LP: #414107, GNOME #594088)
+ * debian/control: Bump Standards-Version to 3.9.1 (no changes necessary).
+ * Convert source package to "3.0 (quilt)" format.
+
+ -- Martin Pitt <mpitt@debian.org> Thu, 19 Aug 2010 14:55:27 +0200
+
gnome-disk-utility (2.30.1-1) unstable; urgency=low
* New upstream release:
diff --git a/debian/control b/debian/control
index b548e3d..b92ada9 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Michael Biebl <biebl@debian.org>, Martin Pitt <mpitt@debian.org>
Build-Depends: debhelper (>= 7),
cdbs,
autotools-dev,
- quilt,
pkg-config,
lsb-release,
xsltproc,
@@ -16,14 +15,14 @@ Build-Depends: debhelper (>= 7),
libdbus-glib-1-dev (>= 0.76),
libglib2.0-dev (>= 2.22),
libgtk2.0-dev (>= 2.17.2),
- udisks (>= 1.0.0~),
+ udisks (>= 1.0.0),
libatasmart-dev (>= 0.14),
libgnome-keyring-dev (>= 2.22),
libunique-dev (>= 1.0),
libnotify-dev (>= 0.3.0),
libnautilus-extension-dev (>= 2.24),
libavahi-ui-dev (>= 0.6.25)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-utopia/gnome-disk-utility.git
Vcs-Browser: http://git.debian.org/?p=pkg-utopia/gnome-disk-utility.git;a=summary
Homepage: http://git.gnome.org/cgit/gnome-disk-utility/
@@ -44,7 +43,7 @@ Description: manage and configure disk drives and media
Package: libgdu0
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, udisks (>= 1.0.0~), udisks (<< 1.1.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, udisks (>= 1.0.0), udisks (<< 1.1.0)
Description: GObject based Disk Utility Library
The gnome-disk-utility library provides an user-space interface to the
udisks objects and properties (such as drives, volumes, SMART data),
diff --git a/debian/patches/00git-palimpsest-small-screens.patch b/debian/patches/00git-palimpsest-small-screens.patch
new file mode 100644
index 0000000..ba5ed97
--- /dev/null
+++ b/debian/patches/00git-palimpsest-small-screens.patch
@@ -0,0 +1,44 @@
+From dcfdaad239372516a4f4826349afe4e613aaedec Mon Sep 17 00:00:00 2001
+From: David Yu-Chia Chang <dchang@novell.com>
+Date: Thu, 19 Aug 2010 10:38:32 +0200
+Subject: Bug 594088 - Palimpsest GUI impossible to use on small screens
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add scrollbars to the right pane if the window is too small to fit the entire
+content.
+
+Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
+---
+ src/palimpsest/gdu-shell.c | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/src/palimpsest/gdu-shell.c b/src/palimpsest/gdu-shell.c
+index d530373..62bcacd 100644
+--- a/src/palimpsest/gdu-shell.c
++++ b/src/palimpsest/gdu-shell.c
+@@ -1096,6 +1096,7 @@ create_window (GduShell *shell)
+ GtkAccelGroup *accel_group;
+ GtkWidget *hpane;
+ GtkWidget *tree_view_scrolled_window;
++ GtkWidget *hpane_right_scrolled_window;
+ GtkTreeSelection *select;
+ GtkWidget *label;
+ GtkTreeViewColumn *column;
+@@ -1153,7 +1154,11 @@ create_window (GduShell *shell)
+
+ shell->priv->sections_vbox = gtk_vbox_new (FALSE, 12);
+ gtk_container_set_border_width (GTK_CONTAINER (shell->priv->sections_vbox), 6);
+- gtk_box_pack_start (GTK_BOX (vbox2), shell->priv->sections_vbox, TRUE, TRUE, 0);
++ hpane_right_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
++ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (hpane_right_scrolled_window),
++ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
++ gtk_scrolled_window_add_with_viewport(hpane_right_scrolled_window, shell->priv->sections_vbox);
++ gtk_box_pack_start (GTK_BOX (vbox2), hpane_right_scrolled_window, TRUE, TRUE, 0);
+
+ /* setup and add horizontal pane */
+ hpane = gtk_hpaned_new ();
+--
+1.7.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 5077d09..703c38d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
# Debian patches for gnome-disk-utility
+00git-palimpsest-small-screens.patch
01_delay_autostart.patch
diff --git a/debian/rules b/debian/rules
index 2a26990..82bc441 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
Reply to: