[SCM] xjadeo2 packaging branch, master, updated. debian/0.4.12-1-1-g29e71d9

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 29e71d963951c2e28beac37ff8615059104d3fa4
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jul 27 12:09:45 2010 +0200

    Merge Ubuntu changelog entries.

diff --git a/debian/changelog b/debian/changelog
index 273b44d..fb43b4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xjadeo (0.4.12-1ubuntu1) maverick; urgency=low
+
+  * Merge with debian unstable, remaining changes:
+    - Move mencoder,transcode from Suggests to Recommends.
+
+ -- Alessio Treglia <quadrispro at ubuntu.com>  Tue, 27 Jul 2010 11:55:15 +0200
+
 xjadeo (0.4.12-1) unstable; urgency=low
 
   [ Jaromír Mikeš ]
@@ -9,6 +16,18 @@ xjadeo (0.4.12-1) unstable; urgency=low
 
  -- Jaromír Mikeš <mira.mikes at seznam.cz>  Mon, 26 Jul 2010 14:43:27 +0200
 
+xjadeo (0.4.11-1ubuntu1) maverick; urgency=low
+
+  * Move mencoder,transcode from Suggests to Recommends.
+
+ -- Alessio Treglia <quadrispro at ubuntu.com>  Wed, 21 Jul 2010 19:09:07 +0200
+
+xjadeo (0.4.11-1build1) maverick; urgency=low
+
+  * No-change rebuild due to jackd -> jackd2 transition.
+
+ -- Alessio Treglia <quadrispro at ubuntu.com>  Wed, 21 Jul 2010 11:58:05 +0200
+
 xjadeo (0.4.11-1) unstable; urgency=low
 
   [ Jaromír Mikeš ]

-- 
xjadeo2 packaging