r26228 - in /desktop/experimental/gnome-desktop3/debian: changelog gnome-desktop3-data.install rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Wed Jan 12 18:48:10 2011
New Revision: 26228

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26228
Log:
  + debian/rules,
    debian/gnome-desktop3-data.install:
    - gnome-version.xml is back. Install it and build with
      --with-gnome-distributor=Debian again.

Modified:
    desktop/experimental/gnome-desktop3/debian/changelog
    desktop/experimental/gnome-desktop3/debian/gnome-desktop3-data.install
    desktop/experimental/gnome-desktop3/debian/rules

Modified: desktop/experimental/gnome-desktop3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/changelog?rev=26228&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-desktop3/debian/changelog [utf-8] Wed Jan 12 18:48:10 2011
@@ -1,4 +1,4 @@
-gnome-desktop3 (2.91.5-1) UNRELEASED; urgency=low
+gnome-desktop3 (2.91.6-1) UNRELEASED; urgency=low
 
   * New upstream release.
     + debian/control.in,
@@ -14,6 +14,10 @@
     + debian/control.in:
       - Depend / Build-Depend on gsettings-desktop-schemas(-dev) >= 0.1.4
         for org.gnome.desktop.thumbnailers.
+    + debian/rules,
+      debian/gnome-desktop3-data.install:
+      - gnome-version.xml is back. Install it and build with
+        --with-gnome-distributor=Debian again.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 02 Jan 2011 21:45:26 +0000
 

Modified: desktop/experimental/gnome-desktop3/debian/gnome-desktop3-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/gnome-desktop3-data.install?rev=26228&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/gnome-desktop3-data.install [utf-8] (original)
+++ desktop/experimental/gnome-desktop3/debian/gnome-desktop3-data.install [utf-8] Wed Jan 12 18:48:10 2011
@@ -1,2 +1,2 @@
 debian/tmp/usr/share/locale
-
+debian/tmp/usr/share/gnome

Modified: desktop/experimental/gnome-desktop3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/rules?rev=26228&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-desktop3/debian/rules [utf-8] Wed Jan 12 18:48:10 2011
@@ -6,12 +6,13 @@
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
+			--with-gnome-distributor=Debian \
 			--with-pnp-ids-path=/usr/share/hwdata/pnp.ids \
 			--disable-scrollkeeper \
 			--disable-gtk-doc \