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

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Apr 10 16:22:24 2011
New Revision: 27381

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27381
Log:
* Drop the mimeinfo.cache from the udeb, it’s been moved to 
  gdk-pixbuf.
* Drop shared-mime-info and xsltproc build-deps accordingly.

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

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=27381&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog [utf-8] Sun Apr 10 16:22:24 2011
@@ -1,3 +1,11 @@
+gtk+2.0 (2.24.4-2) unstable; urgency=low
+
+  * Drop the mimeinfo.cache from the udeb, it’s been moved to 
+    gdk-pixbuf.
+  * Drop shared-mime-info and xsltproc build-deps accordingly.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 10 Apr 2011 18:21:55 +0200
+
 gtk+2.0 (2.24.4-1) unstable; urgency=low
 
   [ Laurent Bigonville ]

Modified: desktop/unstable/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control?rev=27381&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/control [utf-8] Sun Apr 10 16:22:24 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>, Laurent Bigonville <bigon 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>
 Build-Depends: debhelper (>= 7.0.50~),
                gettext,
                pkg-config,
@@ -37,9 +37,7 @@
                gir1.2-pango-1.0,
                gir1.2-gdkpixbuf-2.0,
                quilt,
-               gawk,
-               xsltproc,
-               shared-mime-info
+               gawk
 Build-Depends-Indep: gtk-doc-tools (>= 1.8),
                      docbook-xml,
                      docbook-utils,

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

Modified: desktop/unstable/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/rules?rev=27381&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/rules [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/rules [utf-8] Sun Apr 10 16:22:24 2011
@@ -103,10 +103,6 @@
 # targets
 installdir = $(installbasedir)/$(current_flavor)
 installbasedir = $(CURDIR)/debian/install
-
-# temporary directory for the minimal MIME cache generation
-mimedir = debian/build-mime
-mimexml = /usr/share/mime/packages/freedesktop.org.xml
 
 # configure flags
 configure_flags := \
@@ -252,7 +248,6 @@
 	# remove install and build dirs
 	rm -rf $(installbasedir)
 	rm -rf $(buildbasedir)
-	rm -rf $(mimedir)
 	# restore files from backup (before unpatching)
 	-test -r config.sub.orig && mv -f config.sub.orig config.sub
 	-test -r config.guess.orig && mv -f config.guess.orig config.guess
@@ -301,13 +296,6 @@
 	# of dh_installdocs (ship README.Debian etc. in the first package)
 	dh_installdocs -p$(PIXBUF_PKG) -s
 	dh_installman -s
-	# 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
 	dh_installexamples -s
 	dh_link -s
 	dh_strip -s --dbg-package=$(DEBUG_PKG) -N$(UDEB_PKG) -Nlibgail18 -Nlibgail-common