Merge branch 'schulung'

updates from current linutronix schulung.git

Conflicts:
	Makefile
	configpres.tex
	flash-memory/ubi/handout_ubi_de.tex
	handout.tex
	index.txt
	pres_master.tex
	vorl.tex
	vorl1.tex
	vorl2.tex
	vorl3.tex
	vorl4.tex
	vorl5.tex

Signed-off-by: Manuel Traut <manut@mecka.net>

1 files changed, 0 insertions, 20 deletions

diff --git a/beagle/debian-rfs/usr/share/perl5/Debian/DebConf/Client/ConfModule.pm b/beagle/debian-rfs/usr/share/perl5/Debian/DebConf/Client/ConfModule.pm
deleted file mode 100644
index 1516e40..0000000
--- a/beagle/debian-rfs/usr/share/perl5/Debian/DebConf/Client/ConfModule.pm
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/perl
-# This is a stub module that just uses the new module, and is here for
-# backwards-compatability with pograms that use the old name.
-package Debian::DebConf::Client::ConfModule;
-use Debconf::Client::ConfModule;
-use Debconf::Log qw{debug};
-print STDERR "Debian::DebConf::Client::ConfModule is deprecated, please use Debconf::Client::ConfModule instead.\n";
-
-sub import {
-	splice @_, 0, 1 => Debconf::Client::ConfModule;
-	goto &{Debconf::Client::ConfModule->can('import')};
-}
-
-sub AUTOLOAD {
-	(my $sub = $AUTOLOAD) =~ s/.*:://;
-	*$sub = \&{"Debconf::Client::ConfModule::$sub"};
-	goto &$sub;
-}
-
-1