r34094 - in /desktop/unstable/gnome-desktop3/debian: changelog control control.in gnome-desktop3-data.install rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Apr  3 16:46:36 2012
New Revision: 34094

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34094
Log:
* Build system-wide help documents and install them in gnome-desktop3-data.
* Add the necessary Breaks/Replaces against gnome-desktop-data (<< 2.32.1-2)
  which previously shipped those files.

Modified:
    desktop/unstable/gnome-desktop3/debian/changelog
    desktop/unstable/gnome-desktop3/debian/control
    desktop/unstable/gnome-desktop3/debian/control.in
    desktop/unstable/gnome-desktop3/debian/gnome-desktop3-data.install
    desktop/unstable/gnome-desktop3/debian/rules

Modified: desktop/unstable/gnome-desktop3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/changelog?rev=34094&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-desktop3/debian/changelog [utf-8] Tue Apr  3 16:46:36 2012
@@ -1,3 +1,11 @@
+gnome-desktop3 (3.2.1-4) UNRELEASED; urgency=low
+
+  * Build system-wide help documents and install them in gnome-desktop3-data.
+  * Add the necessary Breaks/Replaces against gnome-desktop-data (<< 2.32.1-2)
+    which previously shipped those files.
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 03 Apr 2012 18:45:06 +0200
+
 gnome-desktop3 (3.2.1-3) unstable; urgency=low
 
   * Upload to unstable.

Modified: desktop/unstable/gnome-desktop3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/control?rev=34094&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop3/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-desktop3/debian/control [utf-8] Tue Apr  3 16:46:36 2012
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Frederic Peters <fpeters at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Frederic Peters <fpeters at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-desktop3
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-desktop3
 Standards-Version: 3.9.2
@@ -36,6 +36,8 @@
 Package: gnome-desktop3-data
 Architecture: all
 Depends: ${misc:Depends}
+Breaks: gnome-desktop-data (<< 2.32.1-2)
+Replaces: gnome-desktop-data (<< 2.32.1-2)
 Description: Common files for GNOME desktop apps
  This package includes some files that are shared between several GNOME
  apps (internationalization files).

Modified: desktop/unstable/gnome-desktop3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/control.in?rev=34094&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop3/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-desktop3/debian/control.in [utf-8] Tue Apr  3 16:46:36 2012
@@ -31,6 +31,8 @@
 Package: gnome-desktop3-data
 Architecture: all
 Depends: ${misc:Depends}
+Breaks: gnome-desktop-data (<< 2.32.1-2)
+Replaces: gnome-desktop-data (<< 2.32.1-2)
 Description: Common files for GNOME desktop apps
  This package includes some files that are shared between several GNOME
  apps (internationalization files).

Modified: desktop/unstable/gnome-desktop3/debian/gnome-desktop3-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/gnome-desktop3-data.install?rev=34094&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop3/debian/gnome-desktop3-data.install [utf-8] (original)
+++ desktop/unstable/gnome-desktop3/debian/gnome-desktop3-data.install [utf-8] Tue Apr  3 16:46:36 2012
@@ -1,2 +1,3 @@
 usr/share/locale
 usr/share/gnome
+usr/share/omf

Modified: desktop/unstable/gnome-desktop3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/rules?rev=34094&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop3/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-desktop3/debian/rules [utf-8] Tue Apr  3 16:46:36 2012
@@ -16,8 +16,8 @@
 			--with-pnp-ids-path=/usr/share/hwdata/pnp.ids \
 			--disable-scrollkeeper \
 			--disable-gtk-doc \
-			--disable-desktop-docs \
-			--enable-introspection=yes
+			--enable-desktop-docs \
+			--enable-introspection
 
 DEB_DH_MAKESHLIBS_ARGS_libgnome-desktop-3-2 += -- -c4