lp:~jbicha/ubuntu/oneiric/meta-gnome2/merge-796474

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/oneiric/meta-gnome2 at revision 36

Daniel Holbach (community): Approve on 2011-08-18

Ubuntu branches: Pending requested 2011-08-12

Diff: 675 lines (+156/-106)

4 files modified

debian/changelog (+56/-0)
debian/control (+50/-53)
debian/control.in (+49/-52)
debian/copyright (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #796474: Please sync meta-gnome2 (1:2.30+11) from Debian

Wishlist

Fix Released

Link a bug report

Related blueprints

37. By Jeremy Bícha on 2011-08-12

fixed comment

36. By Jeremy Bícha on 2011-08-12

* Merge with Debian unstable. (LP: #796474) Remaining changes:
  - gnome
    + Use system-config-printer-gnome instead of
      system-config-printer.
    + Use gdm instead of gdm3; gdm-themes doesn't exist in Ubuntu
    + Comment out libreoffice-evolution as it's not in Ubuntu yet
  - gnome-core-devel: Remove libgail-dev as gail is in gtk2.
  - gnome-dbg:
    + Remove depend on libgail-dbg.
    + Recommend liboobs-1-5-dbg instead of liboobs-1-4-dbg.
    + Recommend libnspr4-dbg instead of libnspr4-0d-dbg
    + Recommend libnss3-dbg instead of libnss3-1d-dbg
    + Recommend libwebkitgtk-1.0-0-dbg instead of libwebkit-1.0-2-dbg
  - gnome-desktop-environment: Don't depend on non-existing
    gnome-mount (obsoleted by udisks).
  - gnome-accessibility
    + Use sound-theme-freedesktop instead of freedesktop-sound-theme
* Replace glade-gnome by glade.
* Replace libgp11-dev with libgck-dev.
* Fix lintian issues:
  - mention "meta-package" in all descriptions.
  - drop duplicate fields.
  - add ${misc:Depends}.
  - drop ancient versioned conflict.
  - refer to non-symlinked GPL-2 license file.
* Bump Standards-Version to 3.9.2 (no changes needed).
* Drop seahorse-plugins. Closes: #624470.
* Match the package name change for the gnash plugin. Closes: #606236.
* Replace openoffice by libreoffice.
* Require gnome-themes-standard so that GTK3 applications work
  correctly.

35. By Onkar Shinde on 2011-02-19

Update -dbg package names for libnspr4, libnss3, libwebkit.

34. By Artur Rona on 2011-01-01

gnome: Drop depends on gdm-themes. We don't have this package.

33. By Artur Rona on 2010-12-24

* Merge from debian unstable. Remaining changes:
  - gnome: Use system-config-printer-gnome instead
    system-config-printer.
  - gnome-core-devel: Remove libgail-dev as gail is in gtk2.
  - 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).
* Droped changes:
  - gnome-accessibility: freedesktop-sound-theme is not in archive.
  - gnome-devel: Unversion glade-gnome - No point to keep this one.
  - 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 - libgtop2-doc is since maverick.

32. By Artur Rona on 2010-11-13

* 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.
* debian/control{.in}:
  - Change gdm3 to gdm in Depends. We don't have gdm3
    in Ubuntu archive yet.
  - Drop depends on fast-user-switch-applet. It's deprecated.

31. By Matthias Klose on 2010-09-24

gnome-dbg: Recommend liboobs-1-5-dbg instead of liboobs-1-4-dbg.

30. By Martin Pitt on 2010-04-01

debian/control.in: Drop dependencies to libempathy-doc and
libempathy-gtk-doc, which are NBS.

29. By Martin Pitt on 2010-03-03

Replace obsolete policykit-doc/policykit-gnome-doc with policykit-1-doc.
(LP: #530829)

28. By Chris Coulson on 2009-11-14

* 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.