r27383 - in /desktop/unstable/gtk+3.0/debian: changelog control control.in keep-png-only.xsl rules

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Apr 10 16:31:33 2011
New Revision: 27383

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27383
Log:
* New upstream release.
* Drop the mimeinfo.cache from the udeb, it’s been moved to
  gdk-pixbuf.

Removed:
    desktop/unstable/gtk+3.0/debian/keep-png-only.xsl
Modified:
    desktop/unstable/gtk+3.0/debian/changelog
    desktop/unstable/gtk+3.0/debian/control
    desktop/unstable/gtk+3.0/debian/control.in
    desktop/unstable/gtk+3.0/debian/rules

Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=27383&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog [utf-8] Sun Apr 10 16:31:33 2011
@@ -1,8 +1,11 @@
-gtk+3.0 (3.0.6-2) UNRELEASED; urgency=low
+gtk+3.0 (3.0.8-1) unstable; urgency=low
 
   * Make the -dev package depend on the gir package.
-
- -- Josselin Mouette <joss at debian.org>  Wed, 30 Mar 2011 18:21:19 +0200
+  * New upstream release.
+  * Drop the mimeinfo.cache from the udeb, it’s been moved to
+    gdk-pixbuf.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 10 Apr 2011 18:29:44 +0200
 
 gtk+3.0 (3.0.6-1) experimental; urgency=low
 

Modified: desktop/unstable/gtk+3.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/control?rev=27383&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/control [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/control [utf-8] Sun Apr 10 16:31:33 2011
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
                cdbs (>= 0.4.90~),
                gnome-pkg-tools (>= 0.11),
@@ -38,9 +38,7 @@
                gir1.2-atk-1.0,
                gir1.2-pango-1.0,
                gir1.2-gdkpixbuf-2.0,
-               gawk,
-               xsltproc,
-               shared-mime-info
+               gawk
 Build-Depends-Indep: gtk-doc-tools (>= 1.8),
                      docbook-xml,
                      docbook-utils,

Modified: desktop/unstable/gtk+3.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/control.in?rev=27383&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/control.in [utf-8] Sun Apr 10 16:31:33 2011
@@ -38,9 +38,7 @@
                gir1.2-atk-1.0,
                gir1.2-pango-1.0,
                gir1.2-gdkpixbuf-2.0,
-               gawk,
-               xsltproc,
-               shared-mime-info
+               gawk
 Build-Depends-Indep: gtk-doc-tools (>= 1.8),
                      docbook-xml,
                      docbook-utils,

Modified: desktop/unstable/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/rules?rev=27383&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/rules [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/rules [utf-8] Sun Apr 10 16:31:33 2011
@@ -56,10 +56,6 @@
 EXAMPLES_PKG := gtk-$(APIVER)-examples
 PIXBUF_PKG := gtk3-engines-pixbuf
 
-
-# temporary directory for the minimal MIME cache generation
-mimedir = debian/build-mime
-mimexml = /usr/share/mime/packages/freedesktop.org.xml
 
 DEB_CONFIGURE_EXTRA_FLAGS = \
 			--libdir=/$(LIBDIR) \
@@ -125,7 +121,6 @@
 clean:: debian/control
 	# gross kludge to force control generation with the %.in target
 	touch debian/control.in
-	rm -rf $(mimedir)
 	rm -f $(call dh_subst_files,$(DEB_ALL_PACKAGES))
 
 # Add dependencies to generate files from the debian/*.in ones
@@ -142,15 +137,6 @@
 	mv debian/$(BIN_PKG)/usr/share/man/man1/gtk-update-icon-cache.1 \
 	   debian/$(BIN_PKG)/usr/share/man/man1/gtk-update-icon-cache-3.0.1
 
-binary-install/$(UDEB_PKG)::
-	# generate a minimal MIME cache for the udeb
-	mkdir -p $(mimedir)/packages
-	[ -f $(mimexml) ]
-	xsltproc -nonet debian/keep-png-only.xsl $(mimexml) \
-		> $(mimedir)/packages/png.freedesktop.org.xml
-	update-mime-database $(mimedir)
-	dh_install -p$(UDEB_PKG) $(mimedir)/mime.cache usr/share/mime
-
 list-missing:
 	# FIXME: remove this when CDBS' list-missing works with multiple flavors
 	perl -w debian/dh_listmissing.pl $(foreach f,$(DEB_MAKE_FLAVORS),debian/install/$(f)) 2>&1 | \