[DRE-commits] r4435 - in trunk: chef/debian merb/debian

[Joshua Timberman]

Author: jtimberman-guest
Date: 2009-12-10 19:08:49 +0000 (Thu, 10 Dec 2009)
New Revision: 4435

Modified:
   trunk/chef/debian/copyright
   trunk/merb/debian/watch
Log:
packaging copyright opscode

Modified: trunk/chef/debian/copyright
===================================================================
--- trunk/chef/debian/copyright	2009-12-10 16:29:00 UTC (rev 4434)
+++ trunk/chef/debian/copyright	2009-12-10 19:08:49 UTC (rev 4435)
@@ -328,5 +328,5 @@
   Full text of the GPL is available in /usr/share/common-licenses/GPL-2
   See above for the MIT license, as it is also used by Merb.
 
-The Debian packaging for Chef is Copyright (c) 2009 Joshua Timberman and is licensed
+The Debian packaging for Chef is Copyright (c) 2009 Opscode, Inc. and is licensed
 under the Apache 2.0 license.

Modified: trunk/merb/debian/watch
===================================================================
--- trunk/merb/debian/watch	2009-12-10 16:29:00 UTC (rev 4434)
+++ trunk/merb/debian/watch	2009-12-10 19:08:49 UTC (rev 4435)
@@ -1,3 +1,3 @@
 version=3
-options="dversionmangle=s/debian//" \
+options="dversionmangle=s/\+dfsg//" \
 http://githubredir.debian.net/github/merb/merb /(.*).tar.gz debian debian/repack.sh