[pitivi] Update to 0.14.0
Hicham HAOUARI
hicham at fedoraproject.org
Sun Jun 5 00:15:13 UTC 2011
commit aca5e4376975b156ebf2e23e2be9462e91aaccfe
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date: Sun Jun 5 01:14:07 2011 +0100
Update to 0.14.0
.gitignore | 1 +
0001-Add-man-page.patch | 99 --
0001-Fix-typo-in-license.patch | 44 +
0001-backport-canvas-fixes-to-0.13.5.patch | 253 ----
0002-Update-fsf-address.patch | 1542 ++++++++++++++++++++
0003-Remove-unneeded-shebang.patch | 161 ++
...i-0.13.5-init-pending-new-segment-to-none.patch | 21 -
...vi-0.14.0-welcome-dialog-after-mainwindow.patch | 34 +
pitivi.spec | 84 +-
sources | 2 +-
10 files changed, 1825 insertions(+), 416 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 447d729..1b46b0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/pitivi-0.13.5.tar.bz2
+/pitivi-0.14.0.tar.bz2
diff --git a/0001-Fix-typo-in-license.patch b/0001-Fix-typo-in-license.patch
new file mode 100644
index 0000000..2fabe85
--- /dev/null
+++ b/0001-Fix-typo-in-license.patch
@@ -0,0 +1,44 @@
+From db67ffeeb3db5a713a90a972456a90c195ce4c49 Mon Sep 17 00:00:00 2001
+From: Hicham HAOUARI <hicham.haouari at gmail.com>
+Date: Sun, 5 Jun 2011 00:08:38 +0100
+Subject: [PATCH 1/2] Fix typo in license
+
+---
+ pitivi/ui/clipproperties.py | 5 +----
+ pitivi/ui/effectsconfiguration.py | 4 ----
+ 2 files changed, 1 insertions(+), 8 deletions(-)
+
+diff --git a/pitivi/ui/clipproperties.py b/pitivi/ui/clipproperties.py
+index 78fa8a0..e1e4bd2 100644
+--- a/pitivi/ui/clipproperties.py
++++ b/pitivi/ui/clipproperties.py
+@@ -18,10 +18,7 @@
+ # License along with this program; if not, write to the
+ # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ # Boston, MA 02111-1307, USA.
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 3, or (at your option)
+-# any later version.
++
+ """
+ Class handling the midle pane
+ """
+diff --git a/pitivi/ui/effectsconfiguration.py b/pitivi/ui/effectsconfiguration.py
+index 9c503dd..b002b87 100644
+--- a/pitivi/ui/effectsconfiguration.py
++++ b/pitivi/ui/effectsconfiguration.py
+@@ -17,10 +17,6 @@
+ # License along with this program; if not, write to the
+ # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ # Boston, MA 02111-1307, USA.
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 3, or (at your option)
+-# any later version.
+
+ import gst
+ import gtk
+--
+1.7.5.2
+
diff --git a/0002-Update-fsf-address.patch b/0002-Update-fsf-address.patch
new file mode 100644
index 0000000..7b45015
--- /dev/null
+++ b/0002-Update-fsf-address.patch
@@ -0,0 +1,1542 @@
+From 64e313fcaa7da1e05f4ad715b3ed3a6647734ed0 Mon Sep 17 00:00:00 2001
+From: Hicham HAOUARI <hicham.haouari at gmail.com>
+Date: Sun, 5 Jun 2011 00:25:20 +0100
+Subject: [PATCH 2/2] Update fsf address
+
+---
+ COPYING | 4 ++--
+ bin/pitivi.in | 4 ++--
+ docs/pitivi.1 | 2 +-
+ pitivi/action.py | 4 ++--
+ pitivi/actioner.py | 4 ++--
+ pitivi/application.py | 4 ++--
+ pitivi/check.py | 4 ++--
+ pitivi/configure.py.in | 4 ++--
+ pitivi/device.py | 4 ++--
+ pitivi/discoverer.py | 4 ++--
+ pitivi/effects.py | 4 ++--
+ pitivi/elements/arraysink.py | 4 ++--
+ pitivi/elements/mixer.py | 4 ++--
+ pitivi/elements/singledecodebin.py | 4 ++--
+ pitivi/elements/thumbnailsink.py | 4 ++--
+ pitivi/elements/videofade.py | 4 ++--
+ pitivi/encode.py | 4 ++--
+ pitivi/factories/base.py | 4 ++--
+ pitivi/factories/file.py | 4 ++--
+ pitivi/factories/operation.py | 4 ++--
+ pitivi/factories/test.py | 4 ++--
+ pitivi/factories/timeline.py | 4 ++--
+ pitivi/formatters/__init__.py | 4 ++--
+ pitivi/formatters/base.py | 4 ++--
+ pitivi/formatters/etree.py | 4 ++--
+ pitivi/formatters/format.py | 4 ++--
+ pitivi/formatters/playlist.py | 4 ++--
+ pitivi/instance.py | 4 ++--
+ pitivi/log/loggable.py | 4 ++--
+ pitivi/pipeline.py | 4 ++--
+ pitivi/pitivigstutils.py | 4 ++--
+ pitivi/plugincore.py | 4 ++--
+ pitivi/pluginmanager.py | 4 ++--
+ pitivi/plumber.py | 4 ++--
+ pitivi/project.py | 4 ++--
+ pitivi/projectmanager.py | 4 ++--
+ pitivi/settings.py | 4 ++--
+ pitivi/signalgroup.py | 4 ++--
+ pitivi/signalinterface.py | 4 ++--
+ pitivi/sourcelist.py | 4 ++--
+ pitivi/sourcelist_undo.py | 4 ++--
+ pitivi/stream.py | 4 ++--
+ pitivi/threads.py | 4 ++--
+ pitivi/thumbnailcache.py | 4 ++--
+ pitivi/timeline/gap.py | 4 ++--
+ pitivi/timeline/timeline.py | 4 ++--
+ pitivi/timeline/timeline_undo.py | 4 ++--
+ pitivi/timeline/track.py | 4 ++--
+ pitivi/ui/audiofxlist.py | 4 ++--
+ pitivi/ui/basetabs.py | 4 ++--
+ pitivi/ui/clipproperties.py | 4 ++--
+ pitivi/ui/controller.py | 4 ++--
+ pitivi/ui/curve.py | 4 ++--
+ pitivi/ui/defaultpropertyeditor.py | 4 ++--
+ pitivi/ui/dnd.py | 4 ++--
+ pitivi/ui/dynamic.py | 4 ++--
+ pitivi/ui/effectlist.py | 4 ++--
+ pitivi/ui/effectsconfiguration.py | 4 ++--
+ pitivi/ui/encodingdialog.py | 4 ++--
+ pitivi/ui/encodingprogress.py | 4 ++--
+ pitivi/ui/filelisterrordialog.py | 4 ++--
+ pitivi/ui/glade.py | 4 ++--
+ pitivi/ui/gstwidget.py | 4 ++--
+ pitivi/ui/mainwindow.py | 4 ++--
+ pitivi/ui/netstream_managerdialog.py | 4 ++--
+ pitivi/ui/pathwalker.py | 4 ++--
+ pitivi/ui/pluginmanagerdialog.py | 4 ++--
+ pitivi/ui/prefs.py | 4 ++--
+ pitivi/ui/preset.py | 4 ++--
+ pitivi/ui/preview.py | 4 ++--
+ pitivi/ui/previewer.py | 4 ++--
+ pitivi/ui/projectsettings.py | 4 ++--
+ pitivi/ui/propertyeditor.py | 4 ++--
+ pitivi/ui/ripple_update_group.py | 4 ++--
+ pitivi/ui/ruler.py | 4 ++--
+ pitivi/ui/screencast_managerdialog.py | 4 ++--
+ pitivi/ui/sourcelist.py | 4 ++--
+ pitivi/ui/timeline.py | 4 ++--
+ pitivi/ui/timelinecanvas.py | 4 ++--
+ pitivi/ui/videofxlist.py | 4 ++--
+ pitivi/ui/viewer.py | 4 ++--
+ pitivi/ui/webcam_managerdialog.py | 4 ++--
+ pitivi/ui/zoominterface.py | 4 ++--
+ pitivi/undo.py | 4 ++--
+ pitivi/utils.py | 4 ++--
+ tests/test_action.py | 4 ++--
+ tests/test_alpha_passthrough.py | 4 ++--
+ tests/test_factories_base.py | 4 ++--
+ tests/test_factories_file.py | 4 ++--
+ tests/test_gap.py | 4 ++--
+ tests/test_integration.py | 4 ++--
+ tests/test_pipeline.py | 4 ++--
+ tests/test_still_image.py | 4 ++--
+ tests/test_timeline_undo.py | 4 ++--
+ tests/test_transitions.py | 4 ++--
+ tests/test_undo.py | 4 ++--
+ 99 files changed, 225 insertions(+), 225 deletions(-)
+
+diff --git a/COPYING b/COPYING
+index 147a2d7..b2ff8bf 100644
+--- a/COPYING
++++ b/COPYING
+@@ -14,5 +14,5 @@
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this program; if not, write to the
+- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+diff --git a/bin/pitivi.in b/bin/pitivi.in
+index bce256b..ea00c5a 100644
+--- a/bin/pitivi.in
++++ b/bin/pitivi.in
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import os
+ import sys
+diff --git a/docs/pitivi.1 b/docs/pitivi.1
+index 17a692e..45a9f6e 100644
+--- a/docs/pitivi.1
++++ b/docs/pitivi.1
+@@ -12,7 +12,7 @@
+ .\"
+ .\"You should have received a copy of the GNU Lesser General Public License along
+ .\"with this program; if not, write to the Free Software Foundation, Inc.,
+-.\"59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++.\"51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ .TH pitivi 1 "2010\-12\-08" "GNOME"
+ .SH NAME
+ pitivi \- Non-linear video editor
+diff --git a/pitivi/action.py b/pitivi/action.py
+index d77e133..3df7065 100644
+--- a/pitivi/action.py
++++ b/pitivi/action.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Pipeline actions
+diff --git a/pitivi/actioner.py b/pitivi/actioner.py
+index f23b69f..0482654 100644
+--- a/pitivi/actioner.py
++++ b/pitivi/actioner.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Rendering helpers
+diff --git a/pitivi/application.py b/pitivi/application.py
+index 1449cc5..b24bff8 100644
+--- a/pitivi/application.py
++++ b/pitivi/application.py
+@@ -18,8 +18,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Main application
+diff --git a/pitivi/check.py b/pitivi/check.py
+index 1a34640..7b50413 100644
+--- a/pitivi/check.py
++++ b/pitivi/check.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Runtime checks.
+diff --git a/pitivi/configure.py.in b/pitivi/configure.py.in
+index b39998c..e5da2f9 100644
+--- a/pitivi/configure.py.in
++++ b/pitivi/configure.py.in
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+ """
+ Utilities for getting the location of various directories.
+ Enables identical use for installed and uninstalled versions.
+diff --git a/pitivi/device.py b/pitivi/device.py
+index 3877801..80a9a23 100644
+--- a/pitivi/device.py
++++ b/pitivi/device.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Classes and Methods for Device handling and usage
+diff --git a/pitivi/discoverer.py b/pitivi/discoverer.py
+index 2015a88..40afa71 100644
+--- a/pitivi/discoverer.py
++++ b/pitivi/discoverer.py
+@@ -18,8 +18,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Discover file multimedia information.
+diff --git a/pitivi/effects.py b/pitivi/effects.py
+index 941b02a..8361e04 100644
+--- a/pitivi/effects.py
++++ b/pitivi/effects.py
+@@ -18,8 +18,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Effects global handling
+diff --git a/pitivi/elements/arraysink.py b/pitivi/elements/arraysink.py
+index 5a1b8f3..eed349c 100644
+--- a/pitivi/elements/arraysink.py
++++ b/pitivi/elements/arraysink.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+ """
+ Stores audio samples in an array for plotting waveforms
+ """
+diff --git a/pitivi/elements/mixer.py b/pitivi/elements/mixer.py
+index b363b48..d0d33bb 100644
+--- a/pitivi/elements/mixer.py
++++ b/pitivi/elements/mixer.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Audio and Video mixers
+diff --git a/pitivi/elements/singledecodebin.py b/pitivi/elements/singledecodebin.py
+index e9e1e0b..5ea1e0b 100644
+--- a/pitivi/elements/singledecodebin.py
++++ b/pitivi/elements/singledecodebin.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Single-stream queue-less decodebin
+diff --git a/pitivi/elements/thumbnailsink.py b/pitivi/elements/thumbnailsink.py
+index e170844..5eac5cf 100644
+--- a/pitivi/elements/thumbnailsink.py
++++ b/pitivi/elements/thumbnailsink.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+ """
+ GdkPixbuf thumbnail sink
+ """
+diff --git a/pitivi/elements/videofade.py b/pitivi/elements/videofade.py
+index 44cef1e..413e476 100644
+--- a/pitivi/elements/videofade.py
++++ b/pitivi/elements/videofade.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Simple video fade element
+diff --git a/pitivi/encode.py b/pitivi/encode.py
+index 6bff7ac..021af99 100644
+--- a/pitivi/encode.py
++++ b/pitivi/encode.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Encoding-related utilities and classes
+diff --git a/pitivi/factories/base.py b/pitivi/factories/base.py
+index 2e564c2..1f19bf9 100644
+--- a/pitivi/factories/base.py
++++ b/pitivi/factories/base.py
+@@ -18,8 +18,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import os.path
+ from urllib import unquote
+diff --git a/pitivi/factories/file.py b/pitivi/factories/file.py
+index fca5f2f..b6668a7 100644
+--- a/pitivi/factories/file.py
++++ b/pitivi/factories/file.py
+@@ -18,8 +18,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gst
+ import os
+diff --git a/pitivi/factories/operation.py b/pitivi/factories/operation.py
+index 5ff8513..b0052ee 100644
+--- a/pitivi/factories/operation.py
++++ b/pitivi/factories/operation.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gst
+ from pitivi.factories.base import OperationFactory
+diff --git a/pitivi/factories/test.py b/pitivi/factories/test.py
+index 361a891..2557fe7 100644
+--- a/pitivi/factories/test.py
++++ b/pitivi/factories/test.py
+@@ -18,8 +18,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gst
+ from pitivi.factories.base import SourceFactory
+diff --git a/pitivi/factories/timeline.py b/pitivi/factories/timeline.py
+index ee00010..5f6ffa6 100644
+--- a/pitivi/factories/timeline.py
++++ b/pitivi/factories/timeline.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gobject
+ import gst
+diff --git a/pitivi/formatters/__init__.py b/pitivi/formatters/__init__.py
+index f902b96..2e193fc 100644
+--- a/pitivi/formatters/__init__.py
++++ b/pitivi/formatters/__init__.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Project store/load support
+diff --git a/pitivi/formatters/base.py b/pitivi/formatters/base.py
+index 45ffb32..aff3861 100644
+--- a/pitivi/formatters/base.py
++++ b/pitivi/formatters/base.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Base Formatter classes
+diff --git a/pitivi/formatters/etree.py b/pitivi/formatters/etree.py
+index c48f915..bfcbc22 100644
+--- a/pitivi/formatters/etree.py
++++ b/pitivi/formatters/etree.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gobject
+ gobject.threads_init()
+diff --git a/pitivi/formatters/format.py b/pitivi/formatters/format.py
+index 5bf591d..3cbb865 100644
+--- a/pitivi/formatters/format.py
++++ b/pitivi/formatters/format.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ High-level tools for using Formatters
+diff --git a/pitivi/formatters/playlist.py b/pitivi/formatters/playlist.py
+index 52778d4..8570bf4 100644
+--- a/pitivi/formatters/playlist.py
++++ b/pitivi/formatters/playlist.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import os.path
+ import ConfigParser
+diff --git a/pitivi/instance.py b/pitivi/instance.py
+index 85b2c57..a784c12 100644
+--- a/pitivi/instance.py
++++ b/pitivi/instance.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Current PiTiVi instance module
+diff --git a/pitivi/log/loggable.py b/pitivi/log/loggable.py
+index 6dde3f2..5f9559d 100644
+--- a/pitivi/log/loggable.py
++++ b/pitivi/log/loggable.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ from pitivi.log.log import _canShortcutLogging, doLog, ERROR
+ from pitivi.log import log
+diff --git a/pitivi/pipeline.py b/pitivi/pipeline.py
+index 92a9aaa..32269b9 100644
+--- a/pitivi/pipeline.py
++++ b/pitivi/pipeline.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ High-level pipelines
+diff --git a/pitivi/pitivigstutils.py b/pitivi/pitivigstutils.py
+index a15c144..ac59732 100644
+--- a/pitivi/pitivigstutils.py
++++ b/pitivi/pitivigstutils.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Additional methods for gst object to simplify code in pitivi.
+diff --git a/pitivi/plugincore.py b/pitivi/plugincore.py
+index 1af4475..bd0825c 100644
+--- a/pitivi/plugincore.py
++++ b/pitivi/plugincore.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ from zope.interface import Interface, Attribute
+
+diff --git a/pitivi/pluginmanager.py b/pitivi/pluginmanager.py
+index c47ed78..38faa67 100644
+--- a/pitivi/pluginmanager.py
++++ b/pitivi/pluginmanager.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Plugin Manager
+diff --git a/pitivi/plumber.py b/pitivi/plumber.py
+index 6181315..99ce5ed 100644
+--- a/pitivi/plumber.py
++++ b/pitivi/plumber.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Convenience functions for creating the output media sinks
+diff --git a/pitivi/project.py b/pitivi/project.py
+index ff2e4c5..3cf1f44 100644
+--- a/pitivi/project.py
++++ b/pitivi/project.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Project class
+diff --git a/pitivi/projectmanager.py b/pitivi/projectmanager.py
+index 16aefeb..f276959 100644
+--- a/pitivi/projectmanager.py
++++ b/pitivi/projectmanager.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ from gettext import gettext as _
+ import gobject
+diff --git a/pitivi/settings.py b/pitivi/settings.py
+index 7a3d10e..f3f18cd 100644
+--- a/pitivi/settings.py
++++ b/pitivi/settings.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Settings
+diff --git a/pitivi/signalgroup.py b/pitivi/signalgroup.py
+index abc26e8..9188bab 100644
+--- a/pitivi/signalgroup.py
++++ b/pitivi/signalgroup.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ A group of signals, which can be disconnected easily.
+diff --git a/pitivi/signalinterface.py b/pitivi/signalinterface.py
+index 62b9ab9..9692f8b 100644
+--- a/pitivi/signalinterface.py
++++ b/pitivi/signalinterface.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ # FIXME/IDEA : Add a decorator to easily add signals (ex: @signal(name="mysignal"))
+ # FIXME/IDEA : Add a function to quickly define signals (a-la pygobject gsignals)
+diff --git a/pitivi/sourcelist.py b/pitivi/sourcelist.py
+index e1a8c76..344db04 100644
+--- a/pitivi/sourcelist.py
++++ b/pitivi/sourcelist.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Handles the list of source for a project
+diff --git a/pitivi/sourcelist_undo.py b/pitivi/sourcelist_undo.py
+index 891cf8b..c2bc2b6 100644
+--- a/pitivi/sourcelist_undo.py
++++ b/pitivi/sourcelist_undo.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ from pitivi.undo import UndoableAction
+
+diff --git a/pitivi/stream.py b/pitivi/stream.py
+index 6ced245..a8e3153 100644
+--- a/pitivi/stream.py
++++ b/pitivi/stream.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Multimedia stream, used for definition of media streams
+diff --git a/pitivi/threads.py b/pitivi/threads.py
+index 13274b0..b1d1de2 100644
+--- a/pitivi/threads.py
++++ b/pitivi/threads.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+ """
+ Threading support
+ """
+diff --git a/pitivi/thumbnailcache.py b/pitivi/thumbnailcache.py
+index a7e3fcc..43afaf3 100644
+--- a/pitivi/thumbnailcache.py
++++ b/pitivi/thumbnailcache.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Dictionary-Like object for caching of thumbnails.
+diff --git a/pitivi/timeline/gap.py b/pitivi/timeline/gap.py
+index c8b27b9..72c3e2d 100644
+--- a/pitivi/timeline/gap.py
++++ b/pitivi/timeline/gap.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ from pitivi.utils import infinity
+
+diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
+index fe1829c..62cfcc3 100644
+--- a/pitivi/timeline/timeline.py
++++ b/pitivi/timeline/timeline.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ from bisect import bisect_left
+
+diff --git a/pitivi/timeline/timeline_undo.py b/pitivi/timeline/timeline_undo.py
+index 5f54771..5b63e22 100644
+--- a/pitivi/timeline/timeline_undo.py
++++ b/pitivi/timeline/timeline_undo.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gobject
+
+diff --git a/pitivi/timeline/track.py b/pitivi/timeline/track.py
+index f5bce4e..61279cd 100644
+--- a/pitivi/timeline/track.py
++++ b/pitivi/timeline/track.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gst
+ import gobject
+diff --git a/pitivi/ui/audiofxlist.py b/pitivi/ui/audiofxlist.py
+index 1982b47..c4d9643 100644
+--- a/pitivi/ui/audiofxlist.py
++++ b/pitivi/ui/audiofxlist.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gtk
+ import pango
+diff --git a/pitivi/ui/basetabs.py b/pitivi/ui/basetabs.py
+index 25b4910..9acdd35 100644
+--- a/pitivi/ui/basetabs.py
++++ b/pitivi/ui/basetabs.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gtk
+ from pitivi.ui.common import SPACING
+diff --git a/pitivi/ui/clipproperties.py b/pitivi/ui/clipproperties.py
+index e1e4bd2..03c1798 100644
+--- a/pitivi/ui/clipproperties.py
++++ b/pitivi/ui/clipproperties.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Class handling the midle pane
+diff --git a/pitivi/ui/controller.py b/pitivi/ui/controller.py
+index 57bbb55..8092bbd 100644
+--- a/pitivi/ui/controller.py
++++ b/pitivi/ui/controller.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gtk.gdk
+ from pitivi.receiver import receiver, handler
+diff --git a/pitivi/ui/curve.py b/pitivi/ui/curve.py
+index ec2c19a..bb62a5b 100644
+--- a/pitivi/ui/curve.py
++++ b/pitivi/ui/curve.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Custom canvas item for track object keyframe curves."""
+diff --git a/pitivi/ui/defaultpropertyeditor.py b/pitivi/ui/defaultpropertyeditor.py
+index 4040a75..f1b9024 100644
+--- a/pitivi/ui/defaultpropertyeditor.py
++++ b/pitivi/ui/defaultpropertyeditor.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Editor for aribtrary properties of timeline objects
+diff --git a/pitivi/ui/dnd.py b/pitivi/ui/dnd.py
+index 3b57a8c..c508a2c 100644
+--- a/pitivi/ui/dnd.py
++++ b/pitivi/ui/dnd.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Drag and drop constants
+diff --git a/pitivi/ui/dynamic.py b/pitivi/ui/dynamic.py
+index 30bdfa8..8cead16 100644
+--- a/pitivi/ui/dynamic.py
++++ b/pitivi/ui/dynamic.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ A collection of helper classes and routines for dynamically creating user
+diff --git a/pitivi/ui/effectlist.py b/pitivi/ui/effectlist.py
+index 7122690..29c2189 100644
+--- a/pitivi/ui/effectlist.py
++++ b/pitivi/ui/effectlist.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gtk
+ import pango
+diff --git a/pitivi/ui/effectsconfiguration.py b/pitivi/ui/effectsconfiguration.py
+index b002b87..aa69e04 100644
+--- a/pitivi/ui/effectsconfiguration.py
++++ b/pitivi/ui/effectsconfiguration.py
+@@ -15,8 +15,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gst
+ import gtk
+diff --git a/pitivi/ui/encodingdialog.py b/pitivi/ui/encodingdialog.py
+index e655d2d..c8f0d84 100644
+--- a/pitivi/ui/encodingdialog.py
++++ b/pitivi/ui/encodingdialog.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Encoding dialog
+diff --git a/pitivi/ui/encodingprogress.py b/pitivi/ui/encodingprogress.py
+index cf6a0ca..67273c0 100644
+--- a/pitivi/ui/encodingprogress.py
++++ b/pitivi/ui/encodingprogress.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Encoding dialog
+diff --git a/pitivi/ui/filelisterrordialog.py b/pitivi/ui/filelisterrordialog.py
+index e1d8474..97fe20a 100644
+--- a/pitivi/ui/filelisterrordialog.py
++++ b/pitivi/ui/filelisterrordialog.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Dialog box listing files which had errors, and the reasons.
+diff --git a/pitivi/ui/glade.py b/pitivi/ui/glade.py
+index ee85d85..c85bb3c 100644
+--- a/pitivi/ui/glade.py
++++ b/pitivi/ui/glade.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+ #
+
+ """
+diff --git a/pitivi/ui/gstwidget.py b/pitivi/ui/gstwidget.py
+index b2055d2..dde385b 100644
+--- a/pitivi/ui/gstwidget.py
++++ b/pitivi/ui/gstwidget.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Widget for gstreamer element properties viewing/setting
+diff --git a/pitivi/ui/mainwindow.py b/pitivi/ui/mainwindow.py
+index a29b660..8b526d4 100644
+--- a/pitivi/ui/mainwindow.py
++++ b/pitivi/ui/mainwindow.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Main GTK+ window
+diff --git a/pitivi/ui/netstream_managerdialog.py b/pitivi/ui/netstream_managerdialog.py
+index 06605d3..e9af4f4 100644
+--- a/pitivi/ui/netstream_managerdialog.py
++++ b/pitivi/ui/netstream_managerdialog.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import os
+ import gtk
+diff --git a/pitivi/ui/pathwalker.py b/pitivi/ui/pathwalker.py
+index 6d60443..9de61a2 100644
+--- a/pitivi/ui/pathwalker.py
++++ b/pitivi/ui/pathwalker.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import os
+ import threading
+diff --git a/pitivi/ui/pluginmanagerdialog.py b/pitivi/ui/pluginmanagerdialog.py
+index 20e246c..ee62e2e 100644
+--- a/pitivi/ui/pluginmanagerdialog.py
++++ b/pitivi/ui/pluginmanagerdialog.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import os
+ import gtk
+diff --git a/pitivi/ui/prefs.py b/pitivi/ui/prefs.py
+index ea1a454..aee7970 100644
+--- a/pitivi/ui/prefs.py
++++ b/pitivi/ui/prefs.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Dialog box for user preferences.
+diff --git a/pitivi/ui/preset.py b/pitivi/ui/preset.py
+index 5271925..bb58cbb 100644
+--- a/pitivi/ui/preset.py
++++ b/pitivi/ui/preset.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ from pitivi.settings import xdg_data_home
+ from ConfigParser import SafeConfigParser
+diff --git a/pitivi/ui/preview.py b/pitivi/ui/preview.py
+index 0b2b65e..23d1348 100644
+--- a/pitivi/ui/preview.py
++++ b/pitivi/ui/preview.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Custom canvas item for timeline object previews. This code is just a thin
+diff --git a/pitivi/ui/previewer.py b/pitivi/ui/previewer.py
+index 9fb8c68..f9685ff 100644
+--- a/pitivi/ui/previewer.py
++++ b/pitivi/ui/previewer.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Utility tools and classes for easy generation of previews
+diff --git a/pitivi/ui/projectsettings.py b/pitivi/ui/projectsettings.py
+index 1154b0e..0e61e85 100644
+--- a/pitivi/ui/projectsettings.py
++++ b/pitivi/ui/projectsettings.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Dialog box for project settings
+diff --git a/pitivi/ui/propertyeditor.py b/pitivi/ui/propertyeditor.py
+index 556e71f..e6d55db 100644
+--- a/pitivi/ui/propertyeditor.py
++++ b/pitivi/ui/propertyeditor.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Editor for aribtrary properties of timeline objects
+diff --git a/pitivi/ui/ripple_update_group.py b/pitivi/ui/ripple_update_group.py
+index c683940..2440e2e 100644
+--- a/pitivi/ui/ripple_update_group.py
++++ b/pitivi/ui/ripple_update_group.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+
+ class RippleUpdateGroup(object):
+diff --git a/pitivi/ui/ruler.py b/pitivi/ui/ruler.py
+index 72de79d..488f5a5 100644
+--- a/pitivi/ui/ruler.py
++++ b/pitivi/ui/ruler.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Widget for the complex view ruler
+diff --git a/pitivi/ui/screencast_managerdialog.py b/pitivi/ui/screencast_managerdialog.py
+index 15f4f2f..e26ad0b 100644
+--- a/pitivi/ui/screencast_managerdialog.py
++++ b/pitivi/ui/screencast_managerdialog.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gtk
+ import os
+diff --git a/pitivi/ui/sourcelist.py b/pitivi/ui/sourcelist.py
+index 3c3b140..79569b4 100644
+--- a/pitivi/ui/sourcelist.py
++++ b/pitivi/ui/sourcelist.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gobject
+ import gst
+diff --git a/pitivi/ui/timeline.py b/pitivi/ui/timeline.py
+index 59a2dae..0fc5884 100644
+--- a/pitivi/ui/timeline.py
++++ b/pitivi/ui/timeline.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Timeline widgets for the complex view
+diff --git a/pitivi/ui/timelinecanvas.py b/pitivi/ui/timelinecanvas.py
+index cbd874b..62d5cd6 100644
+--- a/pitivi/ui/timelinecanvas.py
++++ b/pitivi/ui/timelinecanvas.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gtk
+ import goocanvas
+diff --git a/pitivi/ui/videofxlist.py b/pitivi/ui/videofxlist.py
+index c24f794..d6e270f 100644
+--- a/pitivi/ui/videofxlist.py
++++ b/pitivi/ui/videofxlist.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Video effects list widget
+diff --git a/pitivi/ui/viewer.py b/pitivi/ui/viewer.py
+index a0703ea..33e6e70 100644
+--- a/pitivi/ui/viewer.py
++++ b/pitivi/ui/viewer.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import platform
+ import gobject
+diff --git a/pitivi/ui/webcam_managerdialog.py b/pitivi/ui/webcam_managerdialog.py
+index 1f4c827..4b6addd 100644
+--- a/pitivi/ui/webcam_managerdialog.py
++++ b/pitivi/ui/webcam_managerdialog.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gtk
+ import gst
+diff --git a/pitivi/ui/zoominterface.py b/pitivi/ui/zoominterface.py
+index 0471855..4adf4f7 100644
+--- a/pitivi/ui/zoominterface.py
++++ b/pitivi/ui/zoominterface.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """
+ Interface for managing tranformation between timeline timestamps and UI
+diff --git a/pitivi/undo.py b/pitivi/undo.py
+index c2efc60..e3e6431 100644
+--- a/pitivi/undo.py
++++ b/pitivi/undo.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ from pitivi.signalinterface import Signallable
+ from pitivi.log.loggable import Loggable
+diff --git a/pitivi/utils.py b/pitivi/utils.py
+index 697fb70..92599f0 100644
+--- a/pitivi/utils.py
++++ b/pitivi/utils.py
+@@ -18,8 +18,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ # set of utility functions
+
+diff --git a/tests/test_action.py b/tests/test_action.py
+index f3cd6ca..f5fefea 100644
+--- a/tests/test_action.py
++++ b/tests/test_action.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import time
+ import common
+diff --git a/tests/test_alpha_passthrough.py b/tests/test_alpha_passthrough.py
+index c072576..5d0b334 100644
+--- a/tests/test_alpha_passthrough.py
++++ b/tests/test_alpha_passthrough.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ from unittest import TestCase
+
+diff --git a/tests/test_factories_base.py b/tests/test_factories_base.py
+index 485cad8..e447089 100644
+--- a/tests/test_factories_base.py
++++ b/tests/test_factories_base.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gst
+
+diff --git a/tests/test_factories_file.py b/tests/test_factories_file.py
+index f01ccd3..78a242d 100644
+--- a/tests/test_factories_file.py
++++ b/tests/test_factories_file.py
+@@ -17,8 +17,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gst
+ from common import TestCase
+diff --git a/tests/test_gap.py b/tests/test_gap.py
+index 8cb1359..30a597b 100644
+--- a/tests/test_gap.py
++++ b/tests/test_gap.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ from unittest import TestCase
+
+diff --git a/tests/test_integration.py b/tests/test_integration.py
+index 23d486b..9718cb7 100644
+--- a/tests/test_integration.py
++++ b/tests/test_integration.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ """Test pitivi core objects at the API level, simulating the UI input for
+ QA scenarios """
+diff --git a/tests/test_pipeline.py b/tests/test_pipeline.py
+index eb8a54a..660a49a 100644
+--- a/tests/test_pipeline.py
++++ b/tests/test_pipeline.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import gobject
+ gobject.threads_init()
+diff --git a/tests/test_still_image.py b/tests/test_still_image.py
+index 6e5ac85..222dc2a 100644
+--- a/tests/test_still_image.py
++++ b/tests/test_still_image.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ import os.path
+ from unittest import TestCase
+diff --git a/tests/test_timeline_undo.py b/tests/test_timeline_undo.py
+index 3370bf6..0f8be4c 100644
+--- a/tests/test_timeline_undo.py
++++ b/tests/test_timeline_undo.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ from unittest import TestCase
+
+diff --git a/tests/test_transitions.py b/tests/test_transitions.py
+index faf437a..727a6ef 100644
+--- a/tests/test_transitions.py
++++ b/tests/test_transitions.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ from common import TestCase
+ import gst
+diff --git a/tests/test_undo.py b/tests/test_undo.py
+index dbcad1a..cd035b6 100644
+--- a/tests/test_undo.py
++++ b/tests/test_undo.py
+@@ -16,8 +16,8 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, write to the
+-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ from unittest import TestCase
+
+--
+1.7.5.2
+
diff --git a/0003-Remove-unneeded-shebang.patch b/0003-Remove-unneeded-shebang.patch
new file mode 100644
index 0000000..38f3165
--- /dev/null
+++ b/0003-Remove-unneeded-shebang.patch
@@ -0,0 +1,161 @@
+From 442b8942752bb380e8b392a0e492aef8030ebae5 Mon Sep 17 00:00:00 2001
+From: Hicham HAOUARI <hicham.haouari at gmail.com>
+Date: Sun, 5 Jun 2011 00:40:16 +0100
+Subject: [PATCH 3/3] Remove unneeded shebang
+
+---
+ pitivi/device.py | 1 -
+ pitivi/discoverer.py | 1 -
+ pitivi/effects.py | 1 -
+ pitivi/factories/base.py | 1 -
+ pitivi/factories/file.py | 1 -
+ pitivi/factories/operation.py | 1 -
+ pitivi/factories/test.py | 1 -
+ pitivi/plumber.py | 1 -
+ pitivi/project.py | 1 -
+ pitivi/settings.py | 1 -
+ pitivi/thumbnailcache.py | 1 -
+ pitivi/ui/previewer.py | 1 -
+ pitivi/ui/viewer.py | 1 -
+ pitivi/ui/zoominterface.py | 1 -
+ pitivi/utils.py | 1 -
+ 15 files changed, 0 insertions(+), 23 deletions(-)
+
+diff --git a/pitivi/device.py b/pitivi/device.py
+index 80a9a23..e8f0397 100644
+--- a/pitivi/device.py
++++ b/pitivi/device.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ # PiTiVi , Non-linear video editor
+ #
+ # device.py
+diff --git a/pitivi/discoverer.py b/pitivi/discoverer.py
+index 40afa71..09a9cf1 100644
+--- a/pitivi/discoverer.py
++++ b/pitivi/discoverer.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ # PiTiVi , Non-linear video editor
+ #
+ # discoverer.py
+diff --git a/pitivi/effects.py b/pitivi/effects.py
+index 8361e04..0add825 100644
+--- a/pitivi/effects.py
++++ b/pitivi/effects.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ # PiTiVi , Non-linear video editor
+ #
+ # effects.py
+diff --git a/pitivi/factories/base.py b/pitivi/factories/base.py
+index 1f19bf9..b1c4037 100644
+--- a/pitivi/factories/base.py
++++ b/pitivi/factories/base.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ # PiTiVi , Non-linear video editor
+ #
+ # base.py
+diff --git a/pitivi/factories/file.py b/pitivi/factories/file.py
+index b6668a7..6da34cc 100644
+--- a/pitivi/factories/file.py
++++ b/pitivi/factories/file.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ # PiTiVi , Non-linear video editor
+ #
+ # :base.py
+diff --git a/pitivi/factories/operation.py b/pitivi/factories/operation.py
+index b0052ee..3a36325 100644
+--- a/pitivi/factories/operation.py
++++ b/pitivi/factories/operation.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ # PiTiVi , Non-linear video editor
+ #
+ # operation.py
+diff --git a/pitivi/factories/test.py b/pitivi/factories/test.py
+index 2557fe7..2b5ef2e 100644
+--- a/pitivi/factories/test.py
++++ b/pitivi/factories/test.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ # PiTiVi , Non-linear video editor
+ #
+ # base.py
+diff --git a/pitivi/plumber.py b/pitivi/plumber.py
+index 99ce5ed..822ef2c 100644
+--- a/pitivi/plumber.py
++++ b/pitivi/plumber.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ # PiTiVi , Non-linear video editor
+ #
+ # plumber.py
+diff --git a/pitivi/project.py b/pitivi/project.py
+index 3cf1f44..2a83b1d 100644
+--- a/pitivi/project.py
++++ b/pitivi/project.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ # PiTiVi , Non-linear video editor
+ #
+ # project.py
+diff --git a/pitivi/settings.py b/pitivi/settings.py
+index f3f18cd..a902fe6 100644
+--- a/pitivi/settings.py
++++ b/pitivi/settings.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ # PiTiVi , Non-linear video editor
+ #
+ # settings.py
+diff --git a/pitivi/thumbnailcache.py b/pitivi/thumbnailcache.py
+index 43afaf3..68be22c 100644
+--- a/pitivi/thumbnailcache.py
++++ b/pitivi/thumbnailcache.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ # PiTiVi , Non-linear video editor
+ #
+ # thumbnailcache.py
+diff --git a/pitivi/ui/previewer.py b/pitivi/ui/previewer.py
+index f9685ff..a91906b 100644
+--- a/pitivi/ui/previewer.py
++++ b/pitivi/ui/previewer.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ # PiTiVi , Non-linear video editor
+ #
+ # previewer.py
+diff --git a/pitivi/ui/viewer.py b/pitivi/ui/viewer.py
+index 33e6e70..12f6db0 100644
+--- a/pitivi/ui/viewer.py
++++ b/pitivi/ui/viewer.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ # PiTiVi , Non-linear video editor
+ #
+ # ui/viewer.py
+diff --git a/pitivi/ui/zoominterface.py b/pitivi/ui/zoominterface.py
+index 4adf4f7..74c2327 100644
+--- a/pitivi/ui/zoominterface.py
++++ b/pitivi/ui/zoominterface.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ # PiTiVi , Non-linear video editor
+ #
+ # pitivi/ui/complexlayer.py
+diff --git a/pitivi/utils.py b/pitivi/utils.py
+index 92599f0..321677b 100644
+--- a/pitivi/utils.py
++++ b/pitivi/utils.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ # PiTiVi , Non-linear video editor
+ #
+ # utils.py
+--
+1.7.5.2
+
diff --git a/pitivi-0.14.0-welcome-dialog-after-mainwindow.patch b/pitivi-0.14.0-welcome-dialog-after-mainwindow.patch
new file mode 100644
index 0000000..a4d307e
--- /dev/null
+++ b/pitivi-0.14.0-welcome-dialog-after-mainwindow.patch
@@ -0,0 +1,34 @@
+From 7b0cea9a9a51163c8e849e4cea0d485e00971f2c Mon Sep 17 00:00:00 2001
+From: Thibault Saunier <thibault.saunier at collabora.com>
+Date: Fri, 03 Jun 2011 00:38:49 +0000
+Subject: ui: Make sure the welcome dialog doesn't appear before the mainwindow
+
+---
+diff --git a/pitivi/application.py b/pitivi/application.py
+index d6fc6b8..1449cc5 100644
+--- a/pitivi/application.py
++++ b/pitivi/application.py
+@@ -386,7 +386,6 @@ class StartupWizardGuiPitivi(FullGuiPitivi):
+ self.projectManager.connect("new-project-loading", self._hideWizardCb)
+ self.projectManager.connect("new-project-failed", self._showWizardCb)
+ self.wizard = StartUpWizard(self)
+- self.wizard.hide()
+ return FullGuiPitivi._createGui(self)
+
+ def _showGui(self):
+diff --git a/pitivi/ui/startupwizard.glade b/pitivi/ui/startupwizard.glade
+index 50f0386..18f7f42 100644
+--- a/pitivi/ui/startupwizard.glade
++++ b/pitivi/ui/startupwizard.glade
+@@ -3,7 +3,7 @@
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy project-wide -->
+ <object class="GtkWindow" id="window1">
+- <property name="visible">True</property>
++ <property name="visible">False</property>
+ <property name="border_width">10</property>
+ <property name="title" translatable="yes">Welcome</property>
+ <property name="resizable">False</property>
+--
+cgit v0.9
+
diff --git a/pitivi.spec b/pitivi.spec
index a7783e5..e210940 100644
--- a/pitivi.spec
+++ b/pitivi.spec
@@ -1,43 +1,49 @@
-%global major 0.13
-%global minor 5
-
+%global major 0.14
+%global minor 0
+# The minimum required versions can be found in configure.ac
+%define gnonlin_req 0.10.16
+%define gst_req 0.10.28
+%define pygst_req 0.10.19
+%define pygtk_req 2.18.0
Name: pitivi
Version: %{major}.%{minor}
-Release: 5%{?dist}
+Release: 1%{?dist}
Summary: Non-linear video editor
Group: Applications/Multimedia
License: LGPLv2+
URL: http://www.pitivi.org/
Source0: http://ftp.gnome.org/pub/GNOME/sources/pitivi/%{major}/pitivi-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: intltool
BuildRequires: python
BuildRequires: desktop-file-utils
BuildRequires: pygobject2
-BuildRequires: gstreamer-python
-BuildRequires: gnonlin
+BuildRequires: gstreamer-python >= %{pygst_req}
+BuildRequires: gnonlin >= %{gnonlin_req}
BuildRequires: gstreamer-plugins-good
-Requires: gnonlin
+BuildRequires: gstreamer >= %{gst_req}
+
+Requires: gstreamer >= %{gst_req}
+Requires: gnonlin >= %{gnonlin_req}
Requires: gstreamer-plugins-good
-Requires: gstreamer-python
-Requires: pygtk2
+Requires: gstreamer-python >= %{pygst_req}
+Requires: pygtk2 >= %{pygtk_req}
Requires: pygoocanvas
Requires: python-zope-interface
Requires: python-setuptools
Requires: hicolor-icon-theme
BuildArch: noarch
-#Patch0: fix crash when zooming with the slider
-# https://bugzilla.redhat.com/show_bug.cgi?id=654119
-Patch0: https://bugs.launchpad.net/ubuntu/+source/pygoocanvas/+bug/640630/+attachment/1671260/+files/0001-backport-canvas-fixes-to-0.13.5.patch
-#Patch1: Add man page
-# https://bugzilla.gnome.org/show_bug.cgi?id=636787
-Patch1: 0001-Add-man-page.patch
-#Patch2: Initialize pending new_segment to none
-# https://bugzilla.redhat.com/show_bug.cgi?id=653062
-# https://bugzilla.gnome.org/show_bug.cgi?id=613960
-# http://git.gnome.org/browse/pitivi/commit/?id=239e2fde2ea77db2c5a56afdd80badae5147b88d
-Patch2: pitivi-0.13.5-init-pending-new-segment-to-none.patch
+# http://git.gnome.org/browse/pitivi/commit/?id=7b0cea9a9a51163c8e849e4cea0d485e00971f2c
+Patch0: %{name}-%{version}-welcome-dialog-after-mainwindow.patch
+
+# https://bugzilla.gnome.org/show_bug.cgi?id=651895
+Patch1: 0001-Fix-typo-in-license.patch
+
+# https://bugzilla.gnome.org/show_bug.cgi?id=651897
+Patch2: 0002-Update-fsf-address.patch
+
+# https://bugzilla.gnome.org/show_bug.cgi?id=651898
+Patch3: 0003-Remove-unneeded-shebang.patch
%description
Pitivi is an application using the GStreamer multimedia framework to
@@ -49,19 +55,15 @@ program.
%prep
%setup -q
-for f in `find . -name \*.py`
-do
- sed -e '/^#!/,1d' < $f > $f.tmp && mv $f.tmp $f
-done
+%patch0 -p1 -b .welcome-dialog-after-mainwindow
+%patch1 -p1 -b .fix-typo-in-license
+%patch2 -p1 -b .update-fsf-address
+%patch3 -p1 -b .remove-unneeded-shebang
-%patch0 -p1 -b .fix-zoom-crash
-%patch1 -p1 -b .add-man-page
-%patch2 -p1 -b .init-newseg-none
-# Since DISPLAY is unset, don't import Pitivi in tests/test_binary_search.py and don't run tests/test_basic.py
-# Don't run tests/test_still_image.py either as it fails : https://bugzilla.gnome.org/show_bug.cgi?id=636807
+# Since DISPLAY is unset, don't import Pitivi in tests/test_binary_search.py
+# and don't run tests/test_basic.py and tests/test_timeline_undo.py
sed -i '/from pitivi.application import Pitivi/d' tests/test_binary_search.py
-sed -i "s|'test_integration'|'test_integration' ,'test_basic', 'test_still_image'|g" tests/runtests.py
-autoreconf -if -I common/m4
+rm -f tests/test_{basic,timeline_undo}.py
%build
%configure --libdir=%{_datadir}
@@ -70,20 +72,14 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-make DESTDIR=%{buildroot} install
-desktop-file-install --delete-original \
- --dir %{buildroot}%{_datadir}/applications \
- --add-category AudioVideoEditing \
- pitivi.desktop
+make DESTDIR=$RPM_BUILD_ROOT install
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
%check
make check
-%clean
-rm -rf %{buildroot}
-
%post
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -111,8 +107,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man1/%{name}.1.gz
%changelog
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13.5-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Thu Jun 02 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.14.0-1
+- Update to 0.14
+- Drop backported patches
+- Remove BuildRoot tag and clean section
+- Add patch to make sure welcome dialog apprears after the UI is loaded
+- Fix license in some files headers
* Wed Dec 15 2010 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.13.5-4
- Initialize pending new_segment to none, fixes rhbz #653062
diff --git a/sources b/sources
index b5c8b3f..299f7b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2471dbff3a63777dc89870e44da203e1 pitivi-0.13.5.tar.bz2
+6eb98be52c4aad0c1c7e23cfb35f496a pitivi-0.14.0.tar.bz2
More information about the scm-commits
mailing list