[Pkg-gstreamer-commits] [pitivi] 05/05: New upstream release candidate.
Sebastian Dröge
slomo at alioth.debian.org
Fri Nov 1 10:22:58 UTC 2013
This is an automated email from the git hooks/post-receive script.
slomo pushed a commit to branch master
in repository pitivi.
commit 05074a7f0b90ad3430d4791081e8e92b0f5ed3e8
Author: Sebastian Dröge <sebastian at centricular.com>
Date: Fri Nov 1 10:22:57 2013 +0100
New upstream release candidate.
---
debian/changelog | 6 ++
debian/compat | 2 +-
debian/control | 70 +++++++++++---------
debian/patches/01_disable-devel-mode.patch | 95 ++++++++++++++++++++--------
debian/rules | 21 +++---
debian/watch | 2 +-
6 files changed, 129 insertions(+), 67 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0a00d00..d4d3137 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pitivi (0.91-1) experimental; urgency=low
+
+ * New upstream release candidate.
+
+ -- Sebastian Dröge <slomo at debian.org> Fri, 01 Nov 2013 10:22:08 +0100
+
pitivi (0.15.2-0.2) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 0205418..d1b3e79 100644
--- a/debian/control
+++ b/debian/control
@@ -3,42 +3,52 @@ Section: gnome
Priority: optional
Maintainer: Loic Minier <lool at dooz.org>
Uploaders: Sebastian Dröge <slomo at debian.org>
-Build-Depends: cdbs (>= 0.4.90~),
- debhelper (>= 7),
- dh-buildinfo
-Build-Depends-Indep: python-dev (>= 2.6.6-3~),
- libxml-parser-perl,
- intltool (>= 0.35),
- gnome-doc-utils (>= 0.18.0),
- pkg-config
-Standards-Version: 3.9.0
+Build-Depends: debhelper (>= 9),
+ dpkg-dev (>= 1.16.1~),
+ dh-buildinfo,
+ python-all-dev (>= 2.7),
+ intltool (>= 0.35),
+ gnome-doc-utils (>= 0.18.0),
+ pkg-config,
+ itstool,
+ libcairo2-dev,
+ python-cairo-dev,
+ python-support
+X-Python-Version: >= 2.7
+Standards-Version: 3.9.4
+Homepage: http://www.pitivi.org
Package: pitivi
-Architecture: all
+Architecture: any
Depends: ${misc:Depends},
+ ${shlibs:Depends},
${python:Depends},
- python-gtk2 (>= 2.24),
- python-gst0.10 (>= 0.10.19),
- python-cairo (>= 1.0.0),
- python-glade2,
- python-gconf,
- python-dbus,
- python-pkg-resources,
- python-zope.interface | python-zope-interface,
- python-pygoocanvas,
+ 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-pango-1.0,
+ gir1.2-gdkpixbuf-2.0,
+ gir1.2-gtk-3.0,
+ gir1.2-clutter-1.0,
+ gir1.2-gtkclutter-1.0,
+ python-gst-1.0,
+ python-numpy,
+ python-matplotlib,
python-xdg,
- libgstreamer0.10-0 (>= 0.10.28),
- libgstreamer-plugins-base0.10-0 (>= 0.10.28),
- gstreamer0.10-plugins-base (>= 0.10.28),
- gstreamer0.10-plugins-good,
- gstreamer0.10-pulseaudio | gstreamer0.10-audiosink,
- gstreamer0.10-x | gstreamer0.10-videosink,
- gstreamer0.10-gnonlin (>= 0.10.16),
+ python-cairo,
+ python-dbus,
+ gstreamer1.0-plugins-base (>= 1.2.0),
+ gstreamer1.0-plugins-good (>= 1.2.0),
+ gstreamer1.0-pulseaudio | gstreamer1.0-audiosink,
+ gstreamer1.0-x | gstreamer1.0-videosink,
+ gstreamer1.0-gnonlin,
gnome-icon-theme
-Recommends: python-numpy
-Suggests: gstreamer0.10-plugins-ugly,
- gstreamer0.10-plugins-bad,
- gstreamer0.10-ffmpeg,
+Suggests: gstreamer1.0-plugins-ugly,
+ gstreamer1.0-plugins-bad,
+ gstreamer1.0-libav,
frei0r-plugins
Description: non-linear audio/video editor using GStreamer
GStreamer is a streaming media framework, based on graphs of filters
diff --git a/debian/patches/01_disable-devel-mode.patch b/debian/patches/01_disable-devel-mode.patch
index 5b1596d..4142acc 100644
--- a/debian/patches/01_disable-devel-mode.patch
+++ b/debian/patches/01_disable-devel-mode.patch
@@ -1,34 +1,75 @@
-Index: pitivi/bin/pitivi.in
-===================================================================
---- pitivi.orig/bin/pitivi.in 2011-09-28 18:57:27.773150417 +0200
-+++ pitivi/bin/pitivi.in 2011-09-28 18:57:42.765224752 +0200
-@@ -38,13 +38,6 @@
- # Add the path of pitivi stuff
- # TODO : change it when it's finally in cvs
+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():
+ # Check if we're in development or installed version and set paths properly
+ def _in_devel():
+- root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+- return os.path.exists(os.path.join(root_dir, '.git'))
++ return False
+
+
+ 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.
+ import os.path
+
+
+-# Again, mostly the same thing as in bin/pitivi.in and pitivi/utils/misc.py:
-def _get_root_dir():
- return '/'.join(os.path.dirname(os.path.abspath(__file__)).split('/')[:-1])
-
--def _in_devel():
+-
+ def _in_devel():
- rd = _get_root_dir()
- return os.path.exists(os.path.join(rd, '.git'))
++ 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.
+ import os.path
+
+
+-# Again, mostly the same thing as in bin/pitivi.in and pitivi/utils/misc.py:
+-def _get_root_dir():
+- return '/'.join(os.path.dirname(os.path.abspath(__file__)).split('/')[:-1])
-
- def _prepend_env_path(name, value):
- os.environ[name] = os.pathsep.join(value +
- os.environ.get(name, "").split(os.pathsep))
-@@ -56,13 +49,8 @@
- def _add_pitivi_path():
- global localedir
- dir = os.path.dirname(os.path.abspath(__file__))
-- root = None
-- if _in_devel():
-- root = os.path.split(dir)[0]
-- localedir = os.path.join(os.path.split(dir)[0], 'locale')
-- else:
-- root = os.path.join(LIBDIR, 'pitivi', 'python')
-- localedir = "@DATADIR@/locale"
-+ root = os.path.join(LIBDIR, 'pitivi', 'python')
-+ localedir = "@DATADIR@/locale"
-
- if not root in sys.path:
- sys.path.insert(0, root)
+-
+ def _in_devel():
+- rd = _get_root_dir()
+- return os.path.exists(os.path.join(rd, '.git'))
++ 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 --------------------------------#
diff --git a/debian/rules b/debian/rules
index 7940d0c..df0745a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,17 @@
#!/usr/bin/make -f
-DEB_PYTHON2_MODULE_PACKAGES=pitivi
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/dpkg/default.mk
+include /usr/share/python/python.mk
-binary-post-install/pitivi::
- # set executable bit on files with a shebang
- -egrep -rlZ '^#!(.*)python' debian/pitivi/usr/lib/pitivi | xargs -0 chmod a+x --
- dh_python2
+configure_flags += \
+ --disable-silent-rules \
+ $(NULL)
+
+%:
+ dh $@ --with python2
+
+override_dh_auto_configure:
+ dh_auto_configure -- $(configure_flags)
+
+override_dh_auto_test:
diff --git a/debian/watch b/debian/watch
index b8db395..3445f08 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=2
-http://ftp.gnome.org/pub/GNOME/sources/pitivi/0.13/pitivi-(.*)\.tar.gz
+http://ftp.gnome.org/pub/GNOME/sources/pitivi/0.91/pitivi-(.*)\.tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/pitivi.git
More information about the Pkg-gstreamer-commits
mailing list