Merge lp:~ari-tczew/gbrainy/ubuntu into lp:~ubuntu-desktop/gbrainy/ubuntu

[Artur Rona]

[Daniel Holbach (dholbach)]

Why do you introduce this change?
-gbrainy (1.60-1ubuntu1) natty; urgency=low
+gbrainy (1.60-1ubuntu1) UNRELEASED; urgency=low

Generally the merge looks good, but doesn't add immediate benefits if I didn't miss anything.

review: Needs Information

[Daniel Holbach (dholbach)]

<ari-tczew> dholbach: I changed natty to UNRELEASED because this one wasn't uploaded to archive.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-13 18:17:24 +0000
+++ debian/changelog	2011-01-16 21:46:53 +0000
@@ -1,10 +1,31 @@
+gbrainy (1.61-1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes: (LP: #700773)
+    - debian/control:
+      + Add Vcs-Bzr link related to Ubuntu Desktop Team.
+      + Build-Depends on liblaunchpad-integration-cil-dev.
+      + Build-Depends on dh-autoreconf, gnome-common for autotools.
+    - debian/patches/01_lpi.patch: Add Launchpad integration.
+    - debian/rules: Run autoreconf due to patch on configure.ac.
+
+ -- Artur Rona <[e-mail]>  Sun, 16 Jan 2011 22:15:39 +0100
+
+gbrainy (1.61-1) unstable; urgency=low
+
+  * New upstream release:
+     - Bug fixes and updated/new translations (Closes: #609284, #606470;
+       LP: #695691, #693447).
+  * Update copyright years in debian/copyright.
+
+ -- Siegfried-Angel Gevatter Pujals <[e-mail]>  Sat, 15 Jan 2011 15:10:04 +0100
+
 gbrainy (1.61-0ubuntu1) natty; urgency=low
 
   * New upstream release
 
  -- Robert Ancell <[e-mail]>  Thu, 13 Jan 2011 12:12:43 -0600
 
-gbrainy (1.60-1ubuntu1) natty; urgency=low
+gbrainy (1.60-1ubuntu1) UNRELEASED; urgency=low
 
   * Merge from debian unstable.  Remaining changes: (LP: #700773)
     - debian/control:

=== modified file 'debian/copyright'
--- debian/copyright	2011-01-09 19:59:10 +0000
+++ debian/copyright	2011-01-16 21:46:53 +0000
@@ -9,7 +9,7 @@
 
 Copyright:
 
-    Copyright © 2007-2009 Jordi Mas i Hernàndez <[e-mail]>
+    Copyright © 2007-2011 Jordi Mas i Hernàndez <[e-mail]>
 
     src/CalculationGames/CalculationOperator.cs:
         Copyright © 2007-2008 Jordi Mas i Hernàndez <[e-mail]>
@@ -40,7 +40,7 @@
     On Debian systems, the complete text of the GNU General Public
     License can be found in /usr/share/common-licenses/GPL.
 
-The Debian packaging is © 2007-2010, Siegfried-A. Gevatter <[e-mail]>
+The Debian packaging is © 2007-2011, Siegfried-A. Gevatter <[e-mail]>
 and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.