Hi This NMU will be uploaded shortly.
Bastian -- There is a multi-legged creature crawling on your shoulder. -- Spock, "A Taste of Armageddon", stardate 3193.9
diff -Nru puppet-2.6.0/debian/changelog puppet-2.6.0/debian/changelog --- puppet-2.6.0/debian/changelog 2010-07-28 20:49:29.000000000 +0200 +++ puppet-2.6.0/debian/changelog 2010-08-27 12:16:09.000000000 +0200 @@ -1,3 +1,10 @@ +puppet (2.6.0-2.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Again accept '-' in class names for refs. (closes: #592305) + + -- Bastian Blank <wa...@debian.org> Fri, 27 Aug 2010 12:15:39 +0200 + puppet (2.6.0-2) unstable; urgency=low * Bump Standards-Version to 3.9.1 diff -Nru puppet-2.6.0/debian/patches/debian-changes-2.6.0-2.1 puppet-2.6.0/debian/patches/debian-changes-2.6.0-2.1 --- puppet-2.6.0/debian/patches/debian-changes-2.6.0-2.1 1970-01-01 01:00:00.000000000 +0100 +++ puppet-2.6.0/debian/patches/debian-changes-2.6.0-2.1 2010-08-27 12:31:01.000000000 +0200 @@ -0,0 +1,38 @@ +Description: Upstream changes introduced in version 2.6.0-2.1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + puppet (2.6.0-2.1) UNRELEASED; urgency=low + . + * Non-maintainer upload. + * Again accept '-' in class names for refs. (closes: #592305) + . + The person named in the Author field signed this changelog entry. +Author: Bastian Blank <wa...@debian.org> +Bug-Debian: http://bugs.debian.org/592305 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- puppet-2.6.0.orig/lib/puppet/resource/catalog.rb ++++ puppet-2.6.0/lib/puppet/resource/catalog.rb +@@ -57,7 +57,7 @@ class Puppet::Resource::Catalog < Puppet + end + + def title_key_for_ref( ref ) +- ref =~ /^([\w:]+)\[(.*)\]$/m ++ ref =~ /^([-\w:]+)\[(.*)\]$/m + [$1, $2] + end + diff -Nru puppet-2.6.0/debian/patches/series puppet-2.6.0/debian/patches/series --- puppet-2.6.0/debian/patches/series 2010-07-28 20:59:48.000000000 +0200 +++ puppet-2.6.0/debian/patches/series 2010-08-27 12:31:01.000000000 +0200 @@ -1,2 +1,3 @@ debianize_apache2.conf debian-changes-2.6.0-2 +debian-changes-2.6.0-2.1
signature.asc
Description: Digital signature