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

Tue Aug 3 19:42:36 UTC 2010

The following commit has been merged in the debian branch:
commit 84260a4c4e652880d24ceb4567cacb1c8fb9c83d
Author: Jonny Lamb <jonny at debian.org>
Date:   Sun Aug 1 15:26:40 2010 -0400

    debian/patches/: Updated all patches now that src moved to hildon, and to remove the annoying numbers.

diff --git a/debian/changelog b/debian/changelog
index 449bcad..0f78c7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ 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.
 
- -- Jonny Lamb <jonny at debian.org>  Sun, 01 Aug 2010 15:25:05 -0400
+ -- Jonny Lamb <jonny at debian.org>  Sun, 01 Aug 2010 15:26:03 -0400
 
 libhildon (2.1.34.debian.1-7) unstable; urgency=low
 
diff --git a/debian/patches/0001-Revert-hildon_gtk_widget_set_theme_size-removal.patch b/debian/patches/0001-Revert-hildon_gtk_widget_set_theme_size-removal.patch
index 18c8be4..93986b1 100644
--- a/debian/patches/0001-Revert-hildon_gtk_widget_set_theme_size-removal.patch
+++ b/debian/patches/0001-Revert-hildon_gtk_widget_set_theme_size-removal.patch
@@ -1,21 +1,21 @@
-From 36f981a4c9c66e306e97d5a16eaf925e7cea6eae Mon Sep 17 00:00:00 2001
+From 3bf57c68088c350feb32c0b5b9ab284fa96027e4 Mon Sep 17 00:00:00 2001
 From: Riku Voipio <riku.voipio at iki.fi>
 Date: Sun, 15 Mar 2009 17:24:42 +0200
-Subject: [PATCH 1/3] Revert hildon_gtk_widget_set_theme_size removal
+Subject: [PATCH] Revert hildon_gtk_widget_set_theme_size removal
 
 The upstream idea of moving hildon_gtk_widget_set_theme_size to
 gtk is pure crack.
 ---
- src/hildon-dialog.c |    7 ++++++
- src/hildon-gtk.c    |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++
- src/hildon-gtk.h    |   16 ++++++++++++++
+ hildon/hildon-dialog.c |    7 ++++++
+ hildon/hildon-gtk.c    |   57 ++++++++++++++++++++++++++++++++++++++++++++++++
+ hildon/hildon-gtk.h    |   16 +++++++++++++
  3 files changed, 80 insertions(+), 0 deletions(-)
 
-diff --git a/src/hildon-dialog.c b/src/hildon-dialog.c
-index 4d0e68c..d4ade35 100644
---- a/src/hildon-dialog.c
-+++ b/src/hildon-dialog.c
-@@ -65,6 +65,9 @@
+diff --git a/hildon/hildon-dialog.c b/hildon/hildon-dialog.c
+index 1a3977c..152e1a2 100644
+--- a/hildon/hildon-dialog.c
++++ b/hildon/hildon-dialog.c
+@@ -74,6 +74,9 @@
  
  G_DEFINE_TYPE (HildonDialog, hildon_dialog, GTK_TYPE_DIALOG);
  
@@ -25,7 +25,7 @@ index 4d0e68c..d4ade35 100644
  static void
  hildon_dialog_class_init                        (HildonDialogClass *dialog_class)
  {
-@@ -180,7 +183,11 @@ hildon_dialog_add_button                        (HildonDialog *dialog,
+@@ -189,7 +192,11 @@ hildon_dialog_add_button                        (HildonDialog *dialog,
  {
      GtkWidget *button;
      button = gtk_dialog_add_button (GTK_DIALOG (dialog), button_text, response_id);
@@ -37,13 +37,13 @@ index 4d0e68c..d4ade35 100644
  }
  
  /**
-diff --git a/src/hildon-gtk.c b/src/hildon-gtk.c
-index e64bf0f..e25b721 100644
---- a/src/hildon-gtk.c
-+++ b/src/hildon-gtk.c
-@@ -29,6 +29,63 @@
- 
- #include "hildon-gtk.h"
+diff --git a/hildon/hildon-gtk.c b/hildon/hildon-gtk.c
+index 6cc8d81..91a49fc 100644
+--- a/hildon/hildon-gtk.c
++++ b/hildon/hildon-gtk.c
+@@ -31,6 +31,63 @@
+ #include "hildon-edit-toolbar-private.h"
+ #include "hildon-private.h"
  
 +#ifndef MAEMO_GTK
 +
@@ -105,15 +105,15 @@ index e64bf0f..e25b721 100644
  static void
  image_visible_changed_cb                        (GtkWidget  *image,
                                                   GParamSpec *arg1,
-diff --git a/src/hildon-gtk.h b/src/hildon-gtk.h
-index 15dd935..fc36d0e 100644
---- a/src/hildon-gtk.h
-+++ b/src/hildon-gtk.h
+diff --git a/hildon/hildon-gtk.h b/hildon/hildon-gtk.h
+index 2861f58..1037885 100644
+--- a/hildon/hildon-gtk.h
++++ b/hildon/hildon-gtk.h
 @@ -21,6 +21,22 @@
  
  G_BEGIN_DECLS
  
-+#ifndef MAEMO_GTK 
++#ifndef MAEMO_GTK
 +typedef enum {
 +   HILDON_SIZE_AUTO_WIDTH                       = 0 << 0, /* set to automatic width */
 +   HILDON_SIZE_HALFSCREEN_WIDTH                 = 1 << 0, /* set to 50% screen width */
diff --git a/debian/patches/0002-Be-sure-to-link-to-Xlib.patch b/debian/patches/0002-Be-sure-to-link-to-Xlib.patch
index 9402db1..65047d9 100644
--- a/debian/patches/0002-Be-sure-to-link-to-Xlib.patch
+++ b/debian/patches/0002-Be-sure-to-link-to-Xlib.patch
@@ -1,19 +1,19 @@
-From 11952aa83ccd2e446166a39f41ae18e42a60afb9 Mon Sep 17 00:00:00 2001
+From c54466c08b7d5b48ca161cd1c14b29efcf42d32e Mon Sep 17 00:00:00 2001
 From: Jonny Lamb <jonny at debian.org>
 Date: Tue, 26 Jan 2010 10:07:46 +0000
-Subject: [PATCH 2/3] Be sure to link to Xlib.
+Subject: [PATCH] Be sure to link to Xlib.
 
 Signed-off-by: Jonny Lamb <jonny at debian.org>
 ---
- configure.ac    |    4 ++++
- src/Makefile.am |    2 ++
+ configure.ac       |    4 ++++
+ hildon/Makefile.am |    2 ++
  2 files changed, 6 insertions(+), 0 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 079de7e..25c0169 100644
+index 24fdfc1..8698249 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -42,6 +42,10 @@ AC_SUBST(GTK_LIBS)
+@@ -43,6 +43,10 @@ AC_SUBST(GTK_LIBS)
  AC_SUBST(GTK_CFLAGS)
  AC_SUBST(GTK_VERSION)
  
@@ -24,11 +24,11 @@ index 079de7e..25c0169 100644
  # libcanberra is needed for the hildon-note sounds.
  
  PKG_CHECK_MODULES(CANBERRA, libcanberra)
-diff --git a/src/Makefile.am b/src/Makefile.am
-index a861afa..f131a62 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -15,12 +15,14 @@ lib_LTLIBRARIES = libhildon- at API_VERSION_MAJOR@.la
+diff --git a/hildon/Makefile.am b/hildon/Makefile.am
+index 10f1c91..953f4f8 100644
+--- a/hildon/Makefile.am
++++ b/hildon/Makefile.am
+@@ -14,12 +14,14 @@ lib_LTLIBRARIES = libhildon- at API_VERSION_MAJOR@.la
  libhildon_ at API_VERSION_MAJOR@_la_LDFLAGS = $(HILDON_WIDGETS_LT_LDFLAGS)
  
  libhildon_ at API_VERSION_MAJOR@_la_LIBADD = \
diff --git a/debian/patches/0003-Only-export-symbols-with-hildon_-prefix.patch b/debian/patches/0003-Only-export-symbols-with-hildon_-prefix.patch
index 541b5b3..f5d210f 100644
--- a/debian/patches/0003-Only-export-symbols-with-hildon_-prefix.patch
+++ b/debian/patches/0003-Only-export-symbols-with-hildon_-prefix.patch
@@ -1,18 +1,18 @@
-From fc3c0af0d0d4041ceadebcd7568302a863b219de Mon Sep 17 00:00:00 2001
+From 2581fb3294ac4354e88cb9ec5c0a1d96323e5744 Mon Sep 17 00:00:00 2001
 From: Jonny Lamb <jonny at debian.org>
 Date: Tue, 26 Jan 2010 17:24:52 +0000
-Subject: [PATCH 3/3] Only export symbols with "hildon_" prefix.
+Subject: [PATCH] Only export symbols with "hildon_" prefix.
 
 Signed-off-by: Jonny Lamb <jonny at debian.org>
 ---
- src/Makefile.am |    3 ++-
+ hildon/Makefile.am |    3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)
 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index f131a62..f7a9ce4 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -12,7 +12,8 @@ EXTRA_DIST = hildon-marshalers.list
+diff --git a/hildon/Makefile.am b/hildon/Makefile.am
+index 953f4f8..1ca7faf 100644
+--- a/hildon/Makefile.am
++++ b/hildon/Makefile.am
+@@ -11,7 +11,8 @@ EXTRA_DIST = hildon-marshalers.list
  
  lib_LTLIBRARIES = libhildon- at API_VERSION_MAJOR@.la
  

-- 
Debian packaging for libhildon.

