r10244 - in /desktop/experimental/gnome-panel/debian: changelog
control control.in patches/01_default-setup_evolution.patch
patches/02_menu_initial_size.patch rules
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Sun Apr 22 14:07:26 UTC 2007
Author: lool
Date: Sun Apr 22 14:07:26 2007
New Revision: 10244
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10244
Log:
* Merge patch for 2.18.0-1 by Riccardo Setti and update control.in as well:
* New upstream release
* Added libcairo-dev as build-dep
* Built with --with-in-process-applets=al New upstream release
* Added libcairo-dev as build-dep
* Built with --with-in-process-applets=alll
* Dropped 01_default-setup_evolution.patch, new version of evolution
doesn't ship a versioned .desktop file.
* Dropped 02_menu_initial_size.patch, applied upstream.
Modified:
desktop/experimental/gnome-panel/debian/changelog
desktop/experimental/gnome-panel/debian/control
desktop/experimental/gnome-panel/debian/control.in
desktop/experimental/gnome-panel/debian/patches/01_default-setup_evolution.patch
desktop/experimental/gnome-panel/debian/patches/02_menu_initial_size.patch
desktop/experimental/gnome-panel/debian/rules
Modified: desktop/experimental/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/changelog?rev=10244&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/changelog (original)
+++ desktop/experimental/gnome-panel/debian/changelog Sun Apr 22 14:07:26 2007
@@ -1,3 +1,16 @@
+gnome-panel (2.18.0-1) experimental; urgency=low
+
+ * New upstream release
+ * Added libcairo-dev as build-dep
+ * Built with --with-in-process-applets=al New upstream release
+ * Added libcairo-dev as build-dep
+ * Built with --with-in-process-applets=alll
+ * Dropped 01_default-setup_evolution.patch, new version of evolution
+ doesn't ship a versioned .desktop file.
+ * Dropped 02_menu_initial_size.patch, applied upstream.
+
+ -- Riccardo Setti <giskard at debian.org> Sun, 08 Apr 2007 13:47:02 +0200
+
gnome-panel (2.16.3-1) experimental; urgency=low
[ Josselin Mouette ]
Modified: desktop/experimental/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/control?rev=10244&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/control (original)
+++ desktop/experimental/gnome-panel/debian/control Sun Apr 22 14:07:26 2007
@@ -2,9 +2,9 @@
Section: gnome
Priority: optional
Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd 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>
Standards-Version: 3.7.2
-Build-Depends: cdbs (>= 0.4.24), debhelper (>= 5), intltool (>= 0.35.0), gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), scrollkeeper (>= 0.3.14-9.1), libxmu-dev, libxres-dev, gnome-doc-utils, libxau-dev, libgtk2.0-dev (>= 2.10.0), libgnomeui-dev (>= 2.16.0-2), libgnome-desktop-dev (>= 2.11.1), libglade2-dev (>= 1:2.5.0), libgnome2-dev (>= 2.13.0), libbonoboui2-dev (>= 2.1.1), liborbit2-dev (>= 1:2.12.1-1), libgnomevfs2-dev (>= 2.14.2), libwnck-dev (>= 2.13.5), libgconf2-dev (>= 2.6.1), libgnome-menu-dev (>= 2.11.1-1), libecal1.2-dev (>= 1.6.0) [!hurd-i386], libedataserverui1.2-dev (>= 1.2.0) [!hurd-i386], libcairo2-dev (>= 1.0.0), libdbus-glib-1-dev (>= 0.60), gtk-doc-tools, libgnome-menu-dev (>= 2.16.1-1)
+Build-Depends: cdbs (>= 0.4.24), debhelper (>= 5), intltool (>= 0.35.0), gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), scrollkeeper (>= 0.3.14-9.1), libxmu-dev, libxres-dev, gnome-doc-utils, libxau-dev, libgtk2.0-dev (>= 2.10.0), libgnomeui-dev (>= 2.16.0-2), libgnome-desktop-dev (>= 2.11.1), libglade2-dev (>= 1:2.5.0), libgnome2-dev (>= 2.13.0), libbonoboui2-dev (>= 2.1.1), liborbit2-dev (>= 1:2.12.1-1), libgnomevfs2-dev (>= 2.14.2), libwnck-dev (>= 2.13.5), libgconf2-dev (>= 2.6.1), libgnome-menu-dev (>= 2.11.1-1), libecal1.2-dev (>= 1.6.0) [!hurd-i386], libedataserverui1.2-dev (>= 1.2.0) [!hurd-i386], libcairo2-dev (>= 1.0.0), libdbus-glib-1-dev (>= 0.60), gtk-doc-tools, libgnome-menu-dev (>= 2.16.1-1), libpango1.0-dev (>= 1.15.4)
Package: gnome-panel
Architecture: any
Modified: desktop/experimental/gnome-panel/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/control.in?rev=10244&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/control.in (original)
+++ desktop/experimental/gnome-panel/debian/control.in Sun Apr 22 14:07:26 2007
@@ -4,7 +4,7 @@
Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
Uploaders: @GNOME_TEAM@
Standards-Version: 3.7.2
-Build-Depends: cdbs (>= 0.4.24), debhelper (>= 5), intltool (>= 0.35.0), gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), scrollkeeper (>= 0.3.14-9.1), libxmu-dev, libxres-dev, gnome-doc-utils, libxau-dev, libgtk2.0-dev (>= 2.10.0), libgnomeui-dev (>= 2.16.0-2), libgnome-desktop-dev (>= 2.11.1), libglade2-dev (>= 1:2.5.0), libgnome2-dev (>= 2.13.0), libbonoboui2-dev (>= 2.1.1), liborbit2-dev (>= 1:2.12.1-1), libgnomevfs2-dev (>= 2.14.2), libwnck-dev (>= 2.13.5), libgconf2-dev (>= 2.6.1), libgnome-menu-dev (>= 2.11.1-1), libecal1.2-dev (>= 1.6.0) [!hurd-i386], libedataserverui1.2-dev (>= 1.2.0) [!hurd-i386], libcairo2-dev (>= 1.0.0), libdbus-glib-1-dev (>= 0.60), gtk-doc-tools, libgnome-menu-dev (>= 2.16.1-1)
+Build-Depends: cdbs (>= 0.4.24), debhelper (>= 5), intltool (>= 0.35.0), gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), scrollkeeper (>= 0.3.14-9.1), libxmu-dev, libxres-dev, gnome-doc-utils, libxau-dev, libgtk2.0-dev (>= 2.10.0), libgnomeui-dev (>= 2.16.0-2), libgnome-desktop-dev (>= 2.11.1), libglade2-dev (>= 1:2.5.0), libgnome2-dev (>= 2.13.0), libbonoboui2-dev (>= 2.1.1), liborbit2-dev (>= 1:2.12.1-1), libgnomevfs2-dev (>= 2.14.2), libwnck-dev (>= 2.13.5), libgconf2-dev (>= 2.6.1), libgnome-menu-dev (>= 2.11.1-1), libecal1.2-dev (>= 1.6.0) [!hurd-i386], libedataserverui1.2-dev (>= 1.2.0) [!hurd-i386], libcairo2-dev (>= 1.0.0), libdbus-glib-1-dev (>= 0.60), gtk-doc-tools, libgnome-menu-dev (>= 2.16.1-1), libpango1.0-dev (>= 1.15.4)
Package: gnome-panel
Architecture: any
Modified: desktop/experimental/gnome-panel/debian/patches/01_default-setup_evolution.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/01_default-setup_evolution.patch?rev=10244&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/01_default-setup_evolution.patch (original)
+++ desktop/experimental/gnome-panel/debian/patches/01_default-setup_evolution.patch Sun Apr 22 14:07:26 2007
@@ -1,11 +1,0 @@
---- gnome-panel/panel-default-setup.entries~ 2006-01-22 12:34:03.000000000 +0100
-+++ gnome-panel/panel-default-setup.entries 2006-12-28 23:59:45.000000000 +0100
-@@ -306,7 +306,7 @@
- <key>objects/email_launcher/launcher_location</key>
- <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
- <value>
-- <string>evolution.desktop</string>
-+ <string>evolution-2.8.desktop</string>
- </value>
- </entry>
-
Modified: desktop/experimental/gnome-panel/debian/patches/02_menu_initial_size.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/02_menu_initial_size.patch?rev=10244&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/02_menu_initial_size.patch (original)
+++ desktop/experimental/gnome-panel/debian/patches/02_menu_initial_size.patch Sun Apr 22 14:07:26 2007
@@ -1,25 +1,0 @@
---- trunk/gnome-panel/menu.c 2007/02/05 23:37:35 10212
-+++ trunk/gnome-panel/menu.c 2007/02/17 12:52:00 10232
-@@ -1145,6 +1145,7 @@
- {
- GtkIconSize icon_size = (GtkIconSize) GPOINTER_TO_INT (data);
- int icon_height;
-+ int req_height;
-
- if (!gtk_icon_size_lookup (icon_size, NULL, &icon_height))
- return;
-@@ -1152,8 +1153,13 @@
- /* If we don't have a pixmap for this menuitem
- * at least make sure its the same height as
- * the rest.
-+ * This is a bit ugly, since we should keep this in sync with what's in
-+ * gtk_menu_item_size_request()
- */
-- requisition->height = MAX (requisition->height, icon_height);
-+ req_height = icon_height;
-+ req_height += (GTK_CONTAINER (menuitem)->border_width +
-+ menuitem->style->ythickness) * 2;
-+ requisition->height = MAX (requisition->height, req_height);
- }
-
- static char *
Modified: desktop/experimental/gnome-panel/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/rules?rev=10244&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/rules (original)
+++ desktop/experimental/gnome-panel/debian/rules Sun Apr 22 14:07:26 2007
@@ -10,7 +10,7 @@
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs -Wl,-O1 -Wl,--as-needed"
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper --with-in-process-applets=all
ifneq ($(DEB_BUILD_GNU_SYSTEM),gnu)
DEB_CONFIGURE_EXTRA_FLAGS += --enable-eds
endif
More information about the pkg-gnome-commits
mailing list