Here is a proposed (sourceful) NMU. Release team, does this look OK? I
pulled in a couple of trivial changes from pkg-gst git (but not
"debian/rules: Delete all .la files", which seems undesirable during a
freeze).
I've only tested this fairly trivially (totem still plays videos); I'll
do some more testing before uploading if it becomes necessary, but it'd
be better if a maintainer could do proper testing and a MU.
S
diff --git a/debian/changelog b/debian/changelog
index 0b1ab50..47d3e1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+gstreamer0.10 (0.10.36-1+nmu1) unstable; urgency=low
+
+ [ Sebastian Dröge ]
+ * debian/changelog:
+ + Remove merge conflict marker (Closes: #660798).
+
+ [ Iain Lane ]
+ * debian/control:
+ + Add Vcs- headers
+
+ [ Simon McVittie ]
+ * Non-maintainer upload
+ * Rebuild against GLib 2.32 (Closes: #697025)
+ + regenerate debian/control from debian/control.in
+
+ -- Simon McVittie <s...@debian.org> Sun, 30 Dec 2012 23:09:24 +0000
+
gstreamer0.10 (0.10.36-1) unstable; urgency=low
[ Loïc Minier ]
@@ -58,7 +75,6 @@ gstreamer0.10 (0.10.35.2-1) experimental; urgency=low
Patch taken from the Ubuntu package.
-- Sebastian Dröge <sl...@debian.org> Sun, 11 Dec 2011 18:52:12 +0100
->>>>>>> experimental
gstreamer0.10 (0.10.35-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
