r17800 - in /packages/experimental/devhelp/debian: changelog control control.in patches/00install-devhelp-el.patch patches/01_do_not_clober_global_w_on_el.patch patches/02_fix_alpha_ftbfs.patch patches/04_close_correct_tab.patch patches/series rules
bradsmith at users.alioth.debian.org
bradsmith at users.alioth.debian.org
Tue Dec 2 21:23:23 UTC 2008
Author: bradsmith
Date: Tue Dec 2 21:23:23 2008
New Revision: 17800
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17800
Log:
* New upstream release.
* debian/patches
- 00install-devhelp-el.patch - Refresh.
- 01_do_not_clober_global_w_on_el.patch - Refresh.
- 02_fix_alpha_ftbfs.patch - Removed. (No longer relevant)
- 04_close_correct_tab.patch - Refresh.
* Remove unrecognised configure flags (--disable-install-schemas,
--with-gecko)
* Correct dependencies.
Removed:
packages/experimental/devhelp/debian/patches/02_fix_alpha_ftbfs.patch
Modified:
packages/experimental/devhelp/debian/changelog
packages/experimental/devhelp/debian/control
packages/experimental/devhelp/debian/control.in
packages/experimental/devhelp/debian/patches/00install-devhelp-el.patch
packages/experimental/devhelp/debian/patches/01_do_not_clober_global_w_on_el.patch
packages/experimental/devhelp/debian/patches/04_close_correct_tab.patch
packages/experimental/devhelp/debian/patches/series
packages/experimental/devhelp/debian/rules
Modified: packages/experimental/devhelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/devhelp/debian/changelog?rev=17800&op=diff
==============================================================================
--- packages/experimental/devhelp/debian/changelog (original)
+++ packages/experimental/devhelp/debian/changelog Tue Dec 2 21:23:23 2008
@@ -1,8 +1,20 @@
-devhelp (0.21-3) UNRELEASED; urgency=low
-
+devhelp (0.22-1) experimental; urgency=low
+
+ [ Loic Minier ]
* Fix bogus checks in preinst and clean it up.
- -- Loic Minier <lool at dooz.org> Fri, 28 Nov 2008 20:42:21 +0100
+ [ Bradley Smith ]
+ * New upstream release.
+ * debian/patches
+ - 00install-devhelp-el.patch - Refresh.
+ - 01_do_not_clober_global_w_on_el.patch - Refresh.
+ - 02_fix_alpha_ftbfs.patch - Removed. (No longer relevant)
+ - 04_close_correct_tab.patch - Refresh.
+ * Remove unrecognised configure flags (--disable-install-schemas,
+ --with-gecko)
+ * Correct dependencies.
+
+ -- Bradley Smith <bradsmith at debian.org> Tue, 02 Dec 2008 20:54:53 +0000
devhelp (0.21-2) unstable; urgency=low
Modified: packages/experimental/devhelp/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/devhelp/debian/control?rev=17800&op=diff
==============================================================================
--- packages/experimental/devhelp/debian/control (original)
+++ packages/experimental/devhelp/debian/control Tue Dec 2 21:23:23 2008
@@ -2,15 +2,16 @@
Section: devel
Priority: optional
Maintainer: Bradley Smith <bradsmith at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: cdbs,
quilt,
debhelper (>= 5),
+ intltool,
libgtk2.0-dev (>= 2.8.17),
libglade2-dev (>= 1:2.4.0),
libgconf2-dev (>= 2.6.0),
+ libwebkit-dev,
libwnck-dev (>= 2.14.1),
- xulrunner-dev (>= 1.9~rc1),
libxml-parser-perl,
gnome-pkg-tools,
dpkg-dev (>= 1.13.19),
@@ -25,7 +26,6 @@
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
- xulrunner-1.9 (>= 1.9~rc1),
devhelp-common (= ${source:Version})
Conflicts: devhelp (<< 0.8.1-1)
Replaces: devhelp (<< 0.9-5)
@@ -42,6 +42,7 @@
libdevhelp-1-0 (= ${binary:Version}),
libwnck-dev (>= 2.14.1),
libgconf2-dev (>= 2.6.0),
+ libwebkit-dev,
libglade2-dev (>= 1:2.4.0-1)
Description: Library providing documentation browser functionality (development)
This library provides embedable widgets from the Devhelp program to
@@ -56,8 +57,7 @@
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: libgtk2.0-doc (>= 2.2.0),
libglib2.0-doc (>= 2.2.0),
- libpango1.0-doc,
- xulrunner-1.9-gnome-support
+ libpango1.0-doc
Conflicts: devhelp-books (<= 0.2-8),
devhelp-book-autotools (<= 0.2-8),
devhelp-book-binutils (<= 0.2-8),
Modified: packages/experimental/devhelp/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/devhelp/debian/control.in?rev=17800&op=diff
==============================================================================
--- packages/experimental/devhelp/debian/control.in (original)
+++ packages/experimental/devhelp/debian/control.in Tue Dec 2 21:23:23 2008
@@ -6,11 +6,12 @@
Build-Depends: cdbs,
quilt,
debhelper (>= 5),
+ intltool,
libgtk2.0-dev (>= 2.8.17),
libglade2-dev (>= 1:2.4.0),
libgconf2-dev (>= 2.6.0),
+ libwebkit-dev,
libwnck-dev (>= 2.14.1),
- xulrunner-dev (>= 1.9~rc1),
libxml-parser-perl,
gnome-pkg-tools,
dpkg-dev (>= 1.13.19),
@@ -25,7 +26,6 @@
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
- xulrunner-1.9 (>= 1.9~rc1),
devhelp-common (= ${source:Version})
Conflicts: devhelp (<< 0.8.1-1)
Replaces: devhelp (<< 0.9-5)
@@ -42,6 +42,7 @@
libdevhelp-1-0 (= ${binary:Version}),
libwnck-dev (>= 2.14.1),
libgconf2-dev (>= 2.6.0),
+ libwebkit-dev,
libglade2-dev (>= 1:2.4.0-1)
Description: Library providing documentation browser functionality (development)
This library provides embedable widgets from the Devhelp program to
@@ -56,8 +57,7 @@
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: libgtk2.0-doc (>= 2.2.0),
libglib2.0-doc (>= 2.2.0),
- libpango1.0-doc,
- xulrunner-1.9-gnome-support
+ libpango1.0-doc
Conflicts: devhelp-books (<= 0.2-8),
devhelp-book-autotools (<= 0.2-8),
devhelp-book-binutils (<= 0.2-8),
Modified: packages/experimental/devhelp/debian/patches/00install-devhelp-el.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/devhelp/debian/patches/00install-devhelp-el.patch?rev=17800&op=diff
==============================================================================
--- packages/experimental/devhelp/debian/patches/00install-devhelp-el.patch (original)
+++ packages/experimental/devhelp/debian/patches/00install-devhelp-el.patch Tue Dec 2 21:23:23 2008
@@ -1,11 +1,11 @@
--- a/misc/devhelp.el~ 2003-06-29 10:24:17.000000000 -0300
+++ b/misc/devhelp.el 2004-03-21 17:34:01.000000000 -0300
-@@ -8,7 +8,7 @@
- )
-
- ; Example: bind F7 to start devhelp and search for the word at the point.
--; (global-set-key [f7] 'devhelp-word-at-point)
+@@ -35,7 +35,7 @@
+ ;; Examples:
+ ;;
+ ;; Bind F7 to start devhelp and search for the word at the point.
+-;; (global-set-key [f7] 'devhelp-word-at-point)
+(global-set-key [f11] 'devhelp-word-at-point)
-
- ; Tips: use -g WIDTHxHEIGHT+XOFF+YOFF to set the size and position of
- ; the window
+ ;;
+ ;; Bind F6 to enable the automatic assistant.
+ ;; (global-set-key [f6] 'devhelp-toggle-automatic-assistant)
Modified: packages/experimental/devhelp/debian/patches/01_do_not_clober_global_w_on_el.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/devhelp/debian/patches/01_do_not_clober_global_w_on_el.patch?rev=17800&op=diff
==============================================================================
--- packages/experimental/devhelp/debian/patches/01_do_not_clober_global_w_on_el.patch (original)
+++ packages/experimental/devhelp/debian/patches/01_do_not_clober_global_w_on_el.patch Tue Dec 2 21:23:23 2008
@@ -1,12 +1,12 @@
--- a/misc/devhelp.el~ 2003-06-29 10:24:17.000000000 -0300
+++ b/misc/devhelp.el 2005-08-12 22:11:59.270346712 -0300
-@@ -3,8 +3,7 @@
+@@ -4,8 +4,7 @@
(defun devhelp-word-at-point ()
- "runs devhelp"
+ "Searches for the current word in Devhelp"
(interactive)
- (setq w (current-word))
- (start-process-shell-command "devhelp" nil "devhelp" "-s" w)
+ (start-process-shell-command "devhelp" nil "devhelp" "-s" (current-word))
+ (set-process-query-on-exit-flag (get-process "devhelp") nil)
)
-
- ; Example: bind F7 to start devhelp and search for the word at the point.
+ (defun devhelp-assistant-word-at-point ()
Modified: packages/experimental/devhelp/debian/patches/04_close_correct_tab.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/devhelp/debian/patches/04_close_correct_tab.patch?rev=17800&op=diff
==============================================================================
--- packages/experimental/devhelp/debian/patches/04_close_correct_tab.patch (original)
+++ packages/experimental/devhelp/debian/patches/04_close_correct_tab.patch Tue Dec 2 21:23:23 2008
@@ -1,77 +1,70 @@
-diff -Naur devhelp-0.20/src/dh-window.c devhelp-0.20.new/src/dh-window.c
---- devhelp-0.20/src/dh-window.c 2008-09-08 08:29:57.000000000 +0100
-+++ devhelp-0.20.new/src/dh-window.c 2008-09-17 16:32:09.000000000 +0100
-@@ -99,7 +99,8 @@
- static void window_activate_new_tab (GtkAction *action,
- DhWindow *window);
- static void window_activate_close (GtkAction *action,
-- DhWindow *window);
-+ DhWindow *window,
-+ GtkWidget *frame);
- static void window_activate_quit (GtkAction *action,
- DhWindow *window);
- static void window_activate_copy (GtkAction *action,
-@@ -170,7 +171,8 @@
- static void window_findbar_close_cb (GtkWidget *widget,
- DhWindow *window);
- static GtkWidget *window_new_tab_label (DhWindow *window,
-- const gchar *label);
-+ const gchar *label,
-+ GtkWidget *frame);
- static void window_open_new_tab (DhWindow *window,
- const gchar *location);
- static DhHtml * window_get_active_html (DhWindow *window);
-@@ -601,14 +603,15 @@
+Index: devhelp-0.22/src/dh-window.c
+===================================================================
+--- devhelp-0.22.orig/src/dh-window.c 2008-11-28 15:56:04.000000000 +0000
++++ devhelp-0.22/src/dh-window.c 2008-12-02 20:49:05.000000000 +0000
+@@ -117,7 +117,8 @@
+ static void window_findbar_close_cb (GtkWidget *widget,
+ DhWindow *window);
+ static GtkWidget * window_new_tab_label (DhWindow *window,
+- const gchar *label);
++ const gchar *label,
++ GtkWidget *frame);
+ static void window_open_new_tab (DhWindow *window,
+ const gchar *location);
+ static WebKitWebView *window_get_active_web_view (DhWindow *window);
+@@ -169,7 +170,8 @@
+
+ static void
+ window_activate_close (GtkAction *action,
+- DhWindow *window)
++ DhWindow *window,
++ GtkWidget *frame)
+ {
+ DhWindowPriv *priv;
+ gint page_num;
+@@ -177,7 +179,7 @@
+
+ priv = window->priv;
+
+- page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook));
++ page_num = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), frame);
+ gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), page_num);
+
+ pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook));
+@@ -1060,7 +1062,7 @@
+ gtk_container_add (GTK_CONTAINER (scrolled_window), view);
+ g_object_set_data (G_OBJECT (scrolled_window), "web_view", view);
+
+- label = window_new_tab_label (window, _("Empty Page"));
++ label = window_new_tab_label (window, _("Empty Page"), scrolled_window);
+ gtk_widget_show_all (label);
+
+ g_signal_connect (view, "title-changed",
+@@ -1110,7 +1112,8 @@
+
+ action_close = gtk_action_group_get_action (window->priv->action_group,
+ "Close");
+- window_activate_close (action_close, window);
++ window_activate_close (action_close, window,
++ g_object_get_data (G_OBJECT (button), "frame"));
}
static void
--window_activate_close (GtkAction *action, DhWindow *window)
-+window_activate_close (GtkAction *action, DhWindow *window,
-+ GtkWidget *frame)
+@@ -1147,7 +1150,8 @@
+ */
+ static GtkWidget*
+ window_new_tab_label (DhWindow *window,
+- const gchar *str)
++ const gchar *str,
++ GtkWidget *frame)
{
- DhWindowPriv *priv;
- gint page_num;
+ GtkWidget *label;
+ #ifndef GDK_WINDOWING_QUARTZ
+@@ -1182,6 +1186,7 @@
- priv = window->priv;
+ g_object_set_data (G_OBJECT (hbox), "label", label);
+ g_object_set_data (G_OBJECT (hbox), "close-button", close_button);
++ g_object_set_data (G_OBJECT (close_button), "frame", frame);
-- page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->html_notebook));
-+ page_num = gtk_notebook_page_num (GTK_NOTEBOOK (priv->html_notebook), frame);
- gtk_notebook_remove_page (GTK_NOTEBOOK (priv->html_notebook), page_num);
-
- if (gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->html_notebook)) == 0) {
-@@ -1183,7 +1186,7 @@
-
- g_object_set_data (G_OBJECT (frame), "html", html);
-
-- label = window_new_tab_label (window, _("Empty Page"));
-+ label = window_new_tab_label (window, _("Empty Page"), frame);
- gtk_widget_show_all (label);
-
- g_signal_connect (html, "title-changed",
-@@ -1230,7 +1233,8 @@
-
- action_close = gtk_action_group_get_action (window->priv->action_group,
- "Close");
-- window_activate_close (action_close, window);
-+ window_activate_close (action_close, window,
-+ g_object_get_data (G_OBJECT (button), "frame"));
- }
-
- static void
-@@ -1262,7 +1266,7 @@
- }
-
- static GtkWidget*
--window_new_tab_label (DhWindow *window, const gchar *str)
-+window_new_tab_label (DhWindow *window, const gchar *str, GtkWidget *frame)
- {
- GtkWidget *hbox, *label, *close_button, *image;
-
-@@ -1297,6 +1301,7 @@
-
- g_object_set_data (G_OBJECT (hbox), "label", label);
- g_object_set_data (G_OBJECT (hbox), "close-button", close_button);
-+ g_object_set_data (G_OBJECT (close_button), "frame", frame);
-
- return hbox;
- }
+ return hbox;
+ #else
Modified: packages/experimental/devhelp/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/devhelp/debian/patches/series?rev=17800&op=diff
==============================================================================
--- packages/experimental/devhelp/debian/patches/series (original)
+++ packages/experimental/devhelp/debian/patches/series Tue Dec 2 21:23:23 2008
@@ -1,5 +1,4 @@
00install-devhelp-el.patch
01_do_not_clober_global_w_on_el.patch
-02_fix_alpha_ftbfs.patch
03html2diff_close_sub.patch
04_close_correct_tab.patch
Modified: packages/experimental/devhelp/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/devhelp/debian/rules?rev=17800&op=diff
==============================================================================
--- packages/experimental/devhelp/debian/rules (original)
+++ packages/experimental/devhelp/debian/rules Tue Dec 2 21:23:23 2008
@@ -7,9 +7,6 @@
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-install-schemas \
- --with-gecko=libxul-embedding
DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libdevhelp-1-0 (>= 0.14)'
More information about the pkg-gnome-commits
mailing list