# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc-antoine@perennou.com-20120319192405-\
#   n1n65vzlnp4fu692
# target_branch: bzr+ssh://bazaar.launchpad.net/%2Bbranch/intltool/
# testament_sha1: 0e43747a5252916d22700cd23c3dc8563ffb8201
# timestamp: 2012-03-19 20:26:42 +0100
# base_revision_id: danilo@segan.org-20120226183957-0cyhl90tateda43v
# 
# Begin patch
=== modified file 'intltool-update.in'
--- intltool-update.in	2011-10-08 19:24:23 +0000
+++ intltool-update.in	2012-03-19 19:24:05 +0000
@@ -60,19 +60,19 @@
 # FIXME: Please check if the following is correct
 
 my $xml_support =
-"xml(?:\\.in)*|".	# http://www.w3.org/XML/ (Note: .in is not required)
-"ui|".			# Bonobo specific - User Interface desc. files
-"lang|".		# ?
-"glade2?(?:\\.in)*|".	# Glade specific - User Interface desc. files (Note: .in is not required)
-"oaf(?:\\.in)+|".	# DEPRECATED: Replaces by Bonobo .server files
-"etspec|".		# ?
-"server(?:\\.in)+|".	# Bonobo specific
-"sheet(?:\\.in)+|".	# ?
-"schemas(?:\\.in)+|".	# GConf specific
-"gschema.xml|".         # GLib schema (ie: GSettings) specific
-"pong(?:\\.in)+|".	# DEPRECATED: PONG is not used [by GNOME] any longer.
-"kbd(?:\\.in)+|".	# GOK specific.
-"policy(?:\\.in)+";	# PolicyKit files
+"xml(?:\\.in)*|".	  # http://www.w3.org/XML/ (Note: .in is not required)
+"ui|".			  # Bonobo specific - User Interface desc. files
+"lang|".		  # ?
+"glade2?(?:\\.in)*|".	  # Glade specific - User Interface desc. files (Note: .in is not required)
+"oaf(?:\\.in)+|".	  # DEPRECATED: Replaces by Bonobo .server files
+"etspec|".		  # ?
+"server(?:\\.in)+|".	  # Bonobo specific
+"sheet(?:\\.in)+|".	  # ?
+"schemas(?:\\.in)+|".	  # GConf specific
+"gschema.xml(?:\\.in)*|". # GLib schema (ie: GSettings) specific
+"pong(?:\\.in)+|".	  # DEPRECATED: PONG is not used [by GNOME] any longer.
+"kbd(?:\\.in)+|".	  # GOK specific.
+"policy(?:\\.in)+";	  # PolicyKit files
 
 my $ini_support =
 "icon(?:\\.in)+|".	# http://www.freedesktop.org/Standards/icon-theme-spec
@@ -241,7 +241,7 @@
    {
 	$gettext_type=$1;
    }
-   elsif ($type =~ /gschema.xml$/)
+   elsif ($type =~ /gschema.xml(\.in)*$/)
    {
 	$gettext_type="gsettings";
    }

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWR1jUsAAAgDfgAAwXHv///6v
3k6////1UASe7CcDnF3YUFrhJJGiaJ6NNUZ6p7QKPJPEnqep5NE08ppo9Q09T8pHqaCSk0DEyAmo
9CE9TT1NPUNAADQAAAZQ0TQ0jamk9TTRkeiAAA9QaAAABxkyaMQxNMBAwJpgjBMTTTQAYQSSJoAF
GaNTaU8ptTygeptTTR6T1Gmj1A0AFCYZmZkXtlwobu+eMujLoaOE753PiGfJGSPapBlz4MgsLaqk
AxIFCgM13D0XKRpiqv+S8oqV59590lsTItEVQ0LOr4Y1yYTNM3kOhgdmPxwoiLzXZKTPxleS2uc7
H3pVadYGPzi6cJN3SxlinNc+t/Pk8wXWtcLtCYYYYDAhX9bqtTF+7TxpwUSFhjTAZn9ALCCiNqgK
7SYVZf1AXyK7pFX6Z/Wkc8jmJI3+9KYy3qkhxbVx/LIuG7Y+hssl+fHxOJ2bgW8MrntQEJLusJFd
gcFzkyYDawsK2DkKmNCGgF1DaEwjV5WzMRZAeFDBF8vWEP09snNE1X7KwsRZzYEdTTh189gnEWLQ
E9IruWriuqSxWCYVFGFzw4pzFzHRpZNzTkhOrINK8n68ifLSuCtZWdFiK7UmKKmdIaSU5M4xgaKF
GMCglDWLeVlYrabPEXx46TSdclY6/MgVJYspNo1bLYbRcbTOW8TTBqsIZrB1hdxE5ZS96v0YXFhG
8dkqa5ydVNJnlVhU7G6qSd5W200Vxsi3moqVYpIYkxmZfBM3D8raHvMtTD+RM7t2VcTRDJS4tNwi
50J1QzNJWPJXJpGiIwjkbVi6SXnsuZtLRybOh6p2iJdbCZcTZeWQTM3xmTHBhxF9jgNgPGL9Rgce
l9mDyt+MEM40lUr7XMNxZ5c/sEkdRTCUtLvETCJTF0YmDw74THnZNAD/Yu13089EJr1MRZuq3uDZ
vnn70+zMEfuFe7dBQK6hlGrSdvtz7tm3uoN+G8sc/LmRtReA7A37yodfYR7nnY2mKZFwon0HYBa8
nUazdjimZ2WBQ9NIZecXmAGM70TWGB2euXIMt6wrhmTW1BFLBMVkejsRShz0smjYFmvhNelsw5SC
3U0cuTLHzq2Oy3Jm38OM0yLRFSZb2KR5Rmvxb8gmcSPY5QySGZ+Yt9H7sChQky6b9BzeYfFMZjST
AcNecVLGvYJnzBiVCOSLFK5nel+UvCdnI9qkqCYop48gqHtzF3BN1zV5ywU4EwQK9qA6Q2gckLsd
zq74o7A6ClbA7ufJG0e8zWm7Mu0B4UclQQCExwTDf6eEOdPYhh2YasOAqQzsrwCcQ8MCkbmfqVT5
zH/gmhAgIHvTeAW4TiuKAJ4zDOdBwTgPToLUBYKB/CUOokFEnsmTtnUtpKGKdcuMDSWGfc4egqC/
jHRP61OFAweULVIPWmRe8rcBnYUL8GZaFA3a0usU2F5WSk0SMGRGGDwJi8gA9FRJqcREoN4XK11L
4mYZMhydjVCgdOpNky1f0tzpmN1zddoNkd9khM8JEeE6ov0agHaFocvXFaFC4IswcJxda100A94B
kAmAWWsoYoWM7fzeBzCv/xk3VIkYfT1K1XFodIqNMJulsmES2ZCSz1ONI4PVTKbRWXZYqxVKv/i7
kinChIDrGpYA