[SCM] Debian packaging for libhildon. branch, debian, updated. debian/2.1.34.debian.1-7-11-g4c1dd2d

Jonny Lamb jonny at debian.org
Tue Aug 3 19:42:37 UTC 2010


The following commit has been merged in the debian branch:
commit c33cdaffe1fef8d98185c7838ea1454c84546377
Author: Jonny Lamb <jonny at debian.org>
Date:   Sun Aug 1 16:10:34 2010 -0400

    debian/patches/: 0004-Define-HildonUIMode.patch: Added to allow this to build.
    
    Signed-off-by: Jonny Lamb <jonny at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 3b3be54..62b1efc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,12 @@ libhildon (2.2.19.debian.1-1) UNRELEASED; urgency=low
   * debian/control:
     + Upped build-dep version on GTK.
   * debian/update-patches.mk: Added -N option to git format-patch.
-  * debian/patches/: Updated all patches now that src moved to hildon, and
-    to remove the annoying numbers.
+  * debian/patches/:
+    + Updated all patches now that src moved to hildon, and to
+      remove the annoying numbers.
+    + 0004-Define-HildonUIMode.patch: Added to allow this to build.
 
- -- Jonny Lamb <jonny at debian.org>  Sun, 01 Aug 2010 15:26:03 -0400
+ -- Jonny Lamb <jonny at debian.org>  Sun, 01 Aug 2010 16:09:46 -0400
 
 libhildon (2.1.34.debian.1-7) unstable; urgency=low
 
diff --git a/debian/patches/0004-Define-HildonUIMode.patch b/debian/patches/0004-Define-HildonUIMode.patch
new file mode 100644
index 0000000..637da31
--- /dev/null
+++ b/debian/patches/0004-Define-HildonUIMode.patch
@@ -0,0 +1,55 @@
+From f125ce94896125b8ed3ed891810740ea2c7f0f12 Mon Sep 17 00:00:00 2001
+From: Jonny Lamb <jonny at debian.org>
+Date: Sun, 1 Aug 2010 16:09:18 -0400
+Subject: [PATCH] Define HildonUIMode.
+
+whut?
+
+Signed-off-by: Jonny Lamb <jonny at debian.org>
+---
+ hildon/hildon-gtk.h            |    6 ++++++
+ hildon/hildon-touch-selector.c |    1 +
+ hildon/hildon-touch-selector.h |    1 +
+ 3 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/hildon/hildon-gtk.h b/hildon/hildon-gtk.h
+index 1037885..9b31771 100644
+--- a/hildon/hildon-gtk.h
++++ b/hildon/hildon-gtk.h
+@@ -32,6 +32,12 @@ typedef enum {
+    HILDON_SIZE_AUTO                             = (HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_AUTO_HEIGHT)
+ }                                               HildonSizeType;
+ 
++typedef enum
++{
++  HILDON_UI_MODE_NORMAL,
++  HILDON_UI_MODE_EDIT
++} HildonUIMode;
++
+ void
+ hildon_gtk_widget_set_theme_size                (GtkWidget      *widget,
+                                                  HildonSizeType  size);
+diff --git a/hildon/hildon-touch-selector.c b/hildon/hildon-touch-selector.c
+index 6c173eb..e16b3b5 100644
+--- a/hildon/hildon-touch-selector.c
++++ b/hildon/hildon-touch-selector.c
+@@ -176,6 +176,7 @@
+ 
+ #include "hildon-gtk.h"
+ 
++#include "hildon-enum-types.h"
+ #include "hildon-pannable-area.h"
+ #include "hildon-touch-selector.h"
+ #include "hildon-touch-selector-private.h"
+diff --git a/hildon/hildon-touch-selector.h b/hildon/hildon-touch-selector.h
+index eae1add..ec0e9a8 100644
+--- a/hildon/hildon-touch-selector.h
++++ b/hildon/hildon-touch-selector.h
+@@ -22,6 +22,7 @@
+ #define                                         __HILDON_TOUCH_SELECTOR_H__
+ 
+ #include                                        <gtk/gtk.h>
++#include                                        "hildon-gtk.h"
+ #include                                        "hildon-touch-selector-column.h"
+ 
+ G_BEGIN_DECLS
diff --git a/debian/patches/series b/debian/patches/series
index 1d821bb..243f579 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Revert-hildon_gtk_widget_set_theme_size-removal.patch
 0002-Be-sure-to-link-to-Xlib.patch
 0003-Only-export-symbols-with-hildon_-prefix.patch
+0004-Define-HildonUIMode.patch

-- 
Debian packaging for libhildon.



More information about the pkg-maemo-commits mailing list