Merge lp:~jbicha/ubuntu/oneiric/pitivi/pitivi-0.14.2 into lp:~ubuntu-desktop/pitivi/ubuntu

[Jeremy Bícha]

[Sebastien Bacher (seb128)]

Thank you for your work

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-07 14:19:32 +0000
+++ debian/changelog	2011-08-15 06:41:22 +0000
@@ -1,3 +1,16 @@
+pitivi (0.14.2-0ubuntu1) oneiric; urgency=low
+
+  * New upstream version.
+    - New Mallard format help
+  * debian/control:
+    - Add gnome-doc-utils to build-depends
+    - Bump pygtk minimum to 2.24
+  * debian/patches/01_lpi.patch
+    - Move LPI items below User Manual in Help menu
+  * debian/watch: Watch for 0.14.* tar.bz2
+
+ -- Jeremy Bicha <[e-mail]>  Mon, 15 Aug 2011 02:32:20 -0400
+
 pitivi (0.14.1-0ubuntu1) oneiric; urgency=low
 
   * New upstream version

=== modified file 'debian/control'
--- debian/control	2011-07-07 14:19:32 +0000
+++ debian/control	2011-08-15 06:41:22 +0000
@@ -9,7 +9,8 @@
         dh-buildinfo
 Build-Depends-Indep: python-dev (>= 2.6.6-3~),
                      libxml-parser-perl,
-                     intltool (>= 0.35)
+                     intltool (>= 0.35),
+                     gnome-doc-utils
 Standards-Version: 3.9.0
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/pitivi/ubuntu
 
@@ -18,7 +19,7 @@
 Depends: ${misc:Depends},
         ${python:Depends},
         python-launchpad-integration,
-        python-gtk2 (>= 2.18),
+        python-gtk2 (>= 2.24),
         python-gst0.10 (>= 0.10.19),
         gstreamer0.10-gnonlin (>= 0.10.15),
         python-cairo (>= 1.0.0),

=== modified file 'debian/patches/01_lpi.patch'
--- debian/patches/01_lpi.patch	2011-07-07 14:19:32 +0000
+++ debian/patches/01_lpi.patch	2011-08-15 06:41:22 +0000
@@ -1,8 +1,8 @@
-Index: pitivi-0.14.1/pitivi/ui/mainwindow.py
+Index: pitivi-0.14.2/pitivi/ui/mainwindow.py
 ===================================================================
---- pitivi-0.14.1.orig/pitivi/ui/mainwindow.py	2011-07-03 22:57:34.000000000 +0200
-+++ pitivi-0.14.1/pitivi/ui/mainwindow.py	2011-07-07 13:50:18.098417360 +0200
-@@ -360,6 +360,11 @@
+--- pitivi-0.14.2.orig/pitivi/ui/mainwindow.py	2011-08-13 08:08:00.000000000 -0400
++++ pitivi-0.14.2/pitivi/ui/mainwindow.py	2011-08-15 02:25:38.011729077 -0400
+@@ -363,6 +363,11 @@
          self.uimanager.insert_action_group(self.actiongroup, 0)
          self.uimanager.add_ui_from_file(os.path.join(get_ui_dir(), "mainwindow.xml"))
  
@@ -14,15 +14,15 @@
      def _createUi(self, instance):
          """ Create the graphical interface """
          self.set_title("%s" % (APPNAME))
-Index: pitivi-0.14.1/data/ui/mainwindow.xml
+Index: pitivi-0.14.2/data/ui/mainwindow.xml
 ===================================================================
---- pitivi-0.14.1.orig/data/ui/mainwindow.xml	2011-07-07 13:49:50.346417346 +0200
-+++ pitivi-0.14.1/data/ui/mainwindow.xml	2011-07-07 13:50:18.098417360 +0200
-@@ -43,6 +43,7 @@
-       <separator />
+--- pitivi-0.14.2.orig/data/ui/mainwindow.xml	2011-08-12 18:39:23.000000000 -0400
++++ pitivi-0.14.2/data/ui/mainwindow.xml	2011-08-15 02:25:38.011729077 -0400
+@@ -44,6 +44,7 @@
      </menu>
      <menu action="Help">
+       <menuitem action="UserManual" />
 +      <placeholder name="LaunchpadItems" />
-       <menuitem action="UserManual" />
        <menuitem action="About" />
      </menu>
+   </menubar>

=== modified file 'debian/watch'
--- debian/watch	2010-01-27 06:19:11 +0000
+++ debian/watch	2011-08-15 06:41:22 +0000
@@ -1,2 +1,2 @@
 version=2
-http://ftp.gnome.org/pub/GNOME/sources/pitivi/0.13/pitivi-(.*)\.tar.gz
+http://ftp.gnome.org/pub/GNOME/sources/pitivi/0.14/pitivi-(.*)\.tar.bz2