r17289 - in /packages/unstable/devhelp/debian: changelog control control.in copyright patches/02_fix_alpha_ftbfs.patch patches/02_gecko_1.9.patch patches/04_close_correct_tab.patch patches/70_autoconf.patch patches/series
bradsmith at users.alioth.debian.org
bradsmith at users.alioth.debian.org
Sun Oct 19 22:07:54 UTC 2008
Author: bradsmith
Date: Sun Oct 19 22:07:54 2008
New Revision: 17289
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17289
Log:
Merge experimental branch into unstable. Change maintainer email address. Reformat descriptions. Convert copyright to machine readable format.
Added:
packages/unstable/devhelp/debian/patches/02_fix_alpha_ftbfs.patch
packages/unstable/devhelp/debian/patches/04_close_correct_tab.patch
Removed:
packages/unstable/devhelp/debian/patches/02_gecko_1.9.patch
packages/unstable/devhelp/debian/patches/70_autoconf.patch
Modified:
packages/unstable/devhelp/debian/changelog
packages/unstable/devhelp/debian/control
packages/unstable/devhelp/debian/control.in
packages/unstable/devhelp/debian/copyright
packages/unstable/devhelp/debian/patches/series
Modified: packages/unstable/devhelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/devhelp/debian/changelog?rev=17289&op=diff
==============================================================================
--- packages/unstable/devhelp/debian/changelog (original)
+++ packages/unstable/devhelp/debian/changelog Sun Oct 19 22:07:54 2008
@@ -1,3 +1,23 @@
+devhelp (0.21-2) unstable; urgency=low
+
+ * debian/control
+ - Change maintainer email address.
+ - Reformat descriptions.
+ * Convert copyright to machine readable format.
+
+ -- Bradley Smith <bradsmith at debian.org> Sun, 19 Oct 2008 22:53:04 +0100
+
+devhelp (0.21-1) experimental; urgency=low
+
+ * New upstream release.
+ * Drop 02_gecko_1.9.patch - Gone upstream.
+ * Drop 70_autoconf.patch - No longer needed.
+ * Split out alpha FTBFS fix into 02_fix_alpha_ftbfs.patch.
+ * Add 04_close_correct_tab.patch - Close correct tab when pressing close
+ button.
+
+ -- Bradley Smith <brad at brad-smith.co.uk> Thu, 25 Sep 2008 14:35:45 +0100
+
devhelp (0.19.1-6) unstable; urgency=low
* Recommend xulrunner-1.9-gnome-support. Closes: #491359.
Modified: packages/unstable/devhelp/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/devhelp/debian/control?rev=17289&op=diff
==============================================================================
--- packages/unstable/devhelp/debian/control (original)
+++ packages/unstable/devhelp/debian/control Sun Oct 19 22:07:54 2008
@@ -1,7 +1,7 @@
Source: devhelp
Section: devel
Priority: optional
-Maintainer: Bradley Smith <brad at brad-smith.co.uk>
+Maintainer: Bradley Smith <bradsmith at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Gustavo Noronha Silva <kov at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: cdbs,
quilt,
@@ -30,8 +30,8 @@
Conflicts: devhelp (<< 0.8.1-1)
Replaces: devhelp (<< 0.9-5)
Description: Library providing documentation browser functionality
- This library provides embedable widgets from the Devhelp program to
- be integrated in tools like the Anjuta IDE for browsing API reference
+ This library provides embedable widgets from the Devhelp program to be
+ integrated in tools like the Anjuta IDE for browsing API reference
documentation.
Package: libdevhelp-1-dev
@@ -44,8 +44,8 @@
libgconf2-dev (>= 2.6.0),
libglade2-dev (>= 1:2.4.0-1)
Description: Library providing documentation browser functionality (development)
- This library provides embedable widgets from the Devhelp program to
- be integrated in tools like the Anjuta IDE for browsing API reference
+ This library provides embedable widgets from the Devhelp program to be
+ integrated in tools like the Anjuta IDE for browsing API reference
documentation.
.
This package contains the development files.
@@ -74,15 +74,15 @@
devhelp-book-pygtk2 (<= 0.2-8),
devhelp-book-sdl (<= 0.2-8)
Description: A GNOME developers help program
- Devhelp's primary goal is to be an API documentation browser for GNOME.
- It is able to scan for .devhelp files generated automatically for
- packages that use gtk-doc-tools to generate documentation for libraries
- and programs.
+ Devhelp's primary goal is to be an API documentation browser for GNOME. It
+ is able to scan for .devhelp files generated automatically for packages
+ that use gtk-doc-tools to generate documentation for libraries and
+ programs.
.
Devhelp uses Gecko, the Mozilla rendering engine to render the HTML
- manuals. It also provides Bonobo functionality, which is used to
- allow command-line searches, emacs integration and embedding in
- applications like the Anjuta IDE.
+ manuals. It also provides Bonobo functionality, which is used to allow
+ command-line searches, emacs integration and embedding in applications like
+ the Anjuta IDE.
Package: devhelp-common
Section: devel
@@ -93,14 +93,14 @@
Replaces: devhelp (<< 0.9-5),
libdevhelp-1-0 (<< 0.9-6)
Description: common files for devhelp and its library
- Devhelp's primary goal is to be an API documentation browser for GNOME.
- It is able to scan for .devhelp files generated automatically for
- packages that use gtk-doc-tools to generate documentation for libraries
- and programs.
+ Devhelp's primary goal is to be an API documentation browser for GNOME. It
+ is able to scan for .devhelp files generated automatically for packages
+ that use gtk-doc-tools to generate documentation for libraries and
+ programs.
.
Devhelp uses Gecko, the Mozilla rendering engine to render the HTML
- manuals. It also provides Bonobo functionality, which is used to
- allow command-line searches, emacs integration and embedding in
- applications like the Anjuta IDE.
+ manuals. It also provides Bonobo functionality, which is used to allow
+ command-line searches, emacs integration and embedding in applications like
+ the Anjuta IDE.
.
This package provides internationalization files, mainly.
Modified: packages/unstable/devhelp/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/devhelp/debian/control.in?rev=17289&op=diff
==============================================================================
--- packages/unstable/devhelp/debian/control.in (original)
+++ packages/unstable/devhelp/debian/control.in Sun Oct 19 22:07:54 2008
@@ -1,7 +1,7 @@
Source: devhelp
Section: devel
Priority: optional
-Maintainer: Bradley Smith <brad at brad-smith.co.uk>
+Maintainer: Bradley Smith <bradsmith at debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: cdbs,
quilt,
Modified: packages/unstable/devhelp/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/devhelp/debian/copyright?rev=17289&op=diff
==============================================================================
--- packages/unstable/devhelp/debian/copyright (original)
+++ packages/unstable/devhelp/debian/copyright Sun Oct 19 22:07:54 2008
@@ -1,25 +1,31 @@
-This package was debianized by Johan Dahlin <zilch.am at home.se> on
-Thu, 7 Jun 2001 20:06:40 -0400 and Gustavo Noronha Silva <kov at debian.org>
-started packaging it officialy on Thu, 28 Feb 2002 00:30:19 -0300.
+Author: Mikael Hallendal <micke at imendio.com>
+Download: http://www.imendio.com/projects/devhelp/
-It was downloaded from http://www.imendio.com/projects/devhelp/
+Files: *
+Copyright: (C) 2000, 2001 The Free Software Foundation
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the Free
+ Software Foundation; either version 2 of the License, or (at your option)
+ any later version.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ more details.
-Upstream Maintainer: Mikael Hallendal <micke at imendio.com>
+Files: debian/*
+Copyright: (C) 2008 Bradley Smith <brad at brad-smith.co.uk>
+License: GPL-2+.
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the Free
+ Software Foundation; either version 2 of the License, or (at your option)
+ any later version.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ more details.
-Copyright:
-
-Copyright (C) 2000, 2001 The Free Software Foundation
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-On Debian GNU/Linux systems, the full text of the GNU General Public
-License can be found in the file /usr/share/common-licenses/GPL.
-
+On Debian GNU/Linux systems, the full text of the GNU General Public License
+can be found in the file /usr/share/common-licenses/GPL-2.
Added: packages/unstable/devhelp/debian/patches/02_fix_alpha_ftbfs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/devhelp/debian/patches/02_fix_alpha_ftbfs.patch?rev=17289&op=file
==============================================================================
--- packages/unstable/devhelp/debian/patches/02_fix_alpha_ftbfs.patch (added)
+++ packages/unstable/devhelp/debian/patches/02_fix_alpha_ftbfs.patch Sun Oct 19 22:07:54 2008
@@ -1,0 +1,19 @@
+diff -Naur devhelp-0.20/src/dh-gecko-utils.cpp devhelp-0.20.new/src/dh-gecko-utils.cpp
+--- devhelp-0.20/src/dh-gecko-utils.cpp 2008-09-08 08:29:57.000000000 +0100
++++ devhelp-0.20.new/src/dh-gecko-utils.cpp 2008-09-10 17:46:32.000000000 +0100
+@@ -21,6 +21,7 @@
+ */
+
+ #include <config.h>
++#include <nsStringAPI.h>
+ #ifdef XPCOM_GLUE
+ # include <gtkmozembed_glue.cpp>
+ #endif
+@@ -40,7 +41,6 @@
+ #include <nsILocalFile.h>
+ #include <nsIDOMMouseEvent.h>
+ #include <nsIWebBrowserFind.h>
+-#include <nsStringAPI.h>
+
+ #include <stdlib.h>
+
Added: packages/unstable/devhelp/debian/patches/04_close_correct_tab.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/devhelp/debian/patches/04_close_correct_tab.patch?rev=17289&op=file
==============================================================================
--- packages/unstable/devhelp/debian/patches/04_close_correct_tab.patch (added)
+++ packages/unstable/devhelp/debian/patches/04_close_correct_tab.patch Sun Oct 19 22:07:54 2008
@@ -1,0 +1,77 @@
+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 @@
+ }
+
+ static void
+-window_activate_close (GtkAction *action, DhWindow *window)
++window_activate_close (GtkAction *action, DhWindow *window,
++ GtkWidget *frame)
+ {
+ DhWindowPriv *priv;
+ gint page_num;
+
+ priv = window->priv;
+
+- 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;
+ }
Modified: packages/unstable/devhelp/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/devhelp/debian/patches/series?rev=17289&op=diff
==============================================================================
--- packages/unstable/devhelp/debian/patches/series (original)
+++ packages/unstable/devhelp/debian/patches/series Sun Oct 19 22:07:54 2008
@@ -1,5 +1,5 @@
00install-devhelp-el.patch
01_do_not_clober_global_w_on_el.patch
-02_gecko_1.9.patch
+02_fix_alpha_ftbfs.patch
03html2diff_close_sub.patch
-70_autoconf.patch
+04_close_correct_tab.patch
More information about the pkg-gnome-commits
mailing list