[Pkg-gstreamer-commits] [SCM] GStreamer Core 0.10 Packaging branch, master, updated. debian/0.10.36-1-3-gab93adf
Sebastian Dröge
sebastian.droege at collabora.co.uk
Tue Jun 26 11:27:43 UTC 2012
The following commit has been merged in the master branch:
commit 1f02ed1aaeb3bd629959ef2d39a9febf0e4b52e5
Author: Iain Lane <iain.lane at canonical.com>
Date: Tue Jun 26 10:11:12 2012 +0100
debian/control: Add Vcs- headers
diff --git a/debian/changelog b/debian/changelog
index 4f7c15d..369d048 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
gstreamer0.10 (0.10.36-2) UNRELEASED; urgency=low
+ [ Sebastian Dröge ]
* debian/changelog:
+ Remove merge conflict marker (Closes: #660798).
+ [ Iain Lane ]
+ * debian/control:
+ + Add Vcs- headers
+
-- Sebastian Dröge <slomo at debian.org> Wed, 22 Feb 2012 08:42:59 +0100
gstreamer0.10 (0.10.36-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2ff8e9f..101cec1 100644
--- a/debian/control
+++ b/debian/control
@@ -44,6 +44,8 @@ Build-Depends-Indep: python (>= 2.2),
libglib2.0-doc
Standards-Version: 3.8.4
Homepage: http://gstreamer.freedesktop.org
+Vcs-Git: git://git.debian.org/git/pkg-gstreamer/gstreamer0.10.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-gstreamer/gstreamer0.10.git
Package: libgstreamer0.10-0
Architecture: any
@@ -140,7 +142,7 @@ Section: utils
Depends: ${shlibs:Depends},
${misc:Depends},
pkg-config,
- libgstreamer0.10-0 (>= 0.10.35)
+ libgstreamer0.10-0 (>= 0.10.36)
Suggests: gstreamer0.10-plugins-base
Description: Tools for use with GStreamer
GStreamer is a streaming media framework, based on graphs of filters
diff --git a/debian/control.in b/debian/control.in
index 0e85923..04abc77 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -44,6 +44,8 @@ Build-Depends-Indep: python (>= 2.2),
libglib2.0-doc
Standards-Version: 3.8.4
Homepage: http://gstreamer.freedesktop.org
+Vcs-Git: git://git.debian.org/git/pkg-gstreamer/gstreamer0.10.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-gstreamer/gstreamer0.10.git
Package: @GST_LIB@
Architecture: any
--
GStreamer Core 0.10 Packaging
More information about the Pkg-gstreamer-commits
mailing list