merge new upstream version (Closes: #668306)

diff --git a/debian/changelog b/debian/changelog
index 6cf64f3..4067a53 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rs (20120414-1) xunstable; urgency=low
+
+  * Updated upstream version (Closes: #668306)
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Sat, 14 Apr 2012 12:58:12 +0000
+
 rs (20120325-1) unstable; urgency=low
 
   * debian/rules: cleanup (remove install/check, dh_installdirs)

diff --git a/debian/copyright b/debian/copyright
index a05c061..190765d 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
 This package was debianised by Thorsten Glaser <tg@mirbsd.de> on
 Sat Oct 30 14:32:34 UTC 2010.
 
-$MirOS: contrib/hosted/tg/deb/rs/debian/copyright,v 1.2 2012/03/25 16:08:54 tg Exp $
+$MirOS: contrib/hosted/tg/deb/rs/debian/copyright,v 1.3 2012/04/14 12:59:51 tg Exp $
 
 It was downloaded from:
-https://www.mirbsd.org/MirOS/dist/mir/rs/rs-20120325.tar.gz
+https://www.mirbsd.org/MirOS/dist/mir/rs/rs-20120414.tar.gz
 
 
 Author: John Kunze, Office of Comp. Affairs, UCB
@@ -14,6 +14,8 @@ Licence:
 /*-
  * Copyright (c) 1993
  *     The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 2008, 2009, 2010, 2012
+ *     Thorsten “mirabilos” Glaser <tg@mirbsd.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions