[Pkg-gstreamer-commits] [pitivi] 03/03: New upstream release candidate.

[Sebastian Dröge]

This is an automated email from the git hooks/post-receive script.

slomo pushed a commit to branch master
in repository pitivi.

commit 9b803d84fb7c317314e8bd3e84d15442f09f68c6
Author: Sebastian Dröge <sebastian at centricular.com>
Date:   Sat Mar 29 15:28:43 2014 +0100

    New upstream release candidate.
---
 debian/changelog                           |  6 +++
 debian/control                             | 12 +++---
 debian/patches/01_disable-devel-mode.patch | 66 ++++++++++++------------------
 3 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d785397..6c99a5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pitivi (0.93-1) experimental; urgency=medium
+
+  * New upstream release candidate.
+
+ -- Sebastian Dröge <slomo at debian.org>  Sat, 29 Mar 2014 15:22:50 +0100
+
 pitivi (0.92-1) experimental; urgency=low
 
   * New upstream release candidate.
diff --git a/debian/control b/debian/control
index d1b3e79..637151e 100644
--- a/debian/control
+++ b/debian/control
@@ -26,9 +26,9 @@ Depends: ${misc:Depends},
         python (>= 2.7),
         python-gi (>= 3.0),
         gir1.2-glib-2.0,
-        gir1.2-gstreamer-1.0 (>= 1.2.0),
-        gir1.2-gst-plugins-base-1.0 (>= 1.2.0),
-        gir1.2-ges-1.0,
+        gir1.2-gstreamer-1.0 (>= 1.2.3),
+        gir1.2-gst-plugins-base-1.0 (>= 1.2.3),
+        gir1.2-ges-1.0 (>= 1.2.0),
         gir1.2-pango-1.0,
         gir1.2-gdkpixbuf-2.0,
         gir1.2-gtk-3.0,
@@ -40,11 +40,11 @@ Depends: ${misc:Depends},
         python-xdg,
         python-cairo,
         python-dbus,
-        gstreamer1.0-plugins-base (>= 1.2.0),
-        gstreamer1.0-plugins-good (>= 1.2.0),
+        gstreamer1.0-plugins-base (>= 1.2.3),
+        gstreamer1.0-plugins-good (>= 1.2.3),
         gstreamer1.0-pulseaudio | gstreamer1.0-audiosink,
         gstreamer1.0-x | gstreamer1.0-videosink,
-        gstreamer1.0-gnonlin,
+        gstreamer1.0-gnonlin (>= 1.2.0),
         gnome-icon-theme
 Suggests: gstreamer1.0-plugins-ugly,
           gstreamer1.0-plugins-bad,
diff --git a/debian/patches/01_disable-devel-mode.patch b/debian/patches/01_disable-devel-mode.patch
index 4142acc..a3e4f2c 100644
--- a/debian/patches/01_disable-devel-mode.patch
+++ b/debian/patches/01_disable-devel-mode.patch
@@ -1,8 +1,8 @@
-diff --git a/bin/pitivi.in b/bin/pitivi.in
-index 04fd508..82cd144 100644
---- a/bin/pitivi.in
-+++ b/bin/pitivi.in
-@@ -45,8 +45,7 @@ def jump_through_hoops():
+Index: pitivi/bin/pitivi.in
+===================================================================
+--- pitivi.orig/bin/pitivi.in	2014-03-29 15:24:00.782574262 +0100
++++ pitivi/bin/pitivi.in	2014-03-29 15:24:00.778574243 +0100
+@@ -46,8 +46,7 @@
  
  # Check if we're in development or installed version and set paths properly
  def _in_devel():
@@ -12,11 +12,11 @@ index 04fd508..82cd144 100644
  
  
  def _add_pitivi_path():
-diff --git a/pitivi/configure.py b/pitivi/configure.py
-index 10b59ff..1b433e0 100644
---- a/pitivi/configure.py
-+++ b/pitivi/configure.py
-@@ -26,14 +26,8 @@ Enables identical use for installed and uninstalled versions.
+Index: pitivi/pitivi/configure.py
+===================================================================
+--- pitivi.orig/pitivi/configure.py	2014-03-29 15:24:00.782574262 +0100
++++ pitivi/pitivi/configure.py	2014-03-29 15:24:38.154750476 +0100
+@@ -26,17 +26,8 @@
  import os.path
  
  
@@ -25,18 +25,22 @@ index 10b59ff..1b433e0 100644
 -    return '/'.join(os.path.dirname(os.path.abspath(__file__)).split('/')[:-1])
 -
 -
- def _in_devel():
+-def in_devel():
+-    """
+-    Returns whether the app is run from a git checkout.
+-    """
 -    rd = _get_root_dir()
 -    return os.path.exists(os.path.join(rd, '.git'))
++def _in_devel():
 +    return False
  
  
  LIBDIR = '/usr/local/lib'
-diff --git a/pitivi/configure.py.in b/pitivi/configure.py.in
-index f598d3c..7ec0a67 100644
---- a/pitivi/configure.py.in
-+++ b/pitivi/configure.py.in
-@@ -26,14 +26,8 @@ Enables identical use for installed and uninstalled versions.
+Index: pitivi/pitivi/configure.py.in
+===================================================================
+--- pitivi.orig/pitivi/configure.py.in	2014-03-29 15:24:00.782574262 +0100
++++ pitivi/pitivi/configure.py.in	2014-03-29 15:24:50.862810463 +0100
+@@ -26,18 +26,8 @@
  import os.path
  
  
@@ -45,31 +49,15 @@ index f598d3c..7ec0a67 100644
 -    return '/'.join(os.path.dirname(os.path.abspath(__file__)).split('/')[:-1])
 -
 -
- def _in_devel():
+-def in_devel():
+-    """
+-    Returns whether the app is run from a git checkout.
+-    """
 -    rd = _get_root_dir()
 -    return os.path.exists(os.path.join(rd, '.git'))
+-
++def _in_devel():
 +    return False
  
- 
  LIBDIR = '@LIBDIR@'
-diff --git a/pitivi/utils/misc.py b/pitivi/utils/misc.py
-index 937283e..7840820 100644
---- a/pitivi/utils/misc.py
-+++ b/pitivi/utils/misc.py
-@@ -99,15 +99,7 @@ def bin_contains(bin, element):
- 
- 
- def in_devel():
--    """
--    Returns True if the current Pitivi instance is run from a git checkout
--    """
--    try:
--        # This code is the same as in the configure files
--        root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
--        return os.path.exists(os.path.join(root_dir, '.git'))
--    except:
--        return False
-+    return False
- 
- 
- #------------------------------ URI helpers   --------------------------------#
+ PKGDATADIR = '@DATADIR@/@PACKAGE@'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/pitivi.git