Merge fixes from Fabien Tassin

debian/changelog

@@ -6,6 +6,12 @@ pastebinit (0.9-0ubuntu2) UNRELEASED; urgency=low
   * debian/control: using Homepage field, not pseudo-one.
   * pastebinit: better handling of command-line passed pastebins
 
+  [ Fabien Tassin ]
+  * Add Vcs-Bzr to debian/control
+  * Fix -a in Usage()
+  * http://paste.ubuntu.com now supported
+  * http://pastebin.mozilla.org now supported
+
  -- David Paleino <d.paleino@gmail.com>  Tue, 19 Feb 2008 21:07:02 +0100
 
 pastebinit (0.9-0ubuntu1) hardy; urgency=low

debian/control

@@ -5,6 +5,7 @@ Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: xsltproc, docbook-xml, docbook-xsl
 Standards-Version: 3.7.3
+Vcs-Bzr: https://code.launchpad.net/~pastebinit-developers/pastebinit/trunk
 Homepage: http://www.stgraber.org/category/pastebinit
 
 Package: pastebinit
@@ -25,3 +26,5 @@ Description: command-line pastebin client
   - http://pastebin.ca
   - http://rafb.net/paste
   - http://pastebin.archlinux.org
+  - http://paste.ubuntu.com
+  - http://pastebin.mozilla.org

pastebinit

@@ -37,7 +37,7 @@ try:
 		"Return the parameters array for the selected pastebin"
 		params={}
 		# pastebin.com v0.50
-		if re.search("http://((([a-zA-Z0-9\-_\.]*)(pastebin\.com)))", website) and not website == "http://www.pastebin.com":
+		if re.search("http://((([a-zA-Z0-9\-_\.]*)(pastebin\.com)))", website) and not website == "http://www.pastebin.com" or website == "http://pastebin.mozilla.org":
 			params['poster'] = user
 			params['code2'] = content
 			params['version'] = version
@@ -69,6 +69,10 @@ try:
 			params['remember'] = "0" # Cookies? ;)
 			params['page'] = "/paste"
 			params['regexp'] = '">http://yourpaste.net(.*)/</a>'
+		elif website == "http://paste.ubuntu.com":
+			params['poster'] = user
+			params['syntax'] = format #The format, for syntax hilighting
+			params['content'] = content
 		else:
 			sys.exit(_("Unknown website, please post a bugreport to request this pastebin to be added (%s)") % website)
 		return params
@@ -97,7 +101,7 @@ try:
 		print _("\t-i <filename> (or pipe the text)")
 		print _("Optional arguments:")
 		print _("\t-b <pastebin url:default is '%s'>") % website
-		print _("\t-a <author:default is '%s'>") % website
+		print _("\t-a <author:default is '%s'>") % user
 		print _("\t-f <format of paste:default is '%s'>") % format
 		print _("\t-r <parent posts ID:defaults to none>")
 		print _("Optional arguments supported only by 1t2.us and paste.stgraber.org:")

pastebinit.xml

@@ -106,6 +106,12 @@
       <listitem>
         <para>http://pastebin.archlinux.org</para>
       </listitem>
+      <listitem>
+        <para>http://paste.ubuntu.com</para>
+      </listitem>
+      <listitem>
+        <para>http://pastebin.mozilla.org</para>
+      </listitem>
     </itemizedlist>
   </refsect1>
   <refsect1>