diff -u gnome-panel-2.18.0/debian/control gnome-panel-2.18.0/debian/control --- gnome-panel-2.18.0/debian/control +++ gnome-panel-2.18.0/debian/control @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Guilherme de S. Pastore Uploaders: Debian GNOME Maintainers , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Kilian Krause , Loic Minier , Marc 'HE' Brockschmidt , Marco Cabizza , Oystein Gisnas , Ondřej Surý , Ross Burton , Sebastien Bacher , Sjoerd Simons Standards-Version: 3.7.2 -Build-Depends: , cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.2.0), patchutils (>= 0.2.25), debhelper (>= 5.0.7ubuntu4), liborbit2-dev (>= 1:2.12.1-1), libgconf2-dev (>= 2.6.1), libpango1.0-dev (>= 1.15.4), intltool, gnome-pkg-tools, dpkg-dev (>= 1.13.19), libgtk2.0-dev (>= 2.10), libglade2-dev (>= 1:2.5.1), libwnck-dev (>= 2.13.5), scrollkeeper (>= 0.3.14-9.1), libgnome-desktop-dev (>= 2.11.1), libpng12-dev, libbonobo2-dev (>= 2.8.1-2), libxmu-dev, libecal1.2-dev (>= 1.2.1-1) [!hurd-i386], libgnome-menu-dev (>= 2.11.1-1), libgnomevfs2-dev (>= 2.14.2), libxres-dev, sharutils, gnome-doc-utils, libedataserver1.2-dev, libedataserverui1.2-dev (>= 1.3.0), libxau-dev, libcairo2-dev (>= 1.0.0), libgnome-menu-dev (>= 2.16.1-1), libnspr-dev, liblpint-bonobo-dev, liblaunchpad-integration-dev, libdbus-glib-1-dev +Build-Depends: , cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.2.0), patchutils (>= 0.2.25), debhelper (>= 5.0.7ubuntu4), liborbit2-dev (>= 1:2.12.1-1), libgconf2-dev (>= 2.6.1), libpango1.0-dev (>= 1.15.4), intltool, gnome-pkg-tools, dpkg-dev (>= 1.13.19), libgtk2.0-dev (>= 2.10), libglade2-dev (>= 1:2.5.1), libwnck-dev (>= 2.13.5), scrollkeeper (>= 0.3.14-9.1), libgnome-desktop-dev (>= 2.11.1), libpng12-dev, libbonobo2-dev (>= 2.8.1-2), libxmu-dev, libecal1.2-dev (>= 1.2.1-1) [!hurd-i386], libgnomevfs2-dev (>= 2.14.2), libxres-dev, sharutils, gnome-doc-utils, libedataserver1.2-dev, libedataserverui1.2-dev (>= 1.3.0), libxau-dev, libcairo2-dev (>= 1.0.0), libgnome-menu-dev (>= 2.16.1-1), libnspr-dev, liblpint-bonobo-dev, liblaunchpad-integration-dev, libdbus-glib-1-dev Package: gnome-panel Architecture: any diff -u gnome-panel-2.18.0/debian/changelog gnome-panel-2.18.0/debian/changelog --- gnome-panel-2.18.0/debian/changelog +++ gnome-panel-2.18.0/debian/changelog @@ -1,3 +1,12 @@ +gnome-panel (2.18.0-0ubuntu3) feisty; urgency=low + + * debian/patches/01_layout.patch: + - added Edubuntu docs entry. + * debian/control.in: + - dropped duplicate libgnome-menu-dev Build-Dep. + + -- Daniel Holbach Mon, 26 Mar 2007 18:31:44 +0200 + gnome-panel (2.18.0-0ubuntu2) feisty; urgency=low * debian/control, debian/rules: diff -u gnome-panel-2.18.0/debian/control.in gnome-panel-2.18.0/debian/control.in --- gnome-panel-2.18.0/debian/control.in +++ gnome-panel-2.18.0/debian/control.in @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Guilherme de S. Pastore Uploaders: @GNOME_TEAM@ Standards-Version: 3.7.2 -Build-Depends: @cdbs@, liborbit2-dev (>= 1:2.12.1-1), libgconf2-dev (>= 2.6.1), libpango1.0-dev (>= 1.15.4), intltool, gnome-pkg-tools, dpkg-dev (>= 1.13.19), libgtk2.0-dev (>= 2.10), libglade2-dev (>= 1:2.5.1), libwnck-dev (>= 2.13.5), scrollkeeper (>= 0.3.14-9.1), libgnome-desktop-dev (>= 2.11.1), libpng12-dev, libbonobo2-dev (>= 2.8.1-2), libxmu-dev, libecal1.2-dev (>= 1.2.1-1) [!hurd-i386], libgnome-menu-dev (>= 2.11.1-1), libgnomevfs2-dev (>= 2.14.2), libxres-dev, sharutils, gnome-doc-utils, libedataserver1.2-dev, libedataserverui1.2-dev (>= 1.3.0), libxau-dev, libcairo2-dev (>= 1.0.0), libgnome-menu-dev (>= 2.16.1-1), libnspr-dev, liblpint-bonobo-dev, liblaunchpad-integration-dev, libdbus-glib-1-dev +Build-Depends: @cdbs@, liborbit2-dev (>= 1:2.12.1-1), libgconf2-dev (>= 2.6.1), libpango1.0-dev (>= 1.15.4), intltool, gnome-pkg-tools, dpkg-dev (>= 1.13.19), libgtk2.0-dev (>= 2.10), libglade2-dev (>= 1:2.5.1), libwnck-dev (>= 2.13.5), scrollkeeper (>= 0.3.14-9.1), libgnome-desktop-dev (>= 2.11.1), libpng12-dev, libbonobo2-dev (>= 2.8.1-2), libxmu-dev, libecal1.2-dev (>= 1.2.1-1) [!hurd-i386], libgnomevfs2-dev (>= 2.14.2), libxres-dev, sharutils, gnome-doc-utils, libedataserver1.2-dev, libedataserverui1.2-dev (>= 1.3.0), libxau-dev, libcairo2-dev (>= 1.0.0), libgnome-menu-dev (>= 2.16.1-1), libnspr-dev, liblpint-bonobo-dev, liblaunchpad-integration-dev, libdbus-glib-1-dev Package: gnome-panel Architecture: any diff -u gnome-panel-2.18.0/debian/patches/01_layout.patch gnome-panel-2.18.0/debian/patches/01_layout.patch --- gnome-panel-2.18.0/debian/patches/01_layout.patch +++ gnome-panel-2.18.0/debian/patches/01_layout.patch @@ -1,6 +1,6 @@ -diff -Nur gnome-panel-2.17.91/gnome-panel/panel-menu-items.c gnome-panel-2.17.91.new/gnome-panel/panel-menu-items.c ---- gnome-panel-2.17.91/gnome-panel/panel-menu-items.c 2007-02-12 23:50:42.000000000 +0100 -+++ gnome-panel-2.17.91.new/gnome-panel/panel-menu-items.c 2007-02-13 11:51:36.000000000 +0100 +diff -Nur gnome-panel-2.18.0/gnome-panel/panel-menu-items.c gnome-panel-2.18.0.new/gnome-panel/panel-menu-items.c +--- gnome-panel-2.18.0/gnome-panel/panel-menu-items.c 2007-03-12 19:48:43.000000000 +0100 ++++ gnome-panel-2.18.0.new/gnome-panel/panel-menu-items.c 2007-03-26 18:35:58.000000000 +0200 @@ -569,6 +569,7 @@ GtkWidget *places_menu; GtkWidget *item; @@ -26,7 +26,7 @@ if (!gconf_client_get_bool (panel_gconf_get_client (), DESKTOP_IS_HOME_DIR_KEY, NULL)) { -@@ -715,9 +726,18 @@ +@@ -715,9 +726,22 @@ if (add_separator) add_menu_separator (menu); @@ -43,6 +43,10 @@ + G_FILE_TEST_IS_REGULAR)) + panel_menu_items_append_from_desktop (menu, "ubuntu-about.desktop", NULL); + ++ if (g_file_test (DATADIR"/omf/about-edubuntu/about-edubuntu-C.omf", ++ G_FILE_TEST_IS_REGULAR)) ++ panel_menu_items_append_from_desktop (menu, "edubuntu-about.desktop", NULL); ++ if (parent->priv->append_lock_logout) panel_menu_items_append_lock_logout (menu); }