diff -Nru meta-gnome3-3.0+5ubuntu1/debian/bug/control meta-gnome3-3.0+6ubuntu1/debian/bug/control --- meta-gnome3-3.0+5ubuntu1/debian/bug/control 2011-11-22 13:23:27.000000000 +0700 +++ meta-gnome3-3.0+6ubuntu1/debian/bug/control 1970-01-01 07:00:00.000000000 +0700 @@ -1 +0,0 @@ -report-with: gnome gnome-core diff -Nru meta-gnome3-3.0+5ubuntu1/debian/changelog meta-gnome3-3.0+6ubuntu1/debian/changelog --- meta-gnome3-3.0+5ubuntu1/debian/changelog 2011-11-29 03:32:20.000000000 +0700 +++ meta-gnome3-3.0+6ubuntu1/debian/changelog 2011-12-19 21:38:52.000000000 +0700 @@ -1,3 +1,44 @@ +meta-gnome3 (1:3.0+6ubuntu1) precise; urgency=low + + * Merge from Debian testing. (LP: #906340) Remaining changes: + + gnome: + - Lower hamster-applet dependency to last stable version (2.32) + + gnome-core: + - Use sound-theme-freedesktop instead of freedesktop-sound-theme + - Use gdm instead of gdm3 + - Use synaptic instead of gnome-packagekit + - Add gnome-contacts + + gnome-core-devel: + - Use libgnome-menu-3-dev instead of libgnome-menu-dev + - Use libgck-1-dev instead of libgck-dev + + gnome-debug: + - Recommend libnspr4-dbg instead of libnspr4-0d-dbg + - Recommend libnss3-dbg instead of libnss3-1d-dbg + + gnome-platform-devel: + - Drop dependency on libegroupwise1.2-dev + + * Drop Ubuntu changes that applied in Debian: + + gnome-core-devel: + - Use libgck-1-dev instead of libgck-dev + + -- Mahyuddin Susanto Mon, 19 Dec 2011 21:38:28 +0700 + +meta-gnome3 (1:3.0+6) unstable; urgency=medium + + [ Josselin Mouette ] + * Depend on cups-pk-helper for printer configuration support. + * Require a cdbs recent enough for dh_bugfiles. + * Move debian/bug to said bugfiles. + * Add presubj for gnome-core/gnome, to explain what are metapackages + and that they are not a supermarket. + * Move section to metapackages. + + [ Michael Biebl ] + * Make gnome-core-devel depend on libgck-1-dev instead of libgck-dev. + * Remove debian/gnome.install, bug files are installed via dh_bugfiles now. + + -- Michael Biebl Wed, 07 Dec 2011 08:38:28 +0100 + meta-gnome3 (1:3.0+5ubuntu1) precise; urgency=low * Merge from Debian testing. Remaining changes: diff -Nru meta-gnome3-3.0+5ubuntu1/debian/control meta-gnome3-3.0+6ubuntu1/debian/control --- meta-gnome3-3.0+5ubuntu1/debian/control 2011-11-29 03:32:25.000000000 +0700 +++ meta-gnome3-3.0+6ubuntu1/debian/control 2011-12-19 21:39:00.000000000 +0700 @@ -4,13 +4,13 @@ # This file is regenerated automatically in the clean target. Source: meta-gnome3 -Section: gnome +Section: metapackages Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Debian GNOME Maintainers , Jordi Mallach , Josselin Mouette , Michael Biebl +Uploaders: Debian GNOME Maintainers , Josselin Mouette , Michael Biebl Standards-Version: 3.9.2 -Build-Depends: cdbs, +Build-Depends: cdbs (>= 0.4.90), debhelper (>= 8), gnome-pkg-tools (>= 0.10) Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/meta-gnome3/ @@ -125,6 +125,7 @@ transmission-gtk, xdg-user-dirs-gtk, # Plugins for core and apps + cups-pk-helper (>= 0.1.2), epiphany-extensions (>= 3.0), gedit-plugins (>= 3.0), gnome-applets (>= 2.91), @@ -233,7 +234,7 @@ libgdu-dev (>= 3.0) [linux-any], libgdu-gtk-dev (>= 3.0) [linux-any], gnome-doc-utils (>= 0.20.6), - libgck-1-dev (>= 3.0), + libgck-1-dev (>= 3.2), libgcr-3-dev (>= 3.0), libgnome-menu-3-dev (>= 3.0), libpanel-applet-4-dev (>= 3.0), diff -Nru meta-gnome3-3.0+5ubuntu1/debian/control.in meta-gnome3-3.0+6ubuntu1/debian/control.in --- meta-gnome3-3.0+5ubuntu1/debian/control.in 2011-11-29 03:26:33.000000000 +0700 +++ meta-gnome3-3.0+6ubuntu1/debian/control.in 2011-12-19 19:59:47.000000000 +0700 @@ -1,11 +1,11 @@ Source: meta-gnome3 -Section: gnome +Section: metapackages Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Standards-Version: 3.9.2 -Build-Depends: cdbs, +Build-Depends: cdbs (>= 0.4.90), debhelper (>= 8), gnome-pkg-tools (>= 0.10) Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/meta-gnome3/ @@ -120,6 +120,7 @@ transmission-gtk, xdg-user-dirs-gtk, # Plugins for core and apps + cups-pk-helper (>= 0.1.2), epiphany-extensions (>= 3.0), gedit-plugins (>= 3.0), gnome-applets (>= 2.91), @@ -228,7 +229,7 @@ libgdu-dev (>= 3.0) [linux-any], libgdu-gtk-dev (>= 3.0) [linux-any], gnome-doc-utils (>= 0.20.6), - libgck-1-dev (>= 3.0), + libgck-1-dev (>= 3.2), libgcr-3-dev (>= 3.0), libgnome-menu-3-dev (>= 3.0), libpanel-applet-4-dev (>= 3.0), diff -Nru meta-gnome3-3.0+5ubuntu1/debian/gnome.bug-control meta-gnome3-3.0+6ubuntu1/debian/gnome.bug-control --- meta-gnome3-3.0+5ubuntu1/debian/gnome.bug-control 1970-01-01 07:00:00.000000000 +0700 +++ meta-gnome3-3.0+6ubuntu1/debian/gnome.bug-control 2011-11-22 08:37:14.000000000 +0700 @@ -0,0 +1 @@ +report-with: gnome gnome-core diff -Nru meta-gnome3-3.0+5ubuntu1/debian/gnome.bug-presubj meta-gnome3-3.0+6ubuntu1/debian/gnome.bug-presubj --- meta-gnome3-3.0+5ubuntu1/debian/gnome.bug-presubj 1970-01-01 07:00:00.000000000 +0700 +++ meta-gnome3-3.0+6ubuntu1/debian/gnome.bug-presubj 2011-11-22 08:37:14.000000000 +0700 @@ -0,0 +1,16 @@ +You are going to file a bug against “gnome”, which is a metapackage. It +means it is empty except for its dependencies, which are here to provide +a full-fledged GNOME desktop for Debian. + +Using this package to report a bug is appropriate if: + * You have noticed a bug in the GNOME desktop but you don’t know which + actual package it comes from. + * You believe there is a genuine mistake in dependencies, like + forgetting to add a dependency that is needed for a regular GNOME + desktop, or to remove one that is no longer appropriate. + +If you don’t like one of the packages that are depended upon and prefer +that we drop the dependency or depend on another one that is not related +to GNOME, please don’t bother filing the bug. Metapackages are not a +supermarket. We try to make a selection that is suitable for most +people; if you don’t like it, you are welcome to make your own. diff -Nru meta-gnome3-3.0+5ubuntu1/debian/gnome-core.bug-presubj meta-gnome3-3.0+6ubuntu1/debian/gnome-core.bug-presubj --- meta-gnome3-3.0+5ubuntu1/debian/gnome-core.bug-presubj 1970-01-01 07:00:00.000000000 +0700 +++ meta-gnome3-3.0+6ubuntu1/debian/gnome-core.bug-presubj 2011-11-22 08:37:14.000000000 +0700 @@ -0,0 +1,16 @@ +You are going to file a bug against “gnome-core”, which is a +metapackage. It means it is empty except for its dependencies, which are +defined as the “core” modules by GNOME upstream developers. + +Using this package to report a bug is appropriate if: + * You have noticed a bug in the GNOME desktop but you don’t know which + actual package it comes from. + * You believe there is a genuine mistake in dependencies, like + forgetting to add a dependency that belongs in core GNOME modules, or + to remove one that is no longer part of them. + +If you don’t like one of the packages that are depended upon and prefer +that we drop the dependency or depend on another one that is not related +to GNOME, please don’t bother filing the bug. Metapackages are not a +supermarket. We try to make a selection that is suitable for most +people; if you don’t like it, you are welcome to make your own. diff -Nru meta-gnome3-3.0+5ubuntu1/debian/gnome.install meta-gnome3-3.0+6ubuntu1/debian/gnome.install --- meta-gnome3-3.0+5ubuntu1/debian/gnome.install 2011-11-22 13:23:27.000000000 +0700 +++ meta-gnome3-3.0+6ubuntu1/debian/gnome.install 1970-01-01 07:00:00.000000000 +0700 @@ -1 +0,0 @@ -debian/bug/control /usr/share/bug/gnome/