remove vdr-Upstart-jobs and vdr-loaders, override expect stop in new …

…vdr Upstart Job
yavdr · Mar 28, 2013 · 5779649 · 5779649
1 parent 4da018d
commit 5779649
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 376 deletions.
diff --git a/debian/control b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 7.0.50~)
 
 Package: yavdr-base
 Architecture: all
-Depends: ${misc:Depends}, yavdr-utils (>=0.3.0.2557), xsltproc
+Depends: ${misc:Depends}, yavdr-utils (>=0.3.1.0), xsltproc
 Replaces: yavdr-startup
 Conflicts: yavdr-startup, yavdr-utils (<< 0.3.0.2556)
 Description: scripts for startup, shutdown and s3

diff --git a/etc/init/vdr-exit-2.conf b/etc/init/vdr-exit-2.conf
diff --git a/etc/init/vdr-exit-other.conf b/etc/init/vdr-exit-other.conf
diff --git a/etc/init/vdr.conf b/etc/init/vdr.conf
diff --git a/etc/init/vdr.override b/etc/init/vdr.override
@@ -0,0 +1,3 @@
+# yaVDR is using the Upstart integration of the dbus2vdr plugin
+# therefore we must "expect stop"
+expect stop
diff --git a/usr/lib/vdr/commands-loader b/usr/lib/vdr/commands-loader
diff --git a/usr/lib/vdr/config-loader b/usr/lib/vdr/config-loader
diff --git a/usr/lib/vdr/plugin-loader b/usr/lib/vdr/plugin-loader