From 12f9a90a32ff0f210de7f92fd5ef7fa03ca9f52c Mon Sep 17 00:00:00 2001 From: Hicham HAOUARI Date: Oct 08 2011 14:38:52 +0000 Subject: Update to 0.15.0 --- diff --git a/.gitignore b/.gitignore index 1b46b0b..be209f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /pitivi-0.13.5.tar.bz2 /pitivi-0.14.0.tar.bz2 +/pitivi-0.15.0.tar.bz2 diff --git a/0001-Fix-typo-in-license.patch b/0001-Fix-typo-in-license.patch deleted file mode 100644 index 2fabe85..0000000 --- a/0001-Fix-typo-in-license.patch +++ /dev/null @@ -1,44 +0,0 @@ -From db67ffeeb3db5a713a90a972456a90c195ce4c49 Mon Sep 17 00:00:00 2001 -From: Hicham HAOUARI -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 deleted file mode 100644 index 7b45015..0000000 --- a/0002-Update-fsf-address.patch +++ /dev/null @@ -1,1542 +0,0 @@ -From 64e313fcaa7da1e05f4ad715b3ed3a6647734ed0 Mon Sep 17 00:00:00 2001 -From: Hicham HAOUARI -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 deleted file mode 100644 index 38f3165..0000000 --- a/0003-Remove-unneeded-shebang.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 442b8942752bb380e8b392a0e492aef8030ebae5 Mon Sep 17 00:00:00 2001 -From: Hicham HAOUARI -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-Lower-pygtk2-minimum-version-to-2.17.0.patch b/pitivi-0.14.0-Lower-pygtk2-minimum-version-to-2.17.0.patch deleted file mode 100644 index a05be9f..0000000 --- a/pitivi-0.14.0-Lower-pygtk2-minimum-version-to-2.17.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ae411113c790999eda8dfab25e846bc996b6a41a Mon Sep 17 00:00:00 2001 -From: Hicham HAOUARI -Date: Tue, 14 Jun 2011 15:54:35 +0100 -Subject: [PATCH] Lower pygtk2 minimum version to 2.17.0 - ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index aade2d6..b0034ac 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -31,7 +31,7 @@ dnl - dnl For a more exhaustive list of checks, you can have a look at - dnl the runtime checks in pitivi/check.py - --AC_SUBST(PYGTK_REQ, 2.18.0) -+AC_SUBST(PYGTK_REQ, 2.17.0) - AC_SUBST(PYGST_REQ, 0.10.19) - AC_SUBST(GST_REQ, 0.10.28) - AC_SUBST(GNONLIN_REQ, 0.10.16) --- -1.7.5.4 - diff --git a/pitivi-0.14.0-allow-using-default-as-preset-name.patch b/pitivi-0.14.0-allow-using-default-as-preset-name.patch deleted file mode 100644 index 40f7f30..0000000 --- a/pitivi-0.14.0-allow-using-default-as-preset-name.patch +++ /dev/null @@ -1,205 +0,0 @@ -diff --git a/pitivi/ui/preset.py b/pitivi/ui/preset.py -index 888957e..5a8f99f 100644 ---- a/pitivi/ui/preset.py -+++ b/pitivi/ui/preset.py -@@ -1,6 +1,6 @@ - # PiTiVi , Non-linear video editor - # --# pitivi/ui/controller.py -+# pitivi/ui/preset.py - # - # Copyright (c) 2010, Brandon Lewis - # -@@ -19,54 +19,104 @@ - # 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 --from pitivi.ui.dynamic import DynamicWidget --from pitivi.ui.common import set_combo_value, get_combo_value -+import ConfigParser - import os.path --import gtk - import gst -+import gtk -+ -+from pitivi.settings import xdg_data_home -+ - - class PresetManager(object): -+ """Abstract class for storing a list of presets. -+ -+ Subclasses must provide a filename attribute. -+ -+ @cvar filename: The name of the file where the presets will be stored. -+ @type filename: str -+ """ - - def __init__(self): -- self.path = os.path.join(xdg_data_home(), "pitivi", self.filename) - self.presets = {} - self.widget_map = {} - self.ordered = gtk.ListStore(str, object) - self.cur_preset = None - self.ignore = False - -+ def _getFilename(self): -+ return os.path.join(xdg_data_home(), "pitivi", self.filename) -+ - def load(self): -- try: -- fin = open(self.path, "r") -- parser = SafeConfigParser() -- parser.readfp(fin) -- self._load(parser) -- except IOError: -- pass -+ parser = ConfigParser.SafeConfigParser() -+ if not parser.read(self._getFilename()): -+ # The file probably does not exist yet. -+ return -+ self._loadPresetsFromParser(parser) - - def save(self): -- fout = open(self.path, "w") -- parser = SafeConfigParser() -- self._save(parser) -+ parser = ConfigParser.SafeConfigParser() -+ self._savePresetsToParser(parser) -+ fout = open(self._getFilename(), "w") - parser.write(fout) -+ fout.close() - -- def _load(self, parser): -+ def _loadPresetsFromParser(self, parser): - for section in sorted(parser.sections()): -- self.loadSection(parser, section) -+ values = self._loadPreset(parser, section) -+ preset = self._convertSectionNameToPresetName(section) -+ self.addPreset(preset, values) -+ -+ def _savePresetsToParser(self, parser): -+ for preset, properties in self.ordered: -+ values = self.presets[preset] -+ section = self._convertPresetNameToSectionName(preset) -+ self._savePreset(parser, section, values) -+ -+ def _loadPreset(self, parser, section): -+ """Load the specified section from the specified config parser. -+ -+ @param parser: The config parser from which the section will be loaded. -+ @type parser: ConfigParser -+ @param section: The name of the section to be loaded. -+ @type section: str -+ @return: A dict representing a preset. -+ """ -+ raise NotImplemented - -- def _save(self, parser): -- for name, properties in self.ordered: -- self.saveSection(parser, name) -+ def _savePreset(self, parser, section, values): -+ """Create the specified section into the specified config parser. - -- def loadSection(self, parser, section): -+ @param parser: The config parser in which the section will be created. -+ @type parser: ConfigParser -+ @param section: The name of the section to be created. -+ @type section: str -+ @param values: The values of a preset. -+ @type values: dict -+ """ - raise NotImplemented - -- def saveSection(self, parser, section): -- raise NotImplemented -+ def _convertSectionNameToPresetName(self, section): -+ assert section != "default" -+ if section.rstrip("_").lower() == "default": -+ return section[:-1] -+ else: -+ return section -+ -+ def _convertPresetNameToSectionName(self, preset): -+ if preset.rstrip("_").lower() == "default": -+ # We add an _ to allow the user to have a preset named "default". -+ return "%s_" % preset -+ else: -+ return preset - - def addPreset(self, name, values): -+ """Add a new preset. -+ -+ @param name: The name of the new preset. -+ @type name: str -+ @param values: The values of the new preset. -+ @type values: dict -+ """ - self.presets[name] = values - self.ordered.append((name, values)) - -@@ -123,11 +173,12 @@ class PresetManager(object): - return any((values[field] != getter() for field, (setter, getter) - in self.widget_map.iteritems())) - -+ - class VideoPresetManager(PresetManager): - - filename = "video_presets" - -- def loadSection(self, parser, section): -+ def _loadPreset(self, parser, section): - width = parser.getint(section, "width") - height = parser.getint(section, "height") - -@@ -139,15 +190,13 @@ class VideoPresetManager(PresetManager): - par_denom = parser.getint(section, "par-denom") - par = gst.Fraction(par_num, par_denom) - -- self.addPreset(section, { -+ return { - "width": width, - "height": height, - "frame-rate": rate, -- "par": par, -- }) -+ "par": par} - -- def saveSection(self, parser, section): -- values = self.presets[section] -+ def _savePreset(self, parser, section, values): - parser.add_section(section) - parser.set(section, "width", str(values["width"])) - parser.set(section, "height", str(values["height"])) -@@ -160,25 +209,23 @@ class VideoPresetManager(PresetManager): - parser.set(section, "par-denom", - str(int(values["par"].denom))) - -+ - class AudioPresetManager(PresetManager): - - filename = "audio_presets" - -- def loadSection(self, parser, section): -+ def _loadPreset(self, parser, section): - channels = parser.getint(section, "channels") - depth = parser.getint(section, "depth") - rate = parser.getint(section, "sample-rate") - -- self.addPreset(section, { -+ return { - "channels": channels, - "depth": depth, -- "sample-rate": rate, -- }) -+ "sample-rate": rate} - -- def saveSection(self, parser, section): -- values = self.presets[section] -+ def _savePreset(self, parser, section, values): - parser.add_section(section) - parser.set(section, "channels", str(values["channels"])) - parser.set(section, "depth", str(values["depth"])) - parser.set(section, "sample-rate", str(values["sample-rate"])) -- diff --git a/pitivi-0.14.0-welcome-dialog-after-mainwindow.patch b/pitivi-0.14.0-welcome-dialog-after-mainwindow.patch deleted file mode 100644 index a4d307e..0000000 --- a/pitivi-0.14.0-welcome-dialog-after-mainwindow.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7b0cea9a9a51163c8e849e4cea0d485e00971f2c Mon Sep 17 00:00:00 2001 -From: Thibault Saunier -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 @@ - - - -- True -+ False - 10 - Welcome - False --- -cgit v0.9 - diff --git a/pitivi.spec b/pitivi.spec index 7abbf36..aac4320 100644 --- a/pitivi.spec +++ b/pitivi.spec @@ -1,62 +1,35 @@ -%global major 0.14 +%global major 0.15 %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.17.0 + Name: pitivi Version: %{major}.%{minor} -Release: 2%{?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 -BuildRequires: intltool +BuildRequires: intltool >= 0.35.0 BuildRequires: python BuildRequires: desktop-file-utils -BuildRequires: pygobject2 -BuildRequires: gstreamer-python >= %{pygst_req} -BuildRequires: gnonlin >= %{gnonlin_req} -BuildRequires: gstreamer-plugins-good -BuildRequires: gstreamer >= %{gst_req} -BuildRequires: pyxdg -BuildRequires: glib2-devel -BuildRequires: autoconf >= 2.52 -BuildRequires: automake - -Requires: gstreamer >= %{gst_req} -Requires: gnonlin >= %{gnonlin_req} +BuildRequires: gnome-doc-utils >= 0.18.0 + +Requires: gstreamer >= 0.10.28 +Requires: gnonlin >= 0.10.16 Requires: gstreamer-plugins-good -Requires: gstreamer-python >= %{pygst_req} -Requires: pygtk2 >= %{pygtk_req} +Requires: gstreamer-python >= 0.10.19 +Requires: pygtk2 >= 2.17.0 Requires: pygoocanvas Requires: python-zope-interface Requires: python-setuptools Requires: hicolor-icon-theme Requires: pyxdg -BuildArch: noarch - -# 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 - -# https://bugzilla.redhat.com/show_bug.cgi?id=712700 -# https://bugzilla.gnome.org/show_bug.cgi?id=652397 -# https://github.com/aleb/pitivi/commit/cd27e9a0d9e3e09e268c951af1da893df7a12cc4 -Patch4: pitivi-0.14.0-allow-using-default-as-preset-name.patch +Requires: frei0r-plugins +Requires: numpy +Requires: yelp +Requires: pycairo >= 1.0.0 -# https://bugzilla.gnome.org/show_bug.cgi?id=652567 -Patch5: pitivi-0.14.0-Lower-pygtk2-minimum-version-to-2.17.0.patch +BuildArch: noarch %description Pitivi is an application using the GStreamer multimedia framework to @@ -68,20 +41,6 @@ program. %prep %setup -q -%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 -%patch4 -p1 -b .allow-using-default-as-preset-name -%patch5 -p1 -b .lower-pygtk-min-version - -# 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 -rm -f tests/test_{basic,timeline_undo}.py - -autoreconf -if -I common/m4 - %build %configure --libdir=%{_datadir} @@ -94,9 +53,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %find_lang %{name} -%check -make check - %post update-desktop-database &> /dev/null || : update-mime-database %{_datadir}/mime &> /dev/null || : @@ -122,8 +78,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*/apps/%{name}.* %{_datadir}/mime/packages/%{name}.xml %{_mandir}/man1/%{name}.1.gz +%{_datadir}/gnome/help/%{name} %changelog +* Tue Sep 27 2011 Hicham HAOUARI - 0.15.0-1 +- Update to 0.15.0 +- Drop previously backported patches +- Disable tests since most of them require gtk + +* Sun Sep 11 2011 Hicham HAOUARI - 0.14.2-1 +- Update to 0.14.2 + +* Thu Jun 30 2011 Hicham HAOUARI - 0.14.0-3 +- Do not allow presets to have the same name, fixes rhbz #717328 + * Sun Jun 12 2011 Hicham HAOUARI - 0.14.0-2 - Allow using "Default" as preset name, fixes rhbz #712700 - Lower pygtk2 min version to 2.17.0 so that we can push 0.14.0 to f14 diff --git a/sources b/sources index 299f7b8..137fff7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6eb98be52c4aad0c1c7e23cfb35f496a pitivi-0.14.0.tar.bz2 +c0b9d88ee4c2fd17c62b8dc9f4aeaf52 pitivi-0.15.0.tar.bz2