diff -Nru meta-gnome2-2.30+6/debian/changelog meta-gnome2-2.30+6ubuntu1/debian/changelog --- meta-gnome2-2.30+6/debian/changelog 2010-11-07 01:05:21.000000000 +0100 +++ meta-gnome2-2.30+6ubuntu1/debian/changelog 2010-11-13 16:56:37.000000000 +0100 @@ -1,3 +1,21 @@ +meta-gnome2 (1:2.30+6ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: (LP: #674908) + - gnome: Use system-config-printer-gnome and not + system-config-printer. + - gnome-core-devel: Remove libgail-dev as gail is in gtk2. + - gnome-devel: Unversion glade-gnome. + - gnome-dbg: + + Remove depend on libgail-dbg. + + Recommend liboobs-1-5-dbg instead of liboobs-1-4-dbg. + - gnome-desktop-environment: Don't depend on non-existing + gnome-mount (obsoleted by udisks). + - gnome-api-docs: Change libgtop2-doc depend to libgtop2-dev + recommend. The package is not split in Ubuntu, + and the documentation is shipped with the header files. + + -- Artur Rona Sat, 13 Nov 2010 14:30:52 +0100 + meta-gnome2 (1:2.30+6) unstable; urgency=low * Make gnome-accessibility depend on freedesktop-sound-theme. @@ -160,6 +178,65 @@ -- Josselin Mouette Fri, 13 Nov 2009 19:23:01 +0100 +meta-gnome2 (1:2.28+1ubuntu4) maverick; urgency=low + + * gnome-dbg: Recommend liboobs-1-5-dbg instead of liboobs-1-4-dbg. + + -- Matthias Klose Fri, 24 Sep 2010 19:18:18 +0200 + +meta-gnome2 (1:2.28+1ubuntu3) lucid; urgency=low + + * debian/control.in: Drop dependencies to libempathy-doc and + libempathy-gtk-doc, which are NBS. + + -- Martin Pitt Thu, 01 Apr 2010 10:59:43 +0200 + +meta-gnome2 (1:2.28+1ubuntu2) lucid; urgency=low + + * Replace obsolete policykit-doc/policykit-gnome-doc with policykit-1-doc. + (LP: #530829) + + -- Martin Pitt Wed, 03 Mar 2010 10:03:07 +0100 + +meta-gnome2 (1:2.28+1ubuntu1) lucid; urgency=low + + * Sync on Debian unstable. + * debian/control: + - gnome: + + Use system-config-printer-gnome and not + system-config-printer (LP: #273015). + + Remove gnome-volume-manager depends. This is not necessary + alongside gvfs (which is pulled in by gnome-core) + (LP: #412643). + + Don't recommend hal-cups-utils. This is just a transitionary + package to handle upgrades to system-config-printer-udev, + which is already recommended via system-config-printer-gnome. + + Depend on software-center as a preferred alternative to + gnome-app-install + - gnome-office: Don't depend on abiword-plugin-goffice which doesnt + exist in ubuntu. Add depend on abiword instead. + - gnome-core-devel: + + Remove libgail-dev as gail is in gtk2. + + Relax libgtop2-dev and python-gobject-dev requirements + - gnome-devel: + + Unversion glade-gnome + + Relax gnome-devel-docs requirement + - gnome-dbg: + + Remove depend on libgail-dbg + + Supersede firefox 3.0 and xulrunner-1.9; drop xulrunner-1.9-dbg + from recommends. + - gnome-desktop-environment: + + Don't depend on gnome-mount. + + Relax ekiga requirement. + - gnome-api-docs: + + Relax gnome-devel-docs and python-gobject-dev + requirements. + + Change libgtop2-doc depend to libgtop2-dev recommend. The package + is not split in Ubuntu, and the documentation is shipped with the + header files. + + -- Chris Coulson Sat, 14 Nov 2009 00:21:44 +0000 + meta-gnome2 (1:2.28+1) unstable; urgency=low * Make gnome-core and gnome-desktop-environment @@ -336,6 +413,75 @@ -- Josselin Mouette Thu, 18 Sep 2008 17:16:21 +0200 +meta-gnome2 (1:2.22.2~4ubuntu8) karmic; urgency=low + + * LP: #455517 - supersede firefox 3.0 and xulrunner-1.9 in karmic; + drop xulrunner-1.9-dbg from gnome-dbg recommends + + -- Alexander Sack Tue, 20 Oct 2009 11:27:05 +0200 + +meta-gnome2 (1:2.22.2~4ubuntu7) karmic; urgency=low + + * g-core-devel: + - Remove the Depends on libeel2-dev as it was removed (LP: #393834) + [debian/control, debian/control.in] + + -- Jon Bernard Thu, 10 Sep 2009 15:48:54 -0400 + +meta-gnome2 (1:2.22.2~4ubuntu6) jaunty; urgency=low + + * Remove dependency on nautilus-cd-burner, since it is replaced by + brasero in Jaunty. + + -- Philippe Gauthier Wed, 18 Mar 2009 10:40:01 -0400 + +meta-gnome2 (1:2.22.2~4ubuntu5) jaunty; urgency=low + + * Remove gnome-devel Depends on libgbf-1-dev, because anjuta includes + it now. + + -- Timo Aaltonen Wed, 18 Mar 2009 09:32:54 +0200 + +meta-gnome2 (1:2.22.2~4ubuntu4) jaunty; urgency=low + + * Demote bug-buddy depends in gnome-dbg to a suggests; it's fine to use + gnome-dbg without bug-buddy, and because bug-buddy recommends gnome-dbg it + caused a circular loop which prevented the automatic removal of bug-buddy + and gnome-dbg when their rdeps would go away. + + -- Loic Minier Wed, 11 Feb 2009 16:29:55 +0100 + +meta-gnome2 (1:2.22.2~4ubuntu3) jaunty; urgency=low + + * gnome-accessbility: Tighten dasher depend to >= 4.7.3. This was previously + removed due to this version not existing in Ubuntu. + + -- Nick Ellery Sun, 21 Dec 2008 14:27:53 -0800 + +meta-gnome2 (1:2.22.2~4ubuntu2) intrepid; urgency=low + + * debian/control.in: + - gnome-devel demote bluefish to Suggests + - gnome-dbg remove libgail-dbg due to gail change (LP: #273387) + - gnome-devel unversion glade-gnome + - gnome-desktop uses system-config-printer-gnome and + not system-config-printer (LP: #273015) + - gnome-office remove abiword-plugin-goffice which doesnt + exists in ubuntu and add abiword instead + Thanks James Westby + - gnome-acessibility unversion dasher as we still use 4.7.0 + + -- Pedro Fragoso Tue, 23 Sep 2008 01:17:58 +0100 + +meta-gnome2 (1:2.22.2~4ubuntu1) intrepid; urgency=low + + * Sync with Debian (LP: #249505) + * debian/control.in: + - Remove libgail-dev as gail is now on gtk2 + - Bump libgtk2.0 to 2.13 + + -- Pedro Fragoso Fri, 22 Aug 2008 19:14:41 +0100 + meta-gnome2 (1:2.22.2~4) unstable; urgency=low * Move bug-buddy to the gnome-dbg dependencies only. @@ -414,6 +560,16 @@ -- Josselin Mouette Sun, 22 Jun 2008 20:17:10 +0200 +meta-gnome2 (1:2.20.2.4ubuntu1) intrepid; urgency=low + + * debian/control.in: + - Remove all reference to libgail, as gail is now in gtk2 + - Bump libgtk2.0 to 2.13 + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Pedro Fragoso Fri, 20 Jun 2008 13:54:16 +0100 + meta-gnome2 (1:2.20.2.4) unstable; urgency=low [ Josselin Mouette ] diff -Nru meta-gnome2-2.30+6/debian/control meta-gnome2-2.30+6ubuntu1/debian/control --- meta-gnome2-2.30+6/debian/control 2010-11-07 01:06:28.000000000 +0100 +++ meta-gnome2-2.30+6ubuntu1/debian/control 2010-11-13 16:56:50.000000000 +0100 @@ -6,8 +6,9 @@ Source: meta-gnome2 Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Josselin Mouette , Julian Andres Klode +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Debian GNOME Maintainers , Josselin Mouette Standards-Version: 3.8.2 Build-Depends: cdbs, debhelper (>= 5), @@ -28,7 +29,7 @@ rhythmbox-plugins (>= 0.12.8) | banshee (>= 1.6), rhythmbox-plugin-cdrecorder (>= 0.12.8) | banshee (>= 1.6), synaptic (>= 0.63), - system-config-printer (>= 1.0.0), + system-config-printer-gnome (>= 1.0.0), totem-mozilla, epiphany-extensions, gedit-plugins, @@ -149,7 +150,6 @@ zenity (>= 2.30), libgnome2-perl (>= 1.042), desktop-base, - gnome-mount (>= 0.8) [!linux-any], policykit-1-gnome, gksu, xdg-user-dirs-gtk @@ -223,7 +223,6 @@ libatk1.0-dev (>= 1.30), libglib2.0-dev (>= 2.24), libgnomevfs2-dev (>= 1:2.24), - libgail-dev (>= 2.20), libgtk2.0-dev (>= 2.20), gtk-doc-tools (>= 1.14), libidl-dev (>= 0.8.14), @@ -280,7 +279,7 @@ Depends: anjuta (>= 2:2.30), devhelp (>= 2.30), libgdl-1-dev (>= 2.30), - glade-gnome (>= 3.6.7), + glade-gnome, gnome-devel-docs (>= 2.30) Recommends: accerciser (>= 1.10), gtranslator (>= 1.9), @@ -300,7 +299,6 @@ Priority: extra Depends: libatk1.0-dbg, libatspi-dbg, - libgail-dbg, libglib2.0-0-dbg, gnome-applets-dbg, gnome-panel-dbg, @@ -335,7 +333,7 @@ libgoffice-dbg, libnspr4-0d-dbg, libnss3-1d-dbg, - liboobs-1-4-dbg, + liboobs-1-5-dbg, libxft2-dbg, libxml2-dbg, libwebkit-1.0-2-dbg, @@ -372,7 +370,6 @@ gstreamer0.10-plugins-good-doc, gstreamer0.10-doc, libgtksourceview2.0-doc, - libgtop2-doc, libsoup2.4-doc, libvte-doc, libcairo2-doc, @@ -403,7 +400,8 @@ libxml2-doc, policykit-1-doc, libgdl-1-common, - libnotify-doc + libnotify-doc, + libgtop2-dev Suggests: gnome-core-devel, python-doc Description: API reference documentation for the GNOME libraries diff -Nru meta-gnome2-2.30+6/debian/control.in meta-gnome2-2.30+6ubuntu1/debian/control.in --- meta-gnome2-2.30+6/debian/control.in 2010-11-07 01:05:21.000000000 +0100 +++ meta-gnome2-2.30+6ubuntu1/debian/control.in 2010-11-13 15:41:52.000000000 +0100 @@ -1,7 +1,8 @@ Source: meta-gnome2 Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Standards-Version: 3.8.2 Build-Depends: cdbs, @@ -23,7 +24,7 @@ rhythmbox-plugins (>= 0.12.8) | banshee (>= 1.6), rhythmbox-plugin-cdrecorder (>= 0.12.8) | banshee (>= 1.6), synaptic (>= 0.63), - system-config-printer (>= 1.0.0), + system-config-printer-gnome (>= 1.0.0), totem-mozilla, epiphany-extensions, gedit-plugins, @@ -144,7 +145,6 @@ zenity (>= 2.30), libgnome2-perl (>= 1.042), desktop-base, - gnome-mount (>= 0.8) [!linux-any], policykit-1-gnome, gksu, xdg-user-dirs-gtk @@ -218,7 +218,6 @@ libatk1.0-dev (>= 1.30), libglib2.0-dev (>= 2.24), libgnomevfs2-dev (>= 1:2.24), - libgail-dev (>= 2.20), libgtk2.0-dev (>= 2.20), gtk-doc-tools (>= 1.14), libidl-dev (>= 0.8.14), @@ -275,7 +274,7 @@ Depends: anjuta (>= 2:2.30), devhelp (>= 2.30), libgdl-1-dev (>= 2.30), - glade-gnome (>= 3.6.7), + glade-gnome, gnome-devel-docs (>= 2.30) Recommends: accerciser (>= 1.10), gtranslator (>= 1.9), @@ -295,7 +294,6 @@ Priority: extra Depends: libatk1.0-dbg, libatspi-dbg, - libgail-dbg, libglib2.0-0-dbg, gnome-applets-dbg, gnome-panel-dbg, @@ -330,7 +328,7 @@ libgoffice-dbg, libnspr4-0d-dbg, libnss3-1d-dbg, - liboobs-1-4-dbg, + liboobs-1-5-dbg, libxft2-dbg, libxml2-dbg, libwebkit-1.0-2-dbg, @@ -367,7 +365,6 @@ gstreamer0.10-plugins-good-doc, gstreamer0.10-doc, libgtksourceview2.0-doc, - libgtop2-doc, libsoup2.4-doc, libvte-doc, libcairo2-doc, @@ -398,7 +395,8 @@ libxml2-doc, policykit-1-doc, libgdl-1-common, - libnotify-doc + libnotify-doc, + libgtop2-dev Suggests: gnome-core-devel, python-doc Description: API reference documentation for the GNOME libraries