gtk+2.0 (2.8.10-1) unstable; urgency=low
* New upstream version
* debian/control.in:
- updated the glib requirement
* debian/patches/001_fs_documents.patch:
- dropped, stick with upstream behaviour rather
-- Sebastien Bacher <seb128@debian.org> Thu, 12 Jan 2006 13:34:37 +0100
This commit is contained in:
Sebastien Bacher
10
debian/changelog
vendored
10
debian/changelog
vendored
@ -1,3 +1,13 @@
|
||||
gtk+2.0 (2.8.10-1) unstable; urgency=low
|
||||
|
||||
* New upstream version
|
||||
* debian/control.in:
|
||||
- updated the glib requirement
|
||||
* debian/patches/001_fs_documents.patch:
|
||||
- dropped, stick with upstream behaviour rather
|
||||
|
||||
-- Sebastien Bacher <seb128@debian.org> Thu, 12 Jan 2006 13:34:37 +0100
|
||||
|
||||
gtk+2.0 (2.8.9-2) unstable; urgency=low
|
||||
|
||||
* Upload to unstable
|
||||
|
||||
4
debian/control
vendored
4
debian/control
vendored
@ -3,7 +3,7 @@ Section: libs
|
||||
Priority: optional
|
||||
Maintainer: Sebastien Bacher <seb128@debian.org>
|
||||
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Akira TAGOH <tagoh@debian.org>, Andreas Rottmann <rotty@debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Carlos Perelló Marín <carlos@pemas.net>, Clément Stenac <zorglub@debian.org>, Ed Boraas <ed@debian.org>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Guilherme de S. Pastore <guilherme.pastore@terra.com.br>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Joe Drew <drew@debian.org>, Johannes Rohr <jr.debian@rohr.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Marc HE Brockschmidt <he@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@debian.org>, Sjoerd Simons <sjoerd@debian.org>, Takuo KITAME <kitame@debian.org>
|
||||
Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.7.1), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), xlibs-static-pic | xlibs-pic (>= 4.2.1-6), libx11-dev, libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
|
||||
Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), xlibs-static-pic | xlibs-pic (>= 4.2.1-6), libx11-dev, libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-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.7.1), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), libcairo2-dev, libx11-dev, libxext-dev, libxinerama-dev, libxi-dev, libxrandr-dev, libxcursor-dev, libxfixes-dev, pkg-config
|
||||
Depends: libgtk2.0-0 (= ${Source-Version}), libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), libcairo2-dev, libx11-dev, libxext-dev, libxinerama-dev, libxi-dev, libxrandr-dev, libxcursor-dev, libxfixes-dev, pkg-config
|
||||
Suggests: libgtk2.0-doc
|
||||
Replaces: libgtk1.3-dev
|
||||
Conflicts: libgtk1.3-dev
|
||||
|
||||
4
debian/control.in
vendored
4
debian/control.in
vendored
@ -3,7 +3,7 @@ Section: libs
|
||||
Priority: optional
|
||||
Maintainer: Sebastien Bacher <seb128@debian.org>
|
||||
Uploaders: @GNOME_TEAM@
|
||||
Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.7.1), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), xlibs-static-pic | xlibs-pic (>= 4.2.1-6), libx11-dev, libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
|
||||
Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), xlibs-static-pic | xlibs-pic (>= 4.2.1-6), libx11-dev, libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-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-@SONAME@ (= ${Source-Version}), libglib2.0-dev (>= 2.7.1), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), libcairo2-dev, libx11-dev, libxext-dev, libxinerama-dev, libxi-dev, libxrandr-dev, libxcursor-dev, libxfixes-dev, pkg-config
|
||||
Depends: libgtk2.0-@SONAME@ (= ${Source-Version}), libglib2.0-dev (>= 2.8.5), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), libcairo2-dev, libx11-dev, libxext-dev, libxinerama-dev, libxi-dev, libxrandr-dev, libxcursor-dev, libxfixes-dev, pkg-config
|
||||
Suggests: libgtk2.0-doc
|
||||
Replaces: libgtk1.3-dev
|
||||
Conflicts: libgtk1.3-dev
|
||||
|
||||
73
debian/patches/001_fs_documents.patch
vendored
73
debian/patches/001_fs_documents.patch
vendored
@ -1,73 +0,0 @@
|
||||
diff -Nur gtk+-2.8.7.orig/gtk/gtkfilechooserdefault.c gtk+-2.8.7/gtk/gtkfilechooserdefault.c
|
||||
--- gtk+-2.8.7.orig/gtk/gtkfilechooserdefault.c 2005-11-11 20:50:21.000000000 +0100
|
||||
+++ gtk+-2.8.7/gtk/gtkfilechooserdefault.c 2005-11-16 11:59:33.000000000 +0100
|
||||
@@ -222,6 +222,7 @@
|
||||
|
||||
GtkTooltips *tooltips;
|
||||
|
||||
+ gboolean has_documents;
|
||||
gboolean has_home;
|
||||
gboolean has_desktop;
|
||||
|
||||
@@ -343,6 +344,7 @@
|
||||
|
||||
/* Interesting places in the shortcuts bar */
|
||||
typedef enum {
|
||||
+ SHORTCUTS_DOCUMENTS,
|
||||
SHORTCUTS_HOME,
|
||||
SHORTCUTS_DESKTOP,
|
||||
SHORTCUTS_VOLUMES,
|
||||
@@ -1476,6 +1478,33 @@
|
||||
profile_end ("end", NULL);
|
||||
}
|
||||
|
||||
+
|
||||
+/* Appends the ~/Documents directory to the shortcuts model */
|
||||
+static void
|
||||
+shortcuts_append_documents (GtkFileChooserDefault *impl)
|
||||
+{
|
||||
+ char *name;
|
||||
+ GtkFilePath *path;
|
||||
+
|
||||
+ name = g_build_filename (g_get_home_dir (), "Documents", NULL);
|
||||
+ path = gtk_file_system_filename_to_path (impl->file_system, name);
|
||||
+ g_free (name);
|
||||
+
|
||||
+ impl->has_documents = shortcuts_insert_path (impl, -1, FALSE, NULL, path, _("Documents"), FALSE, NULL);
|
||||
+ /* We do not actually pop up an error dialog if there is no document directory
|
||||
+ * because some people may really not want to have one.
|
||||
+ */
|
||||
+
|
||||
+ gtk_file_path_free (path);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
/* Appends a list of GtkFilePath to the shortcuts model; returns how many were inserted */
|
||||
static int
|
||||
shortcuts_append_paths (GtkFileChooserDefault *impl,
|
||||
@@ -1527,6 +1556,11 @@
|
||||
|
||||
n = 0;
|
||||
|
||||
+ if (where == SHORTCUTS_DOCUMENTS)
|
||||
+ goto out;
|
||||
+
|
||||
+ n += impl->has_documents ? 1 : 0;
|
||||
+
|
||||
if (where == SHORTCUTS_HOME)
|
||||
goto out;
|
||||
|
||||
@@ -1875,6 +1909,7 @@
|
||||
|
||||
if (impl->file_system)
|
||||
{
|
||||
+ shortcuts_append_documents (impl);
|
||||
shortcuts_append_home (impl);
|
||||
shortcuts_append_desktop (impl);
|
||||
shortcuts_add_volumes (impl);
|
||||
2
debian/scripts/vars
vendored
2
debian/scripts/vars
vendored
@ -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.8.9
|
||||
TAR_DIR=gtk+-2.8.10
|
||||
# Where to place all the stamp files. This directory can be removed, and
|
||||
# all the targets will then be rerun.
|
||||
STAMP_DIR=debian/stampdir
|
||||
|
||||
2
debian/sources
vendored
2
debian/sources
vendored
@ -1 +1 @@
|
||||
upstream tar ../gtk+-2.8.9.tar.gz
|
||||
upstream tar ../gtk+-2.8.10.tar.gz
|
||||
|
||||
Reference in New Issue
Block a user