r26437 - in /desktop/experimental/libgnome-media-profiles/debian: ./ patches/

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Wed Jan 26 00:18:49 UTC 2011


Author: pochu
Date: Wed Jan 26 00:18:45 2011
New Revision: 26437

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26437
Log:
* d/patches/0001-build-Add-missing-uidir-definition.patch,
  d/patches/0002-has_separator-is-gone.patch,
  d/patches/0003-Set-new-profile-dialog-s-parent-when-first-created.patch:
  + Patches from upstream git, fix gnome-audio-profiles-properties
    not able to edit profiles. Closes: #611103.
* debian/control.in,
  debian/rules:
  + Run autoreconf during the build, needed by one patch.
* debian/rules:
  + Include utils.mk and remove gnome-version.mk include.

Added:
    desktop/experimental/libgnome-media-profiles/debian/patches/
    desktop/experimental/libgnome-media-profiles/debian/patches/0001-build-Add-missing-uidir-definition.patch
    desktop/experimental/libgnome-media-profiles/debian/patches/0002-has_separator-is-gone.patch
    desktop/experimental/libgnome-media-profiles/debian/patches/0003-Set-new-profile-dialog-s-parent-when-first-created.patch
    desktop/experimental/libgnome-media-profiles/debian/patches/series
Modified:
    desktop/experimental/libgnome-media-profiles/debian/changelog
    desktop/experimental/libgnome-media-profiles/debian/control
    desktop/experimental/libgnome-media-profiles/debian/control.in
    desktop/experimental/libgnome-media-profiles/debian/rules

Modified: desktop/experimental/libgnome-media-profiles/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnome-media-profiles/debian/changelog?rev=26437&op=diff
==============================================================================
--- desktop/experimental/libgnome-media-profiles/debian/changelog [utf-8] (original)
+++ desktop/experimental/libgnome-media-profiles/debian/changelog [utf-8] Wed Jan 26 00:18:45 2011
@@ -1,3 +1,18 @@
+libgnome-media-profiles (2.91.2-3) experimental; urgency=low
+
+  * d/patches/0001-build-Add-missing-uidir-definition.patch,
+    d/patches/0002-has_separator-is-gone.patch,
+    d/patches/0003-Set-new-profile-dialog-s-parent-when-first-created.patch:
+    + Patches from upstream git, fix gnome-audio-profiles-properties
+      not able to edit profiles. Closes: #611103.
+  * debian/control.in,
+    debian/rules:
+    + Run autoreconf during the build, needed by one patch.
+  * debian/rules:
+    + Include utils.mk and remove gnome-version.mk include.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 26 Jan 2011 00:17:28 +0000
+
 libgnome-media-profiles (2.91.2-2) experimental; urgency=low
 
   * debian/control.in:

Modified: desktop/experimental/libgnome-media-profiles/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnome-media-profiles/debian/control?rev=26437&op=diff
==============================================================================
--- desktop/experimental/libgnome-media-profiles/debian/control [utf-8] (original)
+++ desktop/experimental/libgnome-media-profiles/debian/control [utf-8] Wed Jan 26 00:18:45 2011
@@ -11,6 +11,7 @@
 Build-Depends: debhelper (>= 5),
                cdbs,
                gnome-pkg-tools (>= 0.11.3),
+               dh-autoreconf,
                libgtk3.0-dev (>= 2.99.1),
                libglib2.0-dev (>= 2.27),
                libgstreamer0.10-dev,

Modified: desktop/experimental/libgnome-media-profiles/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnome-media-profiles/debian/control.in?rev=26437&op=diff
==============================================================================
--- desktop/experimental/libgnome-media-profiles/debian/control.in [utf-8] (original)
+++ desktop/experimental/libgnome-media-profiles/debian/control.in [utf-8] Wed Jan 26 00:18:45 2011
@@ -6,6 +6,7 @@
 Build-Depends: debhelper (>= 5),
                cdbs,
                gnome-pkg-tools (>= 0.11.3),
+               dh-autoreconf,
                libgtk3.0-dev (>= 2.99.1),
                libglib2.0-dev (>= 2.27),
                libgstreamer0.10-dev,

Added: desktop/experimental/libgnome-media-profiles/debian/patches/0001-build-Add-missing-uidir-definition.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnome-media-profiles/debian/patches/0001-build-Add-missing-uidir-definition.patch?rev=26437&op=file
==============================================================================
--- desktop/experimental/libgnome-media-profiles/debian/patches/0001-build-Add-missing-uidir-definition.patch (added)
+++ desktop/experimental/libgnome-media-profiles/debian/patches/0001-build-Add-missing-uidir-definition.patch [utf-8] Wed Jan 26 00:18:45 2011
@@ -1,0 +1,28 @@
+From ef4188dd136770aa32aa96129a47f100ca5aac09 Mon Sep 17 00:00:00 2001
+From: Bill Nottingham <notting at redhat.com>
+Date: Thu, 13 Jan 2011 16:43:29 +0000
+Subject: [PATCH 1/3] build: Add missing uidir definition
+
+So that the new button works.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=636346
+---
+ libgnome-media-profiles/Makefile.am |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/libgnome-media-profiles/Makefile.am b/libgnome-media-profiles/Makefile.am
+index 3ab61ce..99b10e2 100644
+--- a/libgnome-media-profiles/Makefile.am
++++ b/libgnome-media-profiles/Makefile.am
+@@ -1,6 +1,8 @@
+ bin_PROGRAMS = gnome-audio-profiles-properties
+ noinst_PROGRAMS =
+ 
++uidir = $(pkgdatadir)
++
+ defines = \
+ 	-DG_LOG_DOMAIN=\"gnome-media-profiles\" \
+ 	-DDATADIR="\"$(pkgdatadir)\"" \
+-- 
+1.7.2.3
+

Added: desktop/experimental/libgnome-media-profiles/debian/patches/0002-has_separator-is-gone.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnome-media-profiles/debian/patches/0002-has_separator-is-gone.patch?rev=26437&op=file
==============================================================================
--- desktop/experimental/libgnome-media-profiles/debian/patches/0002-has_separator-is-gone.patch (added)
+++ desktop/experimental/libgnome-media-profiles/debian/patches/0002-has_separator-is-gone.patch [utf-8] Wed Jan 26 00:18:45 2011
@@ -1,0 +1,37 @@
+From e71bdb952ca15c10734275e0eacb478fc747cb4f Mon Sep 17 00:00:00 2001
+From: Yanko Kaneti <yaneti at declera.com>
+Date: Tue, 11 Jan 2011 21:34:41 +0200
+Subject: [PATCH 2/3] has_separator is gone
+
+---
+ data/gnome-audio-profile-edit.ui |    1 -
+ data/gnome-audio-profile-new.ui  |    1 -
+ 2 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/data/gnome-audio-profile-edit.ui b/data/gnome-audio-profile-edit.ui
+index 95f51ec..b3032ba 100644
+--- a/data/gnome-audio-profile-edit.ui
++++ b/data/gnome-audio-profile-edit.ui
+@@ -5,7 +5,6 @@
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">Edit Audio Profile</property>
+     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+-    <property name="has_separator">False</property>
+     <child internal-child="vbox">
+       <object class="GtkVBox" id="profile-edit-content">
+         <property name="visible">True</property>
+diff --git a/data/gnome-audio-profile-new.ui b/data/gnome-audio-profile-new.ui
+index 39035a5..16ca482 100644
+--- a/data/gnome-audio-profile-new.ui
++++ b/data/gnome-audio-profile-new.ui
+@@ -17,7 +17,6 @@
+     <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+     <property name="focus_on_map">True</property>
+     <property name="urgency_hint">False</property>
+-    <property name="has_separator">False</property>
+     <child internal-child="vbox">
+       <object class="GtkVBox" id="dialog-vbox5">
+         <property name="visible">True</property>
+-- 
+1.7.2.3
+

Added: desktop/experimental/libgnome-media-profiles/debian/patches/0003-Set-new-profile-dialog-s-parent-when-first-created.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnome-media-profiles/debian/patches/0003-Set-new-profile-dialog-s-parent-when-first-created.patch?rev=26437&op=file
==============================================================================
--- desktop/experimental/libgnome-media-profiles/debian/patches/0003-Set-new-profile-dialog-s-parent-when-first-created.patch (added)
+++ desktop/experimental/libgnome-media-profiles/debian/patches/0003-Set-new-profile-dialog-s-parent-when-first-created.patch [utf-8] Wed Jan 26 00:18:45 2011
@@ -1,0 +1,25 @@
+From 4ef1e2e76161435c5024010650755cf92af6fdab Mon Sep 17 00:00:00 2001
+From: Yanko Kaneti <yaneti at declera.com>
+Date: Tue, 11 Jan 2011 21:35:27 +0200
+Subject: [PATCH 3/3] Set new profile dialog's parent when first created
+
+---
+ libgnome-media-profiles/audio-profiles-edit.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/libgnome-media-profiles/audio-profiles-edit.c b/libgnome-media-profiles/audio-profiles-edit.c
+index 77489ad..ba5c207 100644
+--- a/libgnome-media-profiles/audio-profiles-edit.c
++++ b/libgnome-media-profiles/audio-profiles-edit.c
+@@ -957,6 +957,8 @@ gm_audio_profiles_edit_new_profile (GMAudioProfilesEdit *dialog,
+     gtk_size_group_add_widget (size_group_labels, wl);
+ #endif
+ 
++    gtk_window_set_transient_for (GTK_WINDOW (dialog->priv->new_profile_dialog),
++                                  transient_parent);
+ 
+     /* gtk_dialog_set_default_response (GTK_DIALOG (dialog->priv->new_profile_dialog), GTK_RESPONSE_CREATE); */
+ 
+-- 
+1.7.2.3
+

Added: desktop/experimental/libgnome-media-profiles/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnome-media-profiles/debian/patches/series?rev=26437&op=file
==============================================================================
--- desktop/experimental/libgnome-media-profiles/debian/patches/series (added)
+++ desktop/experimental/libgnome-media-profiles/debian/patches/series [utf-8] Wed Jan 26 00:18:45 2011
@@ -1,0 +1,3 @@
+0001-build-Add-missing-uidir-definition.patch
+0002-has_separator-is-gone.patch
+0003-Set-new-profile-dialog-s-parent-when-first-created.patch

Modified: desktop/experimental/libgnome-media-profiles/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnome-media-profiles/debian/rules?rev=26437&op=diff
==============================================================================
--- desktop/experimental/libgnome-media-profiles/debian/rules [utf-8] (original)
+++ desktop/experimental/libgnome-media-profiles/debian/rules [utf-8] Wed Jan 26 00:18:45 2011
@@ -1,9 +1,10 @@
 #! /usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DEB_DH_MAKESHLIBS_ARGS_ALL += -V -- -c4




More information about the pkg-gnome-commits mailing list