r27005 - in /desktop/experimental/gnome-panel/debian: ./ maintfiles/ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Mar 21 15:37:13 UTC 2011
Author: joss
Date: Mon Mar 21 15:37:12 2011
New Revision: 27005
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27005
Log:
* New upstream pre-release.
* libpanel-applet changes API version.
* Massive update to build-dependencies.
* Simplify dependencies.
* Break gnome-applets < 3.
* Same for control-center and g-s-d.
* Remove gnome-panel-data.post{inst,rm}, should be useless now.
* Remove old maintfiles subdirectory.
* 0001-build-explicitly-link-to-xrandr.patch,
30_crasher_realize.patch, 31_crasher_pager.patch: dropped, merged
upstream.
* 01_panel_submenus.patch, 03_tasklist_orientation.patch: updated
for the new version.
* 02_mixer_applet.patch: dropped, obsolete with new g-s-d.
+ Note that this means experience without PA is radically
diminished.
* 06_clock_permissions.patch: dropped, obsolete.
* 09_default_icons.patch: refreshed.
* Abandon --as-needed, since for an unknown reason it fails to link
the required libX11.
* Update list of installed files.
* Move desktop file to gnome-panel; add corresponding Replaces.
* Add introspection package.
* Update copyright information.
Added:
desktop/experimental/gnome-panel/debian/gir1.2-panelapplet-4.0.install
desktop/experimental/gnome-panel/debian/libpanel-applet-4-0.install
- copied, changed from r26929, desktop/experimental/gnome-panel/debian/libpanel-applet2-0.install
desktop/experimental/gnome-panel/debian/libpanel-applet-4-dev.install
- copied, changed from r26929, desktop/experimental/gnome-panel/debian/libpanel-applet2-dev.install
desktop/experimental/gnome-panel/debian/libpanel-applet-4-doc.install
- copied, changed from r26929, desktop/experimental/gnome-panel/debian/libpanel-applet2-doc.install
Removed:
desktop/experimental/gnome-panel/debian/gnome-panel-data.postinst
desktop/experimental/gnome-panel/debian/gnome-panel-data.postrm
desktop/experimental/gnome-panel/debian/libpanel-applet2-0.install
desktop/experimental/gnome-panel/debian/libpanel-applet2-dev.install
desktop/experimental/gnome-panel/debian/libpanel-applet2-doc.doc-base
desktop/experimental/gnome-panel/debian/libpanel-applet2-doc.install
desktop/experimental/gnome-panel/debian/libpanel-applet2-doc.links
desktop/experimental/gnome-panel/debian/maintfiles/
desktop/experimental/gnome-panel/debian/patches/0001-build-explicitly-link-to-xrandr.patch
desktop/experimental/gnome-panel/debian/patches/02_mixer_applet.patch
desktop/experimental/gnome-panel/debian/patches/06_clock_permissions.patch
desktop/experimental/gnome-panel/debian/patches/30_crasher_realize.patch
desktop/experimental/gnome-panel/debian/patches/31_crasher_pager.patch
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/copyright
desktop/experimental/gnome-panel/debian/gnome-panel-data.install
desktop/experimental/gnome-panel/debian/gnome-panel.install
desktop/experimental/gnome-panel/debian/patches/01_panel_submenus.patch
desktop/experimental/gnome-panel/debian/patches/03_tasklist_orientation.patch
desktop/experimental/gnome-panel/debian/patches/09_default_icons.patch
desktop/experimental/gnome-panel/debian/patches/series
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=27005&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/changelog [utf-8] Mon Mar 21 15:37:12 2011
@@ -1,3 +1,32 @@
+gnome-panel (2.91.91-1) experimental; urgency=low
+
+ * New upstream pre-release.
+ * libpanel-applet changes API version.
+ * Massive update to build-dependencies.
+ * Simplify dependencies.
+ * Break gnome-applets < 3.
+ * Same for control-center and g-s-d.
+ * Remove gnome-panel-data.post{inst,rm}, should be useless now.
+ * Remove old maintfiles subdirectory.
+ * 0001-build-explicitly-link-to-xrandr.patch,
+ 30_crasher_realize.patch, 31_crasher_pager.patch: dropped, merged
+ upstream.
+ * 01_panel_submenus.patch, 03_tasklist_orientation.patch: updated
+ for the new version.
+ * 02_mixer_applet.patch: dropped, obsolete with new g-s-d.
+ + Note that this means experience without PA is radically
+ diminished.
+ * 06_clock_permissions.patch: dropped, obsolete.
+ * 09_default_icons.patch: refreshed.
+ * Abandon --as-needed, since for an unknown reason it fails to link
+ the required libX11.
+ * Update list of installed files.
+ * Move desktop file to gnome-panel; add corresponding Replaces.
+ * Add introspection package.
+ * Update copyright information.
+
+ -- Josselin Mouette <joss at debian.org> Mon, 21 Mar 2011 16:36:57 +0100
+
gnome-panel (2.30.2-4) unstable; urgency=low
* debian/patches/0001-build-explicitly-link-to-xrandr.patch:
Modified: desktop/experimental/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/control?rev=27005&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/control [utf-8] Mon Mar 21 15:37:12 2011
@@ -7,64 +7,65 @@
Section: gnome
Priority: optional
Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Julian Andres Klode <jak at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>
Standards-Version: 3.9.0
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 5),
intltool (>= 0.40.0),
gnome-pkg-tools (>= 0.14),
dh-autoreconf,
- gnome-doc-utils,
python,
+ pkg-config (>= 0.9.0),
+ gobject-introspection (>= 0.9.12-4~),
+ libgirepository1.0-dev (>= 0.9.5),
+ gir1.2-atk-1.0,
+ gir1.2-freedesktop,
+ gir1.2-gconf-2.0,
+ gir1.2-gdkpixbuf-2.0,
+ gir1.2-glib-2.0,
+ gir1.2-gtk-3.0,
+ gir1.2-pango-1.0,
+ libgnome-desktop-3-dev (>= 2.91.0),
+ libgdk-pixbuf2.0-dev,
+ libpango1.0-dev (>= 1.15.4),
+ libglib2.0-dev (>= 2.25.12),
+ libgtk-3-dev (>= 3.0),
+ libwnck-3-dev (>= 2.91.0),
+ libgconf2-dev (>= 2.6.1),
+ libgnome-menu-dev (>= 2.27.92),
+ libecal1.2-dev (>= 2.91.2),
+ libedataserver1.2-dev (>= 2.91.2),
+ libedataserverui-3.0-dev (>= 2.91.2),
+ evolution-data-server-dev,
+ libcairo2-dev (>= 1.10.0),
+ libgweather-3-dev (>= 2.91.0),
+ libdbus-glib-1-dev (>= 0.80),
+ libdbus-1-dev (>= 1.1.2),
+ libice-dev,
+ libsm-dev,
libx11-dev,
libxau-dev,
- libice-dev,
- libsm-dev,
- libgtk2.0-dev (>= 2.19.7),
- libgnome-desktop-dev (>= 2.26),
- libbonoboui2-dev (>= 2.1.1),
- liborbit2-dev (>= 1:2.12.1),
- libwnck-dev (>= 2.30.0-3),
- libgconf2-dev (>= 2.6.1),
- libecal1.2-dev (>= 1.6.0),
- libedataserverui1.2-dev (>= 1.11.2),
- libcairo2-dev (>= 1.0.0),
+ libxt-dev,
+ libxrandr-dev (>= 2:1.2.0),
+ librsvg2-dev,
+ network-manager-dev (>= 0.6) [linux-any],
gtk-doc-tools (>= 1.0),
- libgnome-menu-dev (>= 2.27.92),
- libpango1.0-dev (>= 1.15.4),
- libedataserver1.2-dev (>= 1.2.0),
- libglib2.0-dev (>= 2.18.0),
- evolution-data-server-dev,
- libgweather-dev (>= 2.27.90),
- librsvg2-dev,
- libdbus-glib-1-dev (>= 0.71),
- libdbus-1-dev (>= 1.1.2),
- network-manager-dev (>= 0.6) [linux-any],
- libnm-util-dev (>= 0.6) [linux-any],
- libpolkit-gobject-1-dev (>= 0.91),
- libxrandr-dev (>= 2:1.2.0),
- libcanberra-gtk-dev
+ gnome-doc-utils
Package: gnome-panel
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- gnome-panel-data (>= ${gnome:Version}),
- gnome-panel-data (<< ${gnome:NextVersion}),
- gnome-desktop-data (>= 2.10.0-1),
- gnome-menus (>= 2.16.1),
- gnome-about (>= 2.10.0-1),
+ gnome-panel-data (= ${source:Version}),
+ gnome-menus (>= 2.27.92),
python,
- python-gnome2,
- python-gconf,
- policykit-1-gnome
-Recommends: gnome-applets (>= 2.12.1-1),
+ python-gconf
+Recommends: gnome-applets,
gnome-session (>= 2.26),
gnome-control-center,
evolution-data-server,
gnome-icon-theme (>= 2.24),
alacarte,
- menu-xdg (>= 0.2),
gvfs
Suggests: yelp,
gnome2-user-guide,
@@ -74,7 +75,10 @@
epiphany-browser
Breaks: gnome-session (<< 2.26),
gnome-power-manager (<< 2.26),
- gnome-control-center (<< 2.26)
+ gnome-control-center (<< 2.91),
+ gnome-settings-daemon (<< 2.91),
+ gnome-applets (<< 2.91)
+Replaces: gnome-panel-data (<< 2.91)
Description: launcher and docking facility for GNOME
The GNOME Panel is an essential part of the GNOME Desktop, providing
toolbar-like “panels” which can be attached to the sides of your desktop.
@@ -83,7 +87,7 @@
volume controls and the battery charge indicator, and utilities ranging
from weather forecast to system monitoring.
-Package: libpanel-applet2-0
+Package: libpanel-applet-4-0
Section: libs
Architecture: any
Depends: ${misc:Depends},
@@ -97,30 +101,30 @@
Architecture: any
Depends: ${misc:Depends},
gnome-panel (= ${binary:Version}),
- libpanel-applet2-0 (= ${binary:Version})
+ libpanel-applet-4-0 (= ${binary:Version})
Description: GNOME Panel and library for panel applets - debugging symbols
This package contains debugging symbols for gnome-panel and the
libpanel-applet library. It is provided to help debugging problem in
the panel itself or in the library. The debugging symbols are installed
in /usr/lib/debug and will automatically be used by gdb.
-Package: libpanel-applet2-dev
+Package: libpanel-applet-4-dev
Section: libdevel
Architecture: any
Depends: ${misc:Depends},
- libpanel-applet2-0 (= ${binary:Version}),
- libgconf2-dev (>= 2.6.1),
- libgtk2.0-dev (>= 2.19.7),
- libbonoboui2-dev (>= 2.1.1)
+ libpanel-applet-4-0 (= ${binary:Version}),
+ libglib2.0-dev,
+ libgconf2-dev,
+ libgtk-3-dev
+Recommends: libpanel-applet-4-doc
Description: library for GNOME Panel applets - development files
This package provides the include files and static library for the GNOME
Panel applet library functions.
-Package: libpanel-applet2-doc
+Package: libpanel-applet-4-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Suggests: doc-base
Description: library for GNOME Panel applets - documentation files
This package provides the documentation files for the GNOME Panel applet
library functions.
@@ -134,3 +138,15 @@
Description: common files for the GNOME Panel
This package includes some files that are needed by the GNOME Panel
(Pixmaps, .desktop files and internationalization files).
+
+Package: gir1.2-panelapplet-4.0
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: GObject introspection for the GNOME Panel Applet library
+ This package contains introspection data for the libpanel-applet
+ library. It can be used by languages supporting dynamic bindings with
+ the GIRepository format to build GNOME panel applets in these
+ languages.
Modified: desktop/experimental/gnome-panel/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/control.in?rev=27005&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/control.in [utf-8] Mon Mar 21 15:37:12 2011
@@ -9,57 +9,58 @@
intltool (>= 0.40.0),
gnome-pkg-tools (>= 0.14),
dh-autoreconf,
- gnome-doc-utils,
python,
+ pkg-config (>= 0.9.0),
+ gobject-introspection (>= 0.9.12-4~),
+ libgirepository1.0-dev (>= 0.9.5),
+ gir1.2-atk-1.0,
+ gir1.2-freedesktop,
+ gir1.2-gconf-2.0,
+ gir1.2-gdkpixbuf-2.0,
+ gir1.2-glib-2.0,
+ gir1.2-gtk-3.0,
+ gir1.2-pango-1.0,
+ libgnome-desktop-3-dev (>= 2.91.0),
+ libgdk-pixbuf2.0-dev,
+ libpango1.0-dev (>= 1.15.4),
+ libglib2.0-dev (>= 2.25.12),
+ libgtk-3-dev (>= 3.0),
+ libwnck-3-dev (>= 2.91.0),
+ libgconf2-dev (>= 2.6.1),
+ libgnome-menu-dev (>= 2.27.92),
+ libecal1.2-dev (>= 2.91.2),
+ libedataserver1.2-dev (>= 2.91.2),
+ libedataserverui-3.0-dev (>= 2.91.2),
+ evolution-data-server-dev,
+ libcairo2-dev (>= 1.10.0),
+ libgweather-3-dev (>= 2.91.0),
+ libdbus-glib-1-dev (>= 0.80),
+ libdbus-1-dev (>= 1.1.2),
+ libice-dev,
+ libsm-dev,
libx11-dev,
libxau-dev,
- libice-dev,
- libsm-dev,
- libgtk2.0-dev (>= 2.19.7),
- libgnome-desktop-dev (>= 2.26),
- libbonoboui2-dev (>= 2.1.1),
- liborbit2-dev (>= 1:2.12.1),
- libwnck-dev (>= 2.30.0-3),
- libgconf2-dev (>= 2.6.1),
- libecal1.2-dev (>= 1.6.0),
- libedataserverui1.2-dev (>= 1.11.2),
- libcairo2-dev (>= 1.0.0),
+ libxt-dev,
+ libxrandr-dev (>= 2:1.2.0),
+ librsvg2-dev,
+ network-manager-dev (>= 0.6) [linux-any],
gtk-doc-tools (>= 1.0),
- libgnome-menu-dev (>= 2.27.92),
- libpango1.0-dev (>= 1.15.4),
- libedataserver1.2-dev (>= 1.2.0),
- libglib2.0-dev (>= 2.18.0),
- evolution-data-server-dev,
- libgweather-dev (>= 2.27.90),
- librsvg2-dev,
- libdbus-glib-1-dev (>= 0.71),
- libdbus-1-dev (>= 1.1.2),
- network-manager-dev (>= 0.6) [linux-any],
- libnm-util-dev (>= 0.6) [linux-any],
- libpolkit-gobject-1-dev (>= 0.91),
- libxrandr-dev (>= 2:1.2.0),
- libcanberra-gtk-dev
+ gnome-doc-utils
Package: gnome-panel
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- gnome-panel-data (>= ${gnome:Version}),
- gnome-panel-data (<< ${gnome:NextVersion}),
- gnome-desktop-data (>= 2.10.0-1),
- gnome-menus (>= 2.16.1),
- gnome-about (>= 2.10.0-1),
+ gnome-panel-data (= ${source:Version}),
+ gnome-menus (>= 2.27.92),
python,
- python-gnome2,
- python-gconf,
- policykit-1-gnome
-Recommends: gnome-applets (>= 2.12.1-1),
+ python-gconf
+Recommends: gnome-applets,
gnome-session (>= 2.26),
gnome-control-center,
evolution-data-server,
gnome-icon-theme (>= 2.24),
alacarte,
- menu-xdg (>= 0.2),
gvfs
Suggests: yelp,
gnome2-user-guide,
@@ -69,7 +70,10 @@
epiphany-browser
Breaks: gnome-session (<< 2.26),
gnome-power-manager (<< 2.26),
- gnome-control-center (<< 2.26)
+ gnome-control-center (<< 2.91),
+ gnome-settings-daemon (<< 2.91),
+ gnome-applets (<< 2.91)
+Replaces: gnome-panel-data (<< 2.91)
Description: launcher and docking facility for GNOME
The GNOME Panel is an essential part of the GNOME Desktop, providing
toolbar-like “panels” which can be attached to the sides of your desktop.
@@ -78,7 +82,7 @@
volume controls and the battery charge indicator, and utilities ranging
from weather forecast to system monitoring.
-Package: libpanel-applet2-0
+Package: libpanel-applet-4-0
Section: libs
Architecture: any
Depends: ${misc:Depends},
@@ -92,30 +96,30 @@
Architecture: any
Depends: ${misc:Depends},
gnome-panel (= ${binary:Version}),
- libpanel-applet2-0 (= ${binary:Version})
+ libpanel-applet-4-0 (= ${binary:Version})
Description: GNOME Panel and library for panel applets - debugging symbols
This package contains debugging symbols for gnome-panel and the
libpanel-applet library. It is provided to help debugging problem in
the panel itself or in the library. The debugging symbols are installed
in /usr/lib/debug and will automatically be used by gdb.
-Package: libpanel-applet2-dev
+Package: libpanel-applet-4-dev
Section: libdevel
Architecture: any
Depends: ${misc:Depends},
- libpanel-applet2-0 (= ${binary:Version}),
- libgconf2-dev (>= 2.6.1),
- libgtk2.0-dev (>= 2.19.7),
- libbonoboui2-dev (>= 2.1.1)
+ libpanel-applet-4-0 (= ${binary:Version}),
+ libglib2.0-dev,
+ libgconf2-dev,
+ libgtk-3-dev
+Recommends: libpanel-applet-4-doc
Description: library for GNOME Panel applets - development files
This package provides the include files and static library for the GNOME
Panel applet library functions.
-Package: libpanel-applet2-doc
+Package: libpanel-applet-4-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Suggests: doc-base
Description: library for GNOME Panel applets - documentation files
This package provides the documentation files for the GNOME Panel applet
library functions.
@@ -129,3 +133,15 @@
Description: common files for the GNOME Panel
This package includes some files that are needed by the GNOME Panel
(Pixmaps, .desktop files and internationalization files).
+
+Package: gir1.2-panelapplet-4.0
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: GObject introspection for the GNOME Panel Applet library
+ This package contains introspection data for the libpanel-applet
+ library. It can be used by languages supporting dynamic bindings with
+ the GIRepository format to build GNOME panel applets in these
+ languages.
Modified: desktop/experimental/gnome-panel/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/copyright?rev=27005&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/copyright [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/copyright [utf-8] Mon Mar 21 15:37:12 2011
@@ -6,9 +6,61 @@
It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/
-Upstream Authors and Copyright holders:
- Too many to list here, but the full list is in:
- /usr/share/doc/gnome-panel/AUTHORS
+Upstream Authors:
+
+ George Lebl <jirka at 5z.com>
+ Jacob Berkman <jberkman at andrew.cmu.edu>
+ Miguel de Icaza <miguel at kernel.org>
+ Federico Mena <quartic at gimp.org>
+ Tom Tromey <tromey at cygnus.com>
+ Ian Main <imain at gtk.org>
+ Elliot Lee <sopwith at redhat.com>
+ Owen Taylor <otaylor at redhat.com>
+ Mark McLoughlin <mark at skynet.ie>
+ Alex Larsson <alexl at redhat.com>
+ Martin Baulig <baulig at suse.de>
+ Seth Nickell <snickell at stanford.edu>
+ Darin Adler <darin at bentspoon.com>
+ Glynn Foster <glynn.foster at sun.com>
+ Stephen Browne <stephen.browne at sun.com>
+ Anders Carlsson <andersca at gnu.org>
+ Padraig O'Briain <padraig.obriain at sun.com>
+ Ian McKellar <yakk at yakk.net>
+ Arvind Samptur <arvind.samptur at wipro.com>
+ Vincent Untz <vuntz at gnome.org>
+ Carlos Garcia Campos <carlosgc at gnome.org>
+ Jaka Mocnik <jaka.mocnik at kiss.uni-lj.si>
+ Lennart Poettering <poettering at gmx.net>
+ Havoc Pennington <havoc at redhat.com>
+ Wanda The Fish <wanda at gnome.org>
+
+
+Copyright holders:
+
+ Copyright © 2000, 2001 Eazel, Inc.
+ Copyright © 2000 Helix Code, Inc.
+ Copyright © 2001 George Lebl
+ Copyright © 2001-2004 Sun Microsystems Inc.
+ Copyright © 1997-2004 Free Software Foundation, Inc.
+ Copyright © 1997-2002 Alfredo K. Kojima
+ Copyright © 1999-2008 Red Hat Inc.
+ Copyright © 2000-2001 Ximian, Inc.
+ Copyright © 2001, 2002 Ian McKellar
+ Copyright © 2001 Havoc Pennington
+ Copyright © 2002-2010 Vincent Untz
+ Copyright © 2002 Anders Carlsson
+ Copyright © 2002 James Willcox
+ Copyright © 2003, 2004 Rob Adams
+ Copyright © 2003 Frank Worsley
+ Copyright © 2003 Wipro Technologies
+ Copyright © 2005, 2010 Carlos Garcia Campos
+ Copyright © 2006, 2007 Christian Persch
+ Copyright © 2006 Ray Strode
+ Copyright © 2007 David Zeuthen
+ Copyright © 2007-2011 Novell, Inc.
+ Copyright © Dennis Cranston
+ Copyright © Mark McLoughlin
+
License for the panel:
Added: desktop/experimental/gnome-panel/debian/gir1.2-panelapplet-4.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/gir1.2-panelapplet-4.0.install?rev=27005&op=file
==============================================================================
--- desktop/experimental/gnome-panel/debian/gir1.2-panelapplet-4.0.install (added)
+++ desktop/experimental/gnome-panel/debian/gir1.2-panelapplet-4.0.install [utf-8] Mon Mar 21 15:37:12 2011
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/girepository-1.0
Modified: desktop/experimental/gnome-panel/debian/gnome-panel-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/gnome-panel-data.install?rev=27005&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/gnome-panel-data.install [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/gnome-panel-data.install [utf-8] Mon Mar 21 15:37:12 2011
@@ -1,13 +1,6 @@
debian/tmp/etc/gconf/ usr/share/
-debian/tmp/etc/dbus-1
-debian/tmp/usr/lib/bonobo
-debian/tmp/usr/share/applications
-debian/tmp/usr/share/dbus-1
-debian/tmp/usr/share/gnome-panelrc usr/share/gnome/
debian/tmp/usr/share/gnome-panel
debian/tmp/usr/share/gnome
-debian/tmp/usr/share/gnome-2.0
debian/tmp/usr/share/icons
debian/tmp/usr/share/locale
debian/tmp/usr/share/omf
-debian/tmp/usr/share/polkit-1
Modified: desktop/experimental/gnome-panel/debian/gnome-panel.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/gnome-panel.install?rev=27005&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/gnome-panel.install [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/gnome-panel.install [utf-8] Mon Mar 21 15:37:12 2011
@@ -1,4 +1,5 @@
debian/tmp/usr/bin
-debian/tmp/usr/lib/gnome-panel/*.so
+debian/tmp/usr/lib/gnome-panel/*/*.so
debian/tmp/usr/lib/gnome-panel/gnome-*
debian/tmp/usr/share/man
+debian/tmp/usr/share/applications
Copied: desktop/experimental/gnome-panel/debian/libpanel-applet-4-0.install (from r26929, desktop/experimental/gnome-panel/debian/libpanel-applet2-0.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/libpanel-applet-4-0.install?rev=27005&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/libpanel-applet2-0.install [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/libpanel-applet-4-0.install [utf-8] Mon Mar 21 15:37:12 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libpanel-applet-2.so.* usr/lib/
+debian/tmp/usr/lib/libpanel-applet*.so.*
Copied: desktop/experimental/gnome-panel/debian/libpanel-applet-4-dev.install (from r26929, desktop/experimental/gnome-panel/debian/libpanel-applet2-dev.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/libpanel-applet-4-dev.install?rev=27005&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/libpanel-applet2-dev.install [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/libpanel-applet-4-dev.install [utf-8] Mon Mar 21 15:37:12 2011
@@ -1,5 +1,5 @@
-debian/tmp/usr/include/ usr/
-debian/tmp/usr/lib/pkgconfig usr/lib/
-debian/tmp/usr/lib/libpanel-applet-2.a usr/lib/
-debian/tmp/usr/lib/libpanel-applet-2.so usr/lib/
-debian/tmp/usr/share/idl/ usr/share/
+debian/tmp/usr/include
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/libpanel-applet*.a
+debian/tmp/usr/lib/libpanel-applet*.so
+debian/tmp/usr/share/gir-1.0
Copied: desktop/experimental/gnome-panel/debian/libpanel-applet-4-doc.install (from r26929, desktop/experimental/gnome-panel/debian/libpanel-applet2-doc.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/libpanel-applet-4-doc.install?rev=27005&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/libpanel-applet2-doc.install [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/libpanel-applet-4-doc.install [utf-8] Mon Mar 21 15:37:12 2011
@@ -1,1 +1,1 @@
-doc/reference/panel-applet/html usr/share/doc/libpanel-applet2-doc/
+debian/tmp/usr/share/gtk-doc
Modified: desktop/experimental/gnome-panel/debian/patches/01_panel_submenus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/01_panel_submenus.patch?rev=27005&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/01_panel_submenus.patch [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/01_panel_submenus.patch [utf-8] Mon Mar 21 15:37:12 2011
@@ -1,15 +1,13 @@
-Index: gnome-panel-2.26.0/gnome-panel/panel-menu-button.c
+Index: gnome-panel-2.91.91/gnome-panel/panel-menu-button.c
===================================================================
---- gnome-panel-2.26.0.orig/gnome-panel/panel-menu-button.c 2009-03-16 23:37:12.000000000 +0100
-+++ gnome-panel-2.26.0/gnome-panel/panel-menu-button.c 2009-04-12 12:42:02.945978595 +0200
-@@ -74,8 +74,8 @@ typedef struct {
+--- gnome-panel-2.91.91.orig/gnome-panel/panel-menu-button.c 2011-02-22 23:18:59.000000000 +0100
++++ gnome-panel-2.91.91/gnome-panel/panel-menu-button.c 2011-03-21 15:00:12.291985000 +0100
+@@ -76,7 +76,7 @@ typedef struct {
} MenuPathRootItem;
static MenuPathRootItem root_items [] = {
- { APPLICATIONS_MENU, "applications", "applications.menu" },
-- { SETTINGS_MENU, "settings", "settings.menu" }
+ { APPLICATIONS_MENU, "applications", "gnome-applications.menu" },
-+ { SETTINGS_MENU, "settings", "gnome-settings.menu" }
- };
-
- struct _PanelMenuButtonPrivate {
+ { GNOMECC_MENU, "gnomecc", "gnomecc.menu" },
+ /* compatibility with GNOME < 2.91.0 */
+ { SETTINGS_MENU, "settings", NULL }
Modified: desktop/experimental/gnome-panel/debian/patches/03_tasklist_orientation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/03_tasklist_orientation.patch?rev=27005&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/03_tasklist_orientation.patch [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/03_tasklist_orientation.patch [utf-8] Mon Mar 21 15:37:12 2011
@@ -1,19 +1,20 @@
Debian #524117
GNOME #513347
-Index: gnome-panel-2.30.2/applets/wncklet/window-list.c
+Index: gnome-panel-2.91.91/applets/wncklet/window-list.c
===================================================================
---- gnome-panel-2.30.2.orig/applets/wncklet/window-list.c 2010-06-22 19:27:02.000000000 +0200
-+++ gnome-panel-2.30.2/applets/wncklet/window-list.c 2010-08-17 00:09:45.942053595 +0200
-@@ -9,6 +9,7 @@
+--- gnome-panel-2.91.91.orig/applets/wncklet/window-list.c 2011-02-24 01:58:30.000000000 +0100
++++ gnome-panel-2.91.91/applets/wncklet/window-list.c 2011-03-21 15:06:43.203985000 +0100
+@@ -8,6 +8,8 @@
+ *
*/
- #define WNCK_I_KNOW_THIS_IS_UNSTABLE 1
+#define WNCK_I_KNOW_THIS_IS_NOT_UPSTREAM 1
-
++
#ifdef HAVE_CONFIG_H
#include <config.h>
-@@ -130,7 +131,7 @@ applet_change_orient (PanelApplet
+ #endif
+@@ -119,7 +121,7 @@ applet_change_orient (PanelApplet
return;
tasklist->orientation = new_orient;
@@ -22,13 +23,12 @@
tasklist_update (tasklist);
}
-@@ -518,7 +519,8 @@ window_list_applet_fill (PanelApplet *ap
- }
+@@ -493,6 +495,8 @@ window_list_applet_fill (PanelApplet *ap
- tasklist->tasklist = wnck_tasklist_new (NULL);
--
+ tasklist->tasklist = wnck_tasklist_new ();
+
+ wnck_tasklist_set_orientation (tasklist->tasklist, tasklist->orientation);
-+
++
wnck_tasklist_set_icon_loader (WNCK_TASKLIST (tasklist->tasklist),
icon_loader_func,
tasklist,
Modified: desktop/experimental/gnome-panel/debian/patches/09_default_icons.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/09_default_icons.patch?rev=27005&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/09_default_icons.patch [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/09_default_icons.patch [utf-8] Mon Mar 21 15:37:12 2011
@@ -1,8 +1,8 @@
-Index: gnome-panel-2.28.0/gnome-panel/menu.c
+Index: gnome-panel-2.91.91/gnome-panel/menu.c
===================================================================
---- gnome-panel-2.28.0.orig/gnome-panel/menu.c 2009-09-08 02:08:42.000000000 +0200
-+++ gnome-panel-2.28.0/gnome-panel/menu.c 2009-09-29 21:38:44.520365467 +0200
-@@ -1489,7 +1489,7 @@ create_menuitem (GtkWidget *men
+--- gnome-panel-2.91.91.orig/gnome-panel/menu.c 2011-02-21 22:47:59.000000000 +0100
++++ gnome-panel-2.91.91/gnome-panel/menu.c 2011-03-21 15:19:40.855985001 +0100
+@@ -1527,7 +1527,7 @@ create_menuitem (GtkWidget *men
NULL, NULL,
alias_directory ? gmenu_tree_directory_get_icon (alias_directory) :
gmenu_tree_entry_get_icon (entry),
@@ -11,11 +11,11 @@
setup_menuitem (menuitem,
panel_menu_icon_get_size (),
-Index: gnome-panel-2.28.0/gnome-panel/panel-stock-icons.h
+Index: gnome-panel-2.91.91/gnome-panel/panel-stock-icons.h
===================================================================
---- gnome-panel-2.28.0.orig/gnome-panel/panel-stock-icons.h 2009-08-19 21:59:57.000000000 +0200
-+++ gnome-panel-2.28.0/gnome-panel/panel-stock-icons.h 2009-09-29 21:38:44.520365467 +0200
-@@ -46,6 +46,8 @@ G_BEGIN_DECLS
+--- gnome-panel-2.91.91.orig/gnome-panel/panel-stock-icons.h 2011-02-22 23:18:58.000000000 +0100
++++ gnome-panel-2.91.91/gnome-panel/panel-stock-icons.h 2011-03-21 15:19:40.859985001 +0100
+@@ -43,6 +43,8 @@ G_BEGIN_DECLS
#define PANEL_STOCK_EXECUTE "panel-execute"
#define PANEL_STOCK_CLEAR "panel-clear"
#define PANEL_STOCK_DONT_DELETE "panel-dont-delete"
Modified: desktop/experimental/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/series?rev=27005&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/series [utf-8] Mon Mar 21 15:37:12 2011
@@ -1,9 +1,4 @@
-0001-build-explicitly-link-to-xrandr.patch
01_panel_submenus.patch
-02_mixer_applet.patch
03_tasklist_orientation.patch
-06_clock_permissions.patch
09_default_icons.patch
10_bookmarks_limit.patch
-30_crasher_realize.patch
-31_crasher_pager.patch
Modified: desktop/experimental/gnome-panel/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/rules?rev=27005&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/rules [utf-8] Mon Mar 21 15:37:12 2011
@@ -8,7 +8,7 @@
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+LDFLAGS += -Wl,-z,defs -Wl,-O1
DEB_CONFIGURE_EXTRA_FLAGS += \
--disable-scrollkeeper \
@@ -17,7 +17,7 @@
DEB_CONFIGURE_EXTRA_FLAGS += --enable-eds
endif
-DEB_DH_MAKESHLIBS_ARGS_libpanel-applet2-0 += -V"libpanel-applet2-0 (>= 2.28.0)"
+DEB_DH_MAKESHLIBS_ARGS_libpanel-applet-4-0 += -V"libpanel-applet-4-0 (>= 2.91.91)"
DEB_DH_MAKESHLIBS_ARGS_gnome-panel += --no-act
binary-install/gnome-panel::
@@ -30,6 +30,3 @@
mv schemas/panel-default-setup.entries \
defaults/05_panel-default-setup.entries
-binary-install/libpanel-applet2-doc::
- find debian/libpanel-applet2-doc/usr/share/doc/libpanel-applet2-doc/ -name ".arch-ids" -depth -exec rm -rf {} \;
-
More information about the pkg-gnome-commits
mailing list