diff --git a/debian/README.Debian b/debian/README.Debian index 826d838fb5..2337c96661 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -30,5 +30,21 @@ Please use gnome-keybinding-properties instead of gtk-key-theme-name in your gtkrc. - -- Akira TAGOH , Mon, 03 Mar 2003 00:49:13 +0900 +Emacs-style key bindings +======================== +Gtk provides a way of configuring key bindings in Gtk Widgets, especially +to move the cursor in text fields. The default behavior in older Gtk versions +was similar to Emacs, and still available for users to configure. You can +configure the Emacs-style key binding theme in your ~/.gtkrc-2.0 file as +follows: + gtk-key-theme-name = "Emacs" + +Please note that applications can still override this configuration, and this +is the case of the GNOME Desktop: gnome-settings-daemon loads the key theme +from the "/desktop/gnome/interface/gtk_key_theme" GConf entry. This can be +modified with gconf-editor. + + +This file is the initial work of Akira TAGOH and was updated +by Loic Minier . diff --git a/debian/changelog b/debian/changelog index 6a47df3447..05172a3a8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,30 @@ +gtk+2.0 (2.6.7-2) unstable; urgency=low + + * Upload to unstable. + * Forward patches from 2.6.4 branch: + + 003_focus_issues.patch: stolen from CVS HEAD to fix focus issues. + + debian/gtk-tutorial.devhelp: updated to reflect the reality of the + html files. + * Loïc Minier: + + Document the configuration of Emacs-style key bindings in README.Debian, + with additional instructions for GNOME users. [debian/README.Debian] + (Closes: #309530) + + -- Josselin Mouette Mon, 6 Jun 2005 22:39:27 +0200 + +gtk+2.0 (2.6.7-1) experimental; urgency=low + + * New upstream version: + - Fix compilation with gcc 4.0 (Closes: #303646). + * debian/rules: + - clean from the mips changes. + * debian/patches/002_bmp.patch: + - the new version fixes that. + * debian/patches/004_fs_newdir.patch: + - the new version fixes that. + + -- Sebastien Bacher Thu, 14 Apr 2005 22:06:53 +0200 + gtk+2.0 (2.6.4-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 64f472567c..8bfce5d28b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: gtk+2.0 Section: libs Priority: optional Maintainer: Sebastien Bacher -Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Carlos Perelló Marín , Edd Dumbill , Emil Soleyman-Zomalan , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Joe Drew , Johannes Rohr , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Marc HE Brockschmidt , Ondřej Surý , Rob Bradford , Robert McQueen , Ross Burton , Takuo KITAME +Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Carlos Perelló Marín , Ed Boraas , Edd Dumbill , Emil Soleyman-Zomalan , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Joe Drew , Johannes Rohr , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Marc HE Brockschmidt , Ondřej Surý , Rob Bradford , Robert McQueen , Ross Burton , Sjoerd Simons , Takuo KITAME Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.6.0), libpango1.0-dev (>= 1.7.0), libatk1.0-dev (>= 1.6.1-2), xlibs-static-pic | xlibs-pic (>= 4.2.1-6), libx11-dev | xlibs-dev, libxext-dev | xlibs-dev, libxi-dev | xlibs-dev, libxrandr-dev | xlibs-dev, libxt-dev | xlibs-dev, libxrender-dev, libxft-dev, libxcursor-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools Build-Depends-Indep: gtk-doc-tools, docbook-xml Standards-Version: 3.6.1.0 @@ -54,7 +54,7 @@ Description: The programs for the GTK+ graphical user interface library Package: libgtk2.0-dev Section: libdevel Architecture: any -Depends: libgtk2.0-0 (= ${Source-Version}), libglib2.0-dev (>= 2.4.1-2), libpango1.0-dev (>= 1.4.0-3), libatk1.0-dev (>= 1.6.1-2), libx11-dev | xlibs-dev, libxext-dev | xlibs-dev, pkg-config +Depends: libgtk2.0-0 (= ${Source-Version}), libglib2.0-dev (>= 2.4.1-2), libpango1.0-dev (>= 1.5.1), libatk1.0-dev (>= 1.6.1-2), libx11-dev | xlibs-dev, libxext-dev | xlibs-dev, pkg-config Suggests: libgtk2.0-doc Replaces: libgtk1.3-dev Conflicts: libgtk1.3-dev diff --git a/debian/control.in b/debian/control.in index 17ce22e2b9..de8fdae9f0 100644 --- a/debian/control.in +++ b/debian/control.in @@ -54,7 +54,7 @@ Description: The programs for the GTK+ graphical user interface library Package: libgtk2.0-dev Section: libdevel Architecture: any -Depends: libgtk2.0-@SONAME@ (= ${Source-Version}), libglib2.0-dev (>= 2.4.1-2), libpango1.0-dev (>= 1.4.0-3), libatk1.0-dev (>= 1.6.1-2), libx11-dev | xlibs-dev, libxext-dev | xlibs-dev, pkg-config +Depends: libgtk2.0-@SONAME@ (= ${Source-Version}), libglib2.0-dev (>= 2.4.1-2), libpango1.0-dev (>= 1.5.1), libatk1.0-dev (>= 1.6.1-2), libx11-dev | xlibs-dev, libxext-dev | xlibs-dev, pkg-config Suggests: libgtk2.0-doc Replaces: libgtk1.3-dev Conflicts: libgtk1.3-dev diff --git a/debian/gtk-tutorial.devhelp b/debian/gtk-tutorial.devhelp index 45b6de6fb5..519f28a865 100644 --- a/debian/gtk-tutorial.devhelp +++ b/debian/gtk-tutorial.devhelp @@ -14,268 +14,268 @@ - - + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + - + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - + - - - - + + + + - - - - - + + + + + - + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - - - - - - - - - + + + + + + + + + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - + + + + + - - - - + + + + - - - + + + diff --git a/debian/libgtk2.0-dbg.dirs b/debian/libgtk2.0-dbg.dirs deleted file mode 100644 index 08d9e7aea2..0000000000 --- a/debian/libgtk2.0-dbg.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib/debug diff --git a/debian/libgtk2.0-dbg.files b/debian/libgtk2.0-dbg.files deleted file mode 100644 index cddaee0bfc..0000000000 --- a/debian/libgtk2.0-dbg.files +++ /dev/null @@ -1 +0,0 @@ -usr/lib/debug/* diff --git a/debian/patches/001_gtk+-ximian-gtk2-filesel-navbutton-5.patch b/debian/patches/001_gtk+-ximian-gtk2-filesel-navbutton-5.patch index 0b59781cc2..f7d0717ba8 100644 --- a/debian/patches/001_gtk+-ximian-gtk2-filesel-navbutton-5.patch +++ b/debian/patches/001_gtk+-ximian-gtk2-filesel-navbutton-5.patch @@ -1,7 +1,7 @@ -diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel.c gtk+-2.2.1/gtk/gtkfilesel.c ---- gtk+-2.2.1.orig/gtk/gtkfilesel.c 2003-01-30 15:49:14.000000000 -0500 -+++ gtk+-2.2.1/gtk/gtkfilesel.c 2003-05-14 15:55:33.000000000 -0400 -@@ -82,9 +82,13 @@ +diff -Nur gtk+-2.6.7.orig/gtk/gtkfilesel.c gtk+-2.6.7/gtk/gtkfilesel.c +--- gtk+-2.6.7.orig/gtk/gtkfilesel.c 2005-04-07 06:45:30.000000000 +0200 ++++ gtk+-2.6.7/gtk/gtkfilesel.c 2005-04-14 22:33:08.956692576 +0200 +@@ -83,9 +83,13 @@ #include "gtkoptionmenu.h" #define GTK_DISABLE_DEPRECATED @@ -12,10 +12,10 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel +#include "stock-icons/ximian-icons.h" + + #include "gtkalias.h" + #ifdef G_OS_WIN32 - #include - #include -@@ -319,6 +323,9 @@ +@@ -321,6 +325,9 @@ */ static gchar* cmpl_completion_fullname (const gchar*, CompletionState* cmpl_state); @@ -25,7 +25,7 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel /* Directory operations. */ static CompletionDir* open_ref_dir (gchar* text_to_complete, -@@ -663,6 +670,10 @@ +@@ -665,6 +672,10 @@ GtkWidget *spacer; GtkDialog *dialog; @@ -36,7 +36,7 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel GtkListStore *model; GtkTreeViewColumn *column; -@@ -676,18 +687,9 @@ +@@ -678,18 +689,9 @@ filesel->main_vbox = dialog->vbox; gtk_container_set_border_width (GTK_CONTAINER (filesel), 10); @@ -56,7 +56,7 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel gtk_box_pack_start (GTK_BOX (filesel->main_vbox), pulldown_hbox, FALSE, FALSE, 0); gtk_widget_show (pulldown_hbox); -@@ -699,14 +701,27 @@ +@@ -701,14 +703,27 @@ /* The horizontal box containing the directory and file listboxes */ @@ -86,7 +86,7 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel if (WANT_HPANED) list_container = g_object_new (GTK_TYPE_HPANED, "visible", TRUE, -@@ -718,9 +733,78 @@ +@@ -720,9 +735,78 @@ spacer = gtk_hbox_new (FALSE, 0); gtk_widget_set_size_request (spacer, -1, 5); @@ -166,7 +166,7 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel /* The directories list */ model = gtk_list_store_new (1, G_TYPE_STRING); -@@ -793,6 +877,15 @@ +@@ -795,6 +879,15 @@ gtk_widget_show (filesel->file_list); gtk_widget_show (scrolled_win); @@ -182,7 +182,7 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel /* action area for packing buttons into. */ filesel->action_area = gtk_hbox_new (TRUE, 0); gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area, -@@ -1107,39 +1200,94 @@ +@@ -1114,39 +1207,94 @@ void gtk_file_selection_show_fileop_buttons (GtkFileSelection *filesel) { @@ -291,7 +291,7 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel gtk_widget_show (filesel->fileop_ren_file); } -@@ -1841,6 +1989,95 @@ +@@ -1848,6 +1996,95 @@ gtk_widget_set_sensitive (fs->fileop_ren_file, sensitive); } @@ -387,9 +387,9 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/gtkfilesel static gint gtk_file_selection_key_press (GtkWidget *widget, GdkEventKey *event, -diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/stock-icons/ximian-icons.h gtk+-2.2.1/gtk/stock-icons/ximian-icons.h ---- gtk+-2.2.1.orig/gtk/stock-icons/ximian-icons.h 1969-12-31 19:00:00.000000000 -0500 -+++ gtk+-2.2.1/gtk/stock-icons/ximian-icons.h 2003-05-14 14:39:18.000000000 -0400 +diff -Nur gtk+-2.6.7.orig/gtk/stock-icons/ximian-icons.h gtk+-2.6.7/gtk/stock-icons/ximian-icons.h +--- gtk+-2.6.7.orig/gtk/stock-icons/ximian-icons.h 1970-01-01 01:00:00.000000000 +0100 ++++ gtk+-2.6.7/gtk/stock-icons/ximian-icons.h 2005-04-14 22:31:10.372720080 +0200 @@ -0,0 +1,825 @@ +/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */ + @@ -1216,5 +1216,3 @@ diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gtk+-2.2.1.orig/gtk/stock-icon + "\377\0\0\0\0\345\0\0\0\0"}; + + ---- gtkfilesel.c.orig 2004-03-11 19:04:42.000000000 +0000 -+++ gtkfilesel.c 2004-03-20 09:18:50.000000000 +0000 diff --git a/debian/patches/002_bmp.patch b/debian/patches/002_bmp.patch deleted file mode 100644 index 79c6c6cca2..0000000000 --- a/debian/patches/002_bmp.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: io-bmp.c -=================================================================== -RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-bmp.c,v -retrieving revision 1.47 -diff -u -p -r1.47 io-bmp.c ---- io-bmp.c 24 Feb 2005 04:41:35 -0000 1.47 -+++ gtk+-2.6.4/gdk-pixbuf/io-bmp.c 26 Mar 2005 08:47:56 -0000 -@@ -219,7 +219,19 @@ lsb_16 (guchar *src) - static gboolean grow_buffer (struct bmp_progressive_state *State, - GError **error) - { -- guchar *tmp = g_try_realloc (State->buff, State->BufferSize); -+ guchar *tmp; -+ -+ if (State->BufferSize == 0) { -+ g_set_error (error, -+ GDK_PIXBUF_ERROR, -+ GDK_PIXBUF_ERROR_CORRUPT_IMAGE, -+ _("BMP image has bogus header data")); -+ State->read_state = READ_STATE_ERROR; -+ return FALSE; -+ } -+ -+ tmp = g_try_realloc (State->buff, State->BufferSize); -+ - if (!tmp) { - g_set_error (error, - GDK_PIXBUF_ERROR, -@@ -228,6 +240,7 @@ static gboolean grow_buffer (struct bmp_ - State->read_state = READ_STATE_ERROR; - return FALSE; - } -+ - State->buff = tmp; - return TRUE; - } diff --git a/debian/patches/003_focus_issues.patch b/debian/patches/003_focus_issues.patch new file mode 100644 index 0000000000..07e727a5c3 --- /dev/null +++ b/debian/patches/003_focus_issues.patch @@ -0,0 +1,185 @@ +Index: ChangeLog +=================================================================== +RCS file: /cvs/gnome/gtk+/ChangeLog,v +retrieving revision 1.6286.2.213 +diff -u -p -r1.6286.2.213 ChangeLog +--- old/ChangeLog.orig 2005-03-01 14:01:24.000000000 -0300 ++++ new/ChangeLog 2005-05-09 21:52:46.869360538 -0300 +@@ -1,1 +1,13 @@ ++2005-05-04 Owen Taylor ++ ++ * gdk/x11/gdkevents-x11.c gdk/x11/gdkwindow-x11.h: Fix a bug ++ in focus tracking when we move between has_pointer_focus and ++ has_focus_window directly. (#109246, Billy Biggs, Niko Tyni ++ and others) ++ ++ * gdk/x11/gdkevents-x11.c: Also fix some extremely confusion ++ that could happen in the case of no window manager + keyboard grabs, ++ by moving to a more consistent model of when we pay attention ++ to mode=NotifyGrab/NotifyUngrab events. ++ + 2005-03-01 Matthias Clasen + + * === Released 2.6.4 === +Index: gdk/x11/gdkevents-x11.c +=================================================================== +RCS file: /cvs/gnome/gtk+/gdk/x11/gdkevents-x11.c,v +retrieving revision 1.144.2.2 +diff -u -p -r1.144.2.2 gdkevents-x11.c +--- old/gdk/x11/gdkevents-x11.c 16 Mar 2005 03:25:09 -0000 1.144.2.2 ++++ new/gdk/x11/gdkevents-x11.c 5 May 2005 00:01:43 -0000 +@@ -1218,16 +1218,19 @@ gdk_event_translate (GdkDisplay *display + } + + /* Handle focusing (in the case where no window manager is running */ +- if (toplevel && +- xevent->xcrossing.detail != NotifyInferior && +- xevent->xcrossing.focus && !toplevel->has_focus_window) ++ if (toplevel && xevent->xcrossing.detail != NotifyInferior) + { +- gboolean had_focus = HAS_FOCUS (toplevel); +- +- toplevel->has_pointer_focus = TRUE; ++ toplevel->has_pointer = TRUE; + +- if (HAS_FOCUS (toplevel) != had_focus) +- generate_focus_event (window, TRUE); ++ if (xevent->xcrossing.focus && !toplevel->has_focus_window) ++ { ++ gboolean had_focus = HAS_FOCUS (toplevel); ++ ++ toplevel->has_pointer_focus = TRUE; ++ ++ if (HAS_FOCUS (toplevel) != had_focus) ++ generate_focus_event (window, TRUE); ++ } + } + + /* Tell XInput stuff about it if appropriate */ +@@ -1312,16 +1315,19 @@ gdk_event_translate (GdkDisplay *display + } + + /* Handle focusing (in the case where no window manager is running */ +- if (toplevel && +- xevent->xcrossing.detail != NotifyInferior && +- xevent->xcrossing.focus && !toplevel->has_focus_window) ++ if (toplevel && xevent->xcrossing.detail != NotifyInferior) + { +- gboolean had_focus = HAS_FOCUS (toplevel); +- +- toplevel->has_pointer_focus = FALSE; +- +- if (HAS_FOCUS (toplevel) != had_focus) +- generate_focus_event (window, FALSE); ++ toplevel->has_pointer = FALSE; ++ ++ if (xevent->xcrossing.focus && !toplevel->has_focus_window) ++ { ++ gboolean had_focus = HAS_FOCUS (toplevel); ++ ++ toplevel->has_pointer_focus = FALSE; ++ ++ if (HAS_FOCUS (toplevel) != had_focus) ++ generate_focus_event (window, FALSE); ++ } + } + + event->crossing.type = GDK_LEAVE_NOTIFY; +@@ -1404,10 +1410,25 @@ gdk_event_translate (GdkDisplay *display + switch (xevent->xfocus.detail) + { + case NotifyAncestor: +- case NotifyNonlinear: + case NotifyVirtual: ++ /* When the focus moves from an ancestor of the window to ++ * the window or a descendent of the window, *and* the ++ * pointer is inside the window, then we were previously ++ * receiving keystroke events in the has_pointer_focus ++ * case and are now receiving them in the ++ * has_focus_window case. ++ */ ++ if (toplevel->has_pointer && ++ xevent->xfocus.mode != NotifyGrab && ++ xevent->xfocus.mode != NotifyUngrab) ++ toplevel->has_pointer_focus = FALSE; ++ ++ /* fall through */ ++ case NotifyNonlinear: + case NotifyNonlinearVirtual: +- toplevel->has_focus_window = TRUE; ++ if (xevent->xfocus.mode != NotifyGrab && ++ xevent->xfocus.mode != NotifyUngrab) ++ toplevel->has_focus_window = TRUE; + /* We pretend that the focus moves to the grab + * window, so we pay attention to NotifyGrab + * NotifyUngrab, and ignore NotifyWhileGrabbed +@@ -1420,7 +1441,8 @@ gdk_event_translate (GdkDisplay *display + * but the pointer focus is ignored while a + * grab is in effect + */ +- if (xevent->xfocus.mode != NotifyGrab) ++ if (xevent->xfocus.mode != NotifyGrab && ++ xevent->xfocus.mode != NotifyUngrab) + toplevel->has_pointer_focus = TRUE; + break; + case NotifyInferior: +@@ -1447,15 +1469,31 @@ gdk_event_translate (GdkDisplay *display + switch (xevent->xfocus.detail) + { + case NotifyAncestor: +- case NotifyNonlinear: + case NotifyVirtual: ++ /* When the focus moves from the window or a descendent ++ * of the window to an ancestor of the window, *and* the ++ * pointer is inside the window, then we were previously ++ * receiving keystroke events in the has_focus_window ++ * case and are now receiving them in the ++ * has_pointer_focus case. ++ */ ++ if (toplevel->has_pointer && ++ xevent->xfocus.mode != NotifyGrab && ++ xevent->xfocus.mode != NotifyUngrab) ++ toplevel->has_pointer_focus = TRUE; ++ ++ /* fall through */ ++ case NotifyNonlinear: + case NotifyNonlinearVirtual: +- toplevel->has_focus_window = FALSE; ++ if (xevent->xfocus.mode != NotifyGrab && ++ xevent->xfocus.mode != NotifyUngrab) ++ toplevel->has_focus_window = FALSE; + if (xevent->xfocus.mode != NotifyWhileGrabbed) + toplevel->has_focus = FALSE; + break; + case NotifyPointer: +- if (xevent->xfocus.mode != NotifyUngrab) ++ if (xevent->xfocus.mode != NotifyGrab && ++ xevent->xfocus.mode != NotifyUngrab) + toplevel->has_pointer_focus = FALSE; + break; + case NotifyInferior: +Index: gdk/x11/gdkwindow-x11.h +=================================================================== +RCS file: /cvs/gnome/gtk+/gdk/x11/gdkwindow-x11.h,v +retrieving revision 1.18 +diff -u -p -r1.18 gdkwindow-x11.h +--- old/gdk/x11/gdkwindow-x11.h 18 Oct 2004 21:02:37 -0000 1.18 ++++ new/gdk/x11/gdkwindow-x11.h 5 May 2005 00:01:43 -0000 +@@ -96,9 +96,14 @@ struct _GdkToplevelX11 + */ + guint has_focus : 1; + +- /* Set if !window->has_focus_window, but events are being sent to the +- * window because the pointer is in it. (Typically, no window +- * manager is running. ++ /* Set if the pointer is inside this window. (This is needed for ++ * for focus tracking) ++ */ ++ guint has_pointer : 1; ++ ++ /* Set if the window is a descendent of the focus window and the pointer is ++ * inside it. (This is the case where the window will receive keystroke ++ * events even window->has_focus_window is FALSE) + */ + guint has_pointer_focus : 1; + diff --git a/debian/rules b/debian/rules index 731d030b17..9502606075 100644 --- a/debian/rules +++ b/debian/rules @@ -26,10 +26,6 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif -ifneq (,$(findstring $(DEB_HOST_GNU_TYPE),mipsel-linux mips-linux)) - STATIC_CONFIG_ARGS = --disable-testsuite -endif - ## version=$(shell dpkg-parsechangelog | grep '^Version: ' | sed -e 's/^Version: //' -e 's/-[A-Za-z0-9\.\+]*$$//g' -e 's/+[A-Za-z0-9\.]*$$//g') major=$(shell echo ${version} | sed -e 's/\(^[0-9]*\)\.[0-9]*\.[0-9]*$$/\1/') @@ -110,8 +106,7 @@ $(STAMP_DIR)/configure-static-stamp: --with-included-loaders=yes \ --disable-modules \ --disable-shared \ - --enable-static \ - $(STATIC_CONFIG_ARGS) + --enable-static cd $(BUILD_STATIC_DIR) && \ sed < libtool > libtool-2 \ @@ -121,7 +116,7 @@ $(STAMP_DIR)/configure-static-stamp: touch $@ -configure: configure-shared +configure: configure-static configure-shared build-shared: debian/control configure-shared $(STAMP_DIR)/build-shared-stamp $(STAMP_DIR)/build-shared-stamp: @@ -147,7 +142,7 @@ $(STAMP_DIR)/build-static-stamp: touch $@ -build: build-shared +build: build-static build-shared clean:: debian/control dh_testdir @@ -182,7 +177,7 @@ install-static: build-static install-test RUN_QUERY_IMMODULES_TEST=false \ RUN_QUERY_LOADER_TEST=false -install: install-shared +install: install-static install-shared # generating debian files from .in for f in `find debian/ -name "[^c]*.in"`; do \ sed -e "s/@VERSION@/${version}/g" -e "s/@MODVER@/${modver}/g" -e "s/@APIVER@/${apiver}/g" $$f > `echo $$f | sed -e "s/\.in//"`; \ @@ -302,4 +297,4 @@ binary-arch: build install dh_builddeb -a binary: binary-indep binary-arch -.PHONY: build build-shared clean binary-indep binary-arch binary install install-shared configure configure-shared debian/control +.PHONY: build build-shared build-static clean binary-indep binary-arch binary install install-shared install-static configure configure-shared configure-static debian/control diff --git a/debian/scripts/vars b/debian/scripts/vars index b1da3fcdae..4ae01c6904 100644 --- a/debian/scripts/vars +++ b/debian/scripts/vars @@ -8,7 +8,7 @@ SOURCE_DIR=build-tree # For a single pkg, this is the directory that is embedded in the tarball. # For multiple pkgs, this is null. -TAR_DIR=gtk+-2.6.2 +TAR_DIR=gtk+-2.6.7 # Where to place all the stamp files. This directory can be removed, and # all the targets will then be rerun. STAMP_DIR=debian/stampdir diff --git a/debian/sources b/debian/sources index a974c48e66..ee3824d106 100644 --- a/debian/sources +++ b/debian/sources @@ -1 +1 @@ -upstream tar ../gtk+-2.6.4.tar.gz +upstream tar ../gtk+-2.6.7.tar.gz