Merge lp:~broder/ubuntu/natty/gst-plugins-base0.10/perlsectomy into lp:ubuntu/natty/gst-plugins-base0.10

[Evan Broder]

=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2010-11-10 07:18:48 +0000
@@ -0,0 +1,1 @@
+debian/patches

=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2010-11-10 07:18:48 +0000
@@ -0,0 +1,1 @@
+series

=== added directory '.pc/100_no_file-basename.patch'
=== added file '.pc/100_no_file-basename.patch/.timestamp'
=== added directory '.pc/100_no_file-basename.patch/tools'
=== added file '.pc/100_no_file-basename.patch/tools/gst-visualise-m.m'
--- .pc/100_no_file-basename.patch/tools/gst-visualise-m.m	1970-01-01 00:00:00 +0000
+++ .pc/100_no_file-basename.patch/tools/gst-visualise-m.m	2010-11-10 07:18:48 +0000
@@ -0,0 +1,79 @@
+#!/usr/bin/perl -w
+
+# launch a gst-launch pipeline to display a visualisation of the 
+# input audio.
+# make use of default input srcs.
+# visualisation plugin is specified on command line.
+
+### packages
+
+use File::Basename;
+
+
+my (%pipes, %cfg);
+
+sub read_config
+{
+  my $config_file = `echo -n ~`."/.gst";
+  if (-e $config_file)
+  {
+    open CONFIG, $config_file;
+    while (<CONFIG>)
+    {
+      chomp;
+      s/#.*//;
+      s/\s+$//;
+      next unless length;
+      my ($var, $value) = split (/\s*=\s*/, $_, 2);
+      $cfg{$var} = $value;
+    }
+    if (!($cfg{AUDIOSRC}))
+    {
+      print "Please add an AUDIOSRC to $config_file !\n";
+    }
+    if (!($cfg{VIDEOSINK}))
+    {
+      print "Please add a VIDEOSINK to $config_file !\n";
+    }
+  }
+  else
+  {
+    print "No configuration file $config_file found.  You might want to create one.\n";
+  }
+  if (!defined $cfg{AUDIOSRC})   { $cfg{AUDIOSRC} = "osssrc"; }
+  if (!defined $cfg{VIDEOSINK})  { $cfg{VIDEOSINK} = "xvimagesink"; }
+  if (!defined $cfg{CVS_PATH})   { $cfg{CVS_PATH} =  `echo -n ~`."/gst/cvs"; }
+}
+
+sub visualise(@)
+{
+    my $vis = $cfg{VISUALIZER};
+    $vis = shift() if ($#_ != -1);
+    $vis = "goom" unless $vis;
+
+    my $pipe;
+    $pipe = $vis unless $pipe = $pipes{$vis};
+
+    $command = "gst-launch-@GST_MAJORMINOR@ $cfg{AUDIOSRC} ! $pipe ! { queue ! ffmpegcolorspace ! $cfg{VIDEOSINK} }";
+    print "Running $command\n";
+    system ("PATH=\$PATH:".$cfg{CVS_PATH}."/gstreamer/tools $command");
+}
+
+### main
+
+read_config ();
+
+%pipes = ( 
+  "goom", "goom",
+  "chart", "audioconvert ! chart",
+  "synaesthesia", "synaesthesia",
+  "monoscope", "audioconvert ! monoscope"
+);
+
+if ($#ARGV > 0) {
+    print STDERR "Usage: gst-visualise [visualiser]\n";
+    exit 1;
+}
+
+visualise(@ARGV);
+

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2010-11-02 08:44:13 +0000
+++ .pc/applied-patches	2010-11-10 07:18:48 +0000
@@ -1,2 +1,3 @@
 10_gnome-vfs-dav-url.patch
 99_ltmain_as-needed.patch
+100_no_file-basename.patch

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-02 08:44:13 +0000
+++ debian/changelog	2010-11-10 07:18:48 +0000
@@ -1,3 +1,12 @@
+gst-plugins-base0.10 (0.10.30.4-1ubuntu1) natty; urgency=low
+
+  * debian/patches/100_no_file-basename.patch: gst-visualize-0.10 imports
+    File::Basename but doesn't use it. Drop that import.
+  * With that, this package no longer uses anything from perl or
+    perl-modules, so drop the Perl dependency to perl-base.
+
+ -- Evan Broder <[e-mail]>  Tue, 09 Nov 2010 20:17:18 -0800
+
 gst-plugins-base0.10 (0.10.30.4-1) experimental; urgency=low
 
   * New upstream pre-release: 

=== modified file 'debian/control.in'
--- debian/control.in	2010-11-02 08:44:13 +0000
+++ debian/control.in	2010-11-10 07:18:48 +0000
@@ -1,7 +1,8 @@
 Source: gst-plugins-base@GST_ABI@
 Section: libs
 Priority: optional
-Maintainer: Maintainers of GStreamer packages <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Maintainers of GStreamer packages <[e-mail]>
 Uploaders: Loic Minier <[e-mail]>,
            Sebastien Bacher <[e-mail]>,
            Sebastian Dröge <[e-mail]>,

=== added file 'debian/patches/100_no_file-basename.patch'
--- debian/patches/100_no_file-basename.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/100_no_file-basename.patch	2010-11-10 07:18:48 +0000
@@ -0,0 +1,13 @@
+Index: gst-plugins-base0.10/tools/gst-visualise-m.m
+===================================================================
+--- gst-plugins-base0.10.orig/tools/gst-visualise-m.m	2010-11-09 20:15:33.565417497 -0800
++++ gst-plugins-base0.10/tools/gst-visualise-m.m	2010-11-09 20:15:38.595099835 -0800
+@@ -7,8 +7,6 @@
+ 
+ ### packages
+ 
+-use File::Basename;
+-
+ 
+ my (%pipes, %cfg);
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-11-02 08:44:13 +0000
+++ debian/patches/series	2010-11-10 07:18:48 +0000
@@ -1,2 +1,3 @@
 10_gnome-vfs-dav-url.patch
 99_ltmain_as-needed.patch
+100_no_file-basename.patch

=== modified file 'debian/rules'
--- debian/rules	2010-11-02 08:44:13 +0000
+++ debian/rules	2010-11-10 07:18:48 +0000
@@ -164,7 +164,7 @@
 	-rm -rf $(CURDIR)/fake-home
 
 binary-post-install/$(gst_pkgname)-plugins-base-apps::
-	dh_perl
+	dh_perl -d
 
 DEB_DH_MAKESHLIBS_ARGS_$(gst_plugins_base_lib) += -X "/usr/lib/gstreamer-$(gst_abi)" -V $(gst_plugins_base_lib_dep) -- -c4
 DEB_INSTALL_DOCS_ALL += debian/README.Debian NEWS

=== modified file 'tools/gst-visualise-m.m'
--- tools/gst-visualise-m.m	2005-12-17 18:56:55 +0000
+++ tools/gst-visualise-m.m	2010-11-10 07:18:48 +0000
@@ -7,8 +7,6 @@
 
 ### packages
 
-use File::Basename;
-
 
 my (%pipes, %cfg);