diff -Nru python-dbus2vdr-0.0.1/dbus2vdr.py python-dbus2vdr-0.0.2/dbus2vdr.py --- python-dbus2vdr-0.0.1/dbus2vdr.py 2013-11-25 17:23:26.000000000 +0000 +++ python-dbus2vdr-0.0.2/dbus2vdr.py 2015-03-22 17:09:09.000000000 +0000 @@ -250,6 +250,13 @@ """Get info about a recording - use it's number or path as argument""" return self.dbus.Get(recording, dbus_interface = self.interface, signature='v') + + def ChangeName(self, recording, path): + """change name of a recording resp. move it - + expects the recording ID or current path and the new path""" + return self.dbus.ChangeName(recording, path, + dbus_interface = self.interface, + signature='vs') def List(self): """List recordings""" diff -Nru python-dbus2vdr-0.0.1/debian/changelog python-dbus2vdr-0.0.2/debian/changelog --- python-dbus2vdr-0.0.1/debian/changelog 2013-12-11 11:50:53.000000000 +0000 +++ python-dbus2vdr-0.0.2/debian/changelog 2015-06-05 06:59:10.000000000 +0000 @@ -1,3 +1,21 @@ +python-dbus2vdr (0.0.2-0yavdr0~trusty) trusty; urgency=medium + + * new upstream snapshot + + -- Alexander Grothe Fri, 05 Jun 2015 08:58:43 +0200 + +python-dbus2vdr (0.0.1-4yavdr0~trusty) trusty; urgency=medium + + * optimize debian dir + + -- Alexander Grothe Fri, 05 Jun 2015 08:50:23 +0200 + +python-dbus2vdr (0.0.1-3yavdr1) trusty; urgency=medium + + * rebuild for trusty thar + + -- Alexander Grothe Tue, 08 Apr 2014 16:25:53 +0200 + python-dbus2vdr (0.0.1-3yavdr1) trusty; urgency=medium * build for trusty thar diff -Nru python-dbus2vdr-0.0.1/debian/control python-dbus2vdr-0.0.2/debian/control --- python-dbus2vdr-0.0.1/debian/control 2013-11-25 20:42:21.000000000 +0000 +++ python-dbus2vdr-0.0.2/debian/control 2015-06-05 06:58:39.000000000 +0000 @@ -2,10 +2,10 @@ Maintainer: unknown Section: python Priority: optional -Build-Depends: python-all (>= 2.6.6-3), debhelper (>= 7), python3-all +Build-Depends: python-all (>= 2.6.6-3), debhelper (>= 9), python3-all, python3-setuptools, dh-python Standards-Version: 3.9.1 -X-Python-Version: >= 2.6 -X-Python3-Version: >= 3.1 +X-Python-Version: >= 2.7 +X-Python3-Version: >= 3.2 Package: python-dbus2vdr Architecture: all diff -Nru python-dbus2vdr-0.0.1/debian/python3-dbus2vdr.install python-dbus2vdr-0.0.2/debian/python3-dbus2vdr.install --- python-dbus2vdr-0.0.1/debian/python3-dbus2vdr.install 2013-11-25 19:26:45.000000000 +0000 +++ python-dbus2vdr-0.0.2/debian/python3-dbus2vdr.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/python3*/ diff -Nru python-dbus2vdr-0.0.1/debian/python-dbus2vdr.install python-dbus2vdr-0.0.2/debian/python-dbus2vdr.install --- python-dbus2vdr-0.0.1/debian/python-dbus2vdr.install 2013-11-25 19:26:28.000000000 +0000 +++ python-dbus2vdr-0.0.2/debian/python-dbus2vdr.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/python2.*/ diff -Nru python-dbus2vdr-0.0.1/debian/rules python-dbus2vdr-0.0.2/debian/rules --- python-dbus2vdr-0.0.1/debian/rules 2013-11-25 19:23:52.000000000 +0000 +++ python-dbus2vdr-0.0.2/debian/rules 2015-06-05 06:58:39.000000000 +0000 @@ -1,32 +1,10 @@ #!/usr/bin/make -f -# These commands build the list of supported Python 3 versions -# The last version should be just “python3” so that the scripts -# get a correct shebang. -# Use just “PYTHON3 := $(shell py3versions -r)” if your package -# doesn’t contain scripts -PY3REQUESTED := $(shell py3versions -r) -PY3DEFAULT := $(shell py3versions -d) -PYTHON3 := $(filter-out $(PY3DEFAULT),$(PY3REQUESTED)) python3 +#export DH_VERBOSE = 1 + +export PYBUILD_NAME = dbus2vdr %: # Adding the required helpers - dh $@ --with python2,python3 - -override_dh_auto_clean: - dh_auto_clean - rm -rf build/ - -override_dh_auto_build: - # Build for each Python 3 version - set -ex; for python in $(PYTHON3); do \ - $$python setup.py build; \ - done - dh_auto_build + dh $@ --with python2,python3 --buildsystem=pybuild -override_dh_auto_install: - # The same for install; note the --install-layout=deb option - set -ex; for python in $(PYTHON3); do \ - $$python setup.py install --install-layout=deb --root=debian/tmp; \ - done - dh_auto_install diff -Nru python-dbus2vdr-0.0.1/.git/config python-dbus2vdr-0.0.2/.git/config --- python-dbus2vdr-0.0.1/.git/config 2013-11-25 17:10:31.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/config 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[remote "origin"] - fetch = +refs/heads/*:refs/remotes/origin/* - url = https://github.com/seahawk1986/pydbus2vdr.git -[branch "master"] - remote = origin - merge = refs/heads/master diff -Nru python-dbus2vdr-0.0.1/.git/description python-dbus2vdr-0.0.2/.git/description --- python-dbus2vdr-0.0.1/.git/description 2013-11-25 17:10:29.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/description 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff -Nru python-dbus2vdr-0.0.1/.git/HEAD python-dbus2vdr-0.0.2/.git/HEAD --- python-dbus2vdr-0.0.1/.git/HEAD 2013-11-25 17:10:31.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/HEAD 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -ref: refs/heads/master diff -Nru python-dbus2vdr-0.0.1/.git/hooks/applypatch-msg.sample python-dbus2vdr-0.0.2/.git/hooks/applypatch-msg.sample --- python-dbus2vdr-0.0.1/.git/hooks/applypatch-msg.sample 2013-11-25 17:10:29.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/hooks/applypatch-msg.sample 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message taken by -# applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. The hook is -# allowed to edit the commit message file. -# -# To enable this hook, rename this file to "applypatch-msg". - -. git-sh-setup -test -x "$GIT_DIR/hooks/commit-msg" && - exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} -: diff -Nru python-dbus2vdr-0.0.1/.git/hooks/commit-msg.sample python-dbus2vdr-0.0.2/.git/hooks/commit-msg.sample --- python-dbus2vdr-0.0.1/.git/hooks/commit-msg.sample 2013-11-25 17:10:29.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/hooks/commit-msg.sample 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message. -# Called by "git commit" with one argument, the name of the file -# that has the commit message. The hook should exit with non-zero -# status after issuing an appropriate message if it wants to stop the -# commit. The hook is allowed to edit the commit message file. -# -# To enable this hook, rename this file to "commit-msg". - -# Uncomment the below to add a Signed-off-by line to the message. -# Doing this in a hook is a bad idea in general, but the prepare-commit-msg -# hook is more suited to it. -# -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" - -# This example catches duplicate Signed-off-by lines. - -test "" = "$(grep '^Signed-off-by: ' "$1" | - sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { - echo >&2 Duplicate Signed-off-by lines. - exit 1 -} diff -Nru python-dbus2vdr-0.0.1/.git/hooks/post-update.sample python-dbus2vdr-0.0.2/.git/hooks/post-update.sample --- python-dbus2vdr-0.0.1/.git/hooks/post-update.sample 2013-11-25 17:10:29.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/hooks/post-update.sample 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare a packed repository for use over -# dumb transports. -# -# To enable this hook, rename this file to "post-update". - -exec git update-server-info diff -Nru python-dbus2vdr-0.0.1/.git/hooks/pre-applypatch.sample python-dbus2vdr-0.0.2/.git/hooks/pre-applypatch.sample --- python-dbus2vdr-0.0.1/.git/hooks/pre-applypatch.sample 2013-11-25 17:10:29.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/hooks/pre-applypatch.sample 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed -# by applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-applypatch". - -. git-sh-setup -test -x "$GIT_DIR/hooks/pre-commit" && - exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} -: diff -Nru python-dbus2vdr-0.0.1/.git/hooks/pre-commit.sample python-dbus2vdr-0.0.2/.git/hooks/pre-commit.sample --- python-dbus2vdr-0.0.1/.git/hooks/pre-commit.sample 2013-11-25 17:10:29.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/hooks/pre-commit.sample 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git commit" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-commit". - -if git rev-parse --verify HEAD >/dev/null 2>&1 -then - against=HEAD -else - # Initial commit: diff against an empty tree object - against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 -fi - -# If you want to allow non-ascii filenames set this variable to true. -allownonascii=$(git config hooks.allownonascii) - -# Redirect output to stderr. -exec 1>&2 - -# Cross platform projects tend to avoid non-ascii filenames; prevent -# them from being added to the repository. We exploit the fact that the -# printable range starts at the space character and ends with tilde. -if [ "$allownonascii" != "true" ] && - # Note that the use of brackets around a tr range is ok here, (it's - # even required, for portability to Solaris 10's /usr/bin/tr), since - # the square bracket bytes happen to fall in the designated range. - test $(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 -then - echo "Error: Attempt to add a non-ascii file name." - echo - echo "This can cause problems if you want to work" - echo "with people on other platforms." - echo - echo "To be portable it is advisable to rename the file ..." - echo - echo "If you know what you are doing you can disable this" - echo "check using:" - echo - echo " git config hooks.allownonascii true" - echo - exit 1 -fi - -# If there are whitespace errors, print the offending file names and fail. -exec git diff-index --check --cached $against -- diff -Nru python-dbus2vdr-0.0.1/.git/hooks/prepare-commit-msg.sample python-dbus2vdr-0.0.2/.git/hooks/prepare-commit-msg.sample --- python-dbus2vdr-0.0.1/.git/hooks/prepare-commit-msg.sample 2013-11-25 17:10:29.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/hooks/prepare-commit-msg.sample 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare the commit log message. -# Called by "git commit" with the name of the file that has the -# commit message, followed by the description of the commit -# message's source. The hook's purpose is to edit the commit -# message file. If the hook fails with a non-zero status, -# the commit is aborted. -# -# To enable this hook, rename this file to "prepare-commit-msg". - -# This hook includes three examples. The first comments out the -# "Conflicts:" part of a merge commit. -# -# The second includes the output of "git diff --name-status -r" -# into the message, just before the "git status" output. It is -# commented because it doesn't cope with --amend or with squashed -# commits. -# -# The third example adds a Signed-off-by line to the message, that can -# still be edited. This is rarely a good idea. - -case "$2,$3" in - merge,) - /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; - -# ,|template,) -# /usr/bin/perl -i.bak -pe ' -# print "\n" . `git diff --cached --name-status -r` -# if /^#/ && $first++ == 0' "$1" ;; - - *) ;; -esac - -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff -Nru python-dbus2vdr-0.0.1/.git/hooks/pre-rebase.sample python-dbus2vdr-0.0.2/.git/hooks/pre-rebase.sample --- python-dbus2vdr-0.0.1/.git/hooks/pre-rebase.sample 2013-11-25 17:10:29.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/hooks/pre-rebase.sample 1970-01-01 00:00:00.000000000 +0000 @@ -1,169 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006, 2008 Junio C Hamano -# -# The "pre-rebase" hook is run just before "git rebase" starts doing -# its job, and can prevent the command from running by exiting with -# non-zero status. -# -# The hook is called with the following parameters: -# -# $1 -- the upstream the series was forked from. -# $2 -- the branch being rebased (or empty when rebasing the current branch). -# -# This sample shows how to prevent topic branches that are already -# merged to 'next' branch from getting rebased, because allowing it -# would result in rebasing already published history. - -publish=next -basebranch="$1" -if test "$#" = 2 -then - topic="refs/heads/$2" -else - topic=`git symbolic-ref HEAD` || - exit 0 ;# we do not interrupt rebasing detached HEAD -fi - -case "$topic" in -refs/heads/??/*) - ;; -*) - exit 0 ;# we do not interrupt others. - ;; -esac - -# Now we are dealing with a topic branch being rebased -# on top of master. Is it OK to rebase it? - -# Does the topic really exist? -git show-ref -q "$topic" || { - echo >&2 "No such branch $topic" - exit 1 -} - -# Is topic fully merged to master? -not_in_master=`git rev-list --pretty=oneline ^master "$topic"` -if test -z "$not_in_master" -then - echo >&2 "$topic is fully merged to master; better remove it." - exit 1 ;# we could allow it, but there is no point. -fi - -# Is topic ever merged to next? If so you should not be rebasing it. -only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` -only_next_2=`git rev-list ^master ${publish} | sort` -if test "$only_next_1" = "$only_next_2" -then - not_in_topic=`git rev-list "^$topic" master` - if test -z "$not_in_topic" - then - echo >&2 "$topic is already up-to-date with master" - exit 1 ;# we could allow it, but there is no point. - else - exit 0 - fi -else - not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` - /usr/bin/perl -e ' - my $topic = $ARGV[0]; - my $msg = "* $topic has commits already merged to public branch:\n"; - my (%not_in_next) = map { - /^([0-9a-f]+) /; - ($1 => 1); - } split(/\n/, $ARGV[1]); - for my $elem (map { - /^([0-9a-f]+) (.*)$/; - [$1 => $2]; - } split(/\n/, $ARGV[2])) { - if (!exists $not_in_next{$elem->[0]}) { - if ($msg) { - print STDERR $msg; - undef $msg; - } - print STDERR " $elem->[1]\n"; - } - } - ' "$topic" "$not_in_next" "$not_in_master" - exit 1 -fi - -<<\DOC_END - -This sample hook safeguards topic branches that have been -published from being rewound. - -The workflow assumed here is: - - * Once a topic branch forks from "master", "master" is never - merged into it again (either directly or indirectly). - - * Once a topic branch is fully cooked and merged into "master", - it is deleted. If you need to build on top of it to correct - earlier mistakes, a new topic branch is created by forking at - the tip of the "master". This is not strictly necessary, but - it makes it easier to keep your history simple. - - * Whenever you need to test or publish your changes to topic - branches, merge them into "next" branch. - -The script, being an example, hardcodes the publish branch name -to be "next", but it is trivial to make it configurable via -$GIT_DIR/config mechanism. - -With this workflow, you would want to know: - -(1) ... if a topic branch has ever been merged to "next". Young - topic branches can have stupid mistakes you would rather - clean up before publishing, and things that have not been - merged into other branches can be easily rebased without - affecting other people. But once it is published, you would - not want to rewind it. - -(2) ... if a topic branch has been fully merged to "master". - Then you can delete it. More importantly, you should not - build on top of it -- other people may already want to - change things related to the topic as patches against your - "master", so if you need further changes, it is better to - fork the topic (perhaps with the same name) afresh from the - tip of "master". - -Let's look at this example: - - o---o---o---o---o---o---o---o---o---o "next" - / / / / - / a---a---b A / / - / / / / - / / c---c---c---c B / - / / / \ / - / / / b---b C \ / - / / / / \ / - ---o---o---o---o---o---o---o---o---o---o---o "master" - - -A, B and C are topic branches. - - * A has one fix since it was merged up to "next". - - * B has finished. It has been fully merged up to "master" and "next", - and is ready to be deleted. - - * C has not merged to "next" at all. - -We would want to allow C to be rebased, refuse A, and encourage -B to be deleted. - -To compute (1): - - git rev-list ^master ^topic next - git rev-list ^master next - - if these match, topic has not merged in next at all. - -To compute (2): - - git rev-list master..topic - - if this is empty, it is fully merged to "master". - -DOC_END diff -Nru python-dbus2vdr-0.0.1/.git/hooks/update.sample python-dbus2vdr-0.0.2/.git/hooks/update.sample --- python-dbus2vdr-0.0.1/.git/hooks/update.sample 2013-11-25 17:10:29.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/hooks/update.sample 1970-01-01 00:00:00.000000000 +0000 @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to blocks unannotated tags from entering. -# Called by "git receive-pack" with arguments: refname sha1-old sha1-new -# -# To enable this hook, rename this file to "update". -# -# Config -# ------ -# hooks.allowunannotated -# This boolean sets whether unannotated tags will be allowed into the -# repository. By default they won't be. -# hooks.allowdeletetag -# This boolean sets whether deleting tags will be allowed in the -# repository. By default they won't be. -# hooks.allowmodifytag -# This boolean sets whether a tag may be modified after creation. By default -# it won't be. -# hooks.allowdeletebranch -# This boolean sets whether deleting branches will be allowed in the -# repository. By default they won't be. -# hooks.denycreatebranch -# This boolean sets whether remotely creating branches will be denied -# in the repository. By default this is allowed. -# - -# --- Command line -refname="$1" -oldrev="$2" -newrev="$3" - -# --- Safety check -if [ -z "$GIT_DIR" ]; then - echo "Don't run this script from the command line." >&2 - echo " (if you want, you could supply GIT_DIR then run" >&2 - echo " $0 )" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "Usage: $0 " >&2 - exit 1 -fi - -# --- Config -allowunannotated=$(git config --bool hooks.allowunannotated) -allowdeletebranch=$(git config --bool hooks.allowdeletebranch) -denycreatebranch=$(git config --bool hooks.denycreatebranch) -allowdeletetag=$(git config --bool hooks.allowdeletetag) -allowmodifytag=$(git config --bool hooks.allowmodifytag) - -# check for no description -projectdesc=$(sed -e '1q' "$GIT_DIR/description") -case "$projectdesc" in -"Unnamed repository"* | "") - echo "*** Project description file hasn't been set" >&2 - exit 1 - ;; -esac - -# --- Check types -# if $newrev is 0000...0000, it's a commit to delete a ref. -zero="0000000000000000000000000000000000000000" -if [ "$newrev" = "$zero" ]; then - newrev_type=delete -else - newrev_type=$(git cat-file -t $newrev) -fi - -case "$refname","$newrev_type" in - refs/tags/*,commit) - # un-annotated tag - short_refname=${refname##refs/tags/} - if [ "$allowunannotated" != "true" ]; then - echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 - echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 - exit 1 - fi - ;; - refs/tags/*,delete) - # delete tag - if [ "$allowdeletetag" != "true" ]; then - echo "*** Deleting a tag is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/tags/*,tag) - # annotated tag - if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 - then - echo "*** Tag '$refname' already exists." >&2 - echo "*** Modifying a tag is not allowed in this repository." >&2 - exit 1 - fi - ;; - refs/heads/*,commit) - # branch - if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then - echo "*** Creating a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/heads/*,delete) - # delete branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/remotes/*,commit) - # tracking branch - ;; - refs/remotes/*,delete) - # delete tracking branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a tracking branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - *) - # Anything else (is there anything else?) - echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 - exit 1 - ;; -esac - -# --- Finished -exit 0 Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/index and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/index differ diff -Nru python-dbus2vdr-0.0.1/.git/info/exclude python-dbus2vdr-0.0.2/.git/info/exclude --- python-dbus2vdr-0.0.1/.git/info/exclude 2013-11-25 17:10:29.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/info/exclude 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff -Nru python-dbus2vdr-0.0.1/.git/logs/HEAD python-dbus2vdr-0.0.2/.git/logs/HEAD --- python-dbus2vdr-0.0.1/.git/logs/HEAD 2013-11-25 17:10:31.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/logs/HEAD 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 89ae3f387695e951bbd885f81b3b09470ee7bf87 Alexander Grothe 1385399431 +0100 clone: from https://github.com/seahawk1986/pydbus2vdr.git diff -Nru python-dbus2vdr-0.0.1/.git/logs/refs/heads/master python-dbus2vdr-0.0.2/.git/logs/refs/heads/master --- python-dbus2vdr-0.0.1/.git/logs/refs/heads/master 2013-11-25 17:10:31.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/logs/refs/heads/master 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 89ae3f387695e951bbd885f81b3b09470ee7bf87 Alexander Grothe 1385399431 +0100 clone: from https://github.com/seahawk1986/pydbus2vdr.git Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/00/731b16c4034d082f72e5be6bdfae9a695f635e and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/00/731b16c4034d082f72e5be6bdfae9a695f635e differ diff -Nru python-dbus2vdr-0.0.1/.git/objects/06/4c1e30684076523415157bd5247ac9ba6eaac0 python-dbus2vdr-0.0.2/.git/objects/06/4c1e30684076523415157bd5247ac9ba6eaac0 --- python-dbus2vdr-0.0.1/.git/objects/06/4c1e30684076523415157bd5247ac9ba6eaac0 2013-11-25 17:10:31.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/objects/06/4c1e30684076523415157bd5247ac9ba6eaac0 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -xMJ1F]GSxQIWMvOtFp{<|m0:3$+j%{1HTrE*6|C[_B6{LRٗJʼnw\"N3Zd)V :DGFc̭4xX<նh4Z-\tZ5ʰ?<"Ho+\'Ѩ[1Zc~ \ No newline at end of file Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/0b/50cabf8dcfed8e09ddf7ba80184f7dee96736c and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/0b/50cabf8dcfed8e09ddf7ba80184f7dee96736c differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/0c/a34a482be362a9bdd42835499cc3a30e223c3f and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/0c/a34a482be362a9bdd42835499cc3a30e223c3f differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/0d/16fd19f2dd867ce19e6b7a089f8b48cf5661df and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/0d/16fd19f2dd867ce19e6b7a089f8b48cf5661df differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/0e/be350336e961a73dc10b7f1088e45300560726 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/0e/be350336e961a73dc10b7f1088e45300560726 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/0e/fda0aa4e400de514758522e67cc25ffe56ef72 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/0e/fda0aa4e400de514758522e67cc25ffe56ef72 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/24/bf67d279150bc1d2fe7566148aa8eab6b2ddb8 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/24/bf67d279150bc1d2fe7566148aa8eab6b2ddb8 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/24/dfdfd6cbe64dbe029872926429353ba46c9b71 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/24/dfdfd6cbe64dbe029872926429353ba46c9b71 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/2b/f91be60695d784214abe11a53ef0e24cb55ee1 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/2b/f91be60695d784214abe11a53ef0e24cb55ee1 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/30/dd3afb6f2ffc26011a19fc7980faca35e9d633 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/30/dd3afb6f2ffc26011a19fc7980faca35e9d633 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/39/bec71cd4edab5d1106fc470b962e96e8214548 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/39/bec71cd4edab5d1106fc470b962e96e8214548 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/3d/ea517fe2bbb2802f693f233c23f969728dfce5 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/3d/ea517fe2bbb2802f693f233c23f969728dfce5 differ diff -Nru python-dbus2vdr-0.0.1/.git/objects/43/86ea45af5f3eaf73ed480e54817b288edd58d0 python-dbus2vdr-0.0.2/.git/objects/43/86ea45af5f3eaf73ed480e54817b288edd58d0 --- python-dbus2vdr-0.0.1/.git/objects/43/86ea45af5f3eaf73ed480e54817b288edd58d0 2013-11-25 17:10:31.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/objects/43/86ea45af5f3eaf73ed480e54817b288edd58d0 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -xQN a9żk 0@!1F bҌDdQq-ǘ_}MW_Ǭpܔg~PN|]^-e-c':zݠ+RL} \ No newline at end of file Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/59/7ccdb78baeedbb2067ae8a13822427768178dc and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/59/7ccdb78baeedbb2067ae8a13822427768178dc differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/61/6511b16fa5041efedc8b032fd50a98e2996210 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/61/6511b16fa5041efedc8b032fd50a98e2996210 differ diff -Nru python-dbus2vdr-0.0.1/.git/objects/61/b1447dedd0b7b0c69b1a41c73269110c4cb039 python-dbus2vdr-0.0.2/.git/objects/61/b1447dedd0b7b0c69b1a41c73269110c4cb039 --- python-dbus2vdr-0.0.1/.git/objects/61/b1447dedd0b7b0c69b1a41c73269110c4cb039 2013-11-25 17:10:31.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/objects/61/b1447dedd0b7b0c69b1a41c73269110c4cb039 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -x[j0@~k(JI<;B. ۺ^:<~ -a8Eb?1zUZ1Ww)⨔2Yd%$e -*QgEw68 -_^סxYOobR3|wme")gS QR \ No newline at end of file Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/63/de5aa5c31bd4c5687d3c6c59762d4a8d44d100 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/63/de5aa5c31bd4c5687d3c6c59762d4a8d44d100 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/65/1a899b62684d324d452ebc92386419f54f9ddc and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/65/1a899b62684d324d452ebc92386419f54f9ddc differ diff -Nru python-dbus2vdr-0.0.1/.git/objects/6b/17f038658d008e906a62511122e7b4af1b4f9e python-dbus2vdr-0.0.2/.git/objects/6b/17f038658d008e906a62511122e7b4af1b4f9e --- python-dbus2vdr-0.0.1/.git/objects/6b/17f038658d008e906a62511122e7b4af1b4f9e 2013-11-25 17:10:31.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/objects/6b/17f038658d008e906a62511122e7b4af1b4f9e 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -x -0E]+$}@DAp}[jT?Al冱A]DĴa''X[@0 -Pj22 HNW6x R Zc -[J3f~yHXǙ\>]9?+iA ،Ͳe& -z+̾M \ No newline at end of file Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/6c/7c50df7ec1242087775b1b1ad4941c0fc68ec8 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/6c/7c50df7ec1242087775b1b1ad4941c0fc68ec8 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/70/dbbc9b0a66897832cfa951e21f0ba01a2a0d40 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/70/dbbc9b0a66897832cfa951e21f0ba01a2a0d40 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/77/16a70049439a491e922308525798ce12162776 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/77/16a70049439a491e922308525798ce12162776 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/7a/51b941aed1f30d583b28b385b28de6a258921a and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/7a/51b941aed1f30d583b28b385b28de6a258921a differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/7f/653a4b5b6ef207a1cfe670163227c1e2299c4c and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/7f/653a4b5b6ef207a1cfe670163227c1e2299c4c differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/83/f4ac67b95f2e18ce231aa1acb4043eb3b09cff and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/83/f4ac67b95f2e18ce231aa1acb4043eb3b09cff differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/85/e599daf96c442aecf89f53482e2fa714d6dfc8 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/85/e599daf96c442aecf89f53482e2fa714d6dfc8 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/89/ae3f387695e951bbd885f81b3b09470ee7bf87 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/89/ae3f387695e951bbd885f81b3b09470ee7bf87 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/8e/0d0a4c6972c686c5e7bfcaf0c357622b11f29b and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/8e/0d0a4c6972c686c5e7bfcaf0c357622b11f29b differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/8f/02e45598e277aa3d8a66def6638c76c9b63d88 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/8f/02e45598e277aa3d8a66def6638c76c9b63d88 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/8f/2110f1c07b9333a05a6c024eb7e8c493df98cc and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/8f/2110f1c07b9333a05a6c024eb7e8c493df98cc differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/a6/ab6da30a1529969d16655a4f3b42cd70ec4045 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/a6/ab6da30a1529969d16655a4f3b42cd70ec4045 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/a6/fe5978d3a2dee8f79deeb4a105c504ba6a54cd and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/a6/fe5978d3a2dee8f79deeb4a105c504ba6a54cd differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/a8/040ba019d795aa0cf90f8211531d25d29176bb and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/a8/040ba019d795aa0cf90f8211531d25d29176bb differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/a9/7b099de6e1b91704c2dc9a83edffee446003ce and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/a9/7b099de6e1b91704c2dc9a83edffee446003ce differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/b0/5e9c91275a1db02eb81a9234ca164ead446c7c and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/b0/5e9c91275a1db02eb81a9234ca164ead446c7c differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/b5/e41d190ab2fd4885da15d82f98aede312b1f56 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/b5/e41d190ab2fd4885da15d82f98aede312b1f56 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/c0/24401ea40fb83a790fa3bbf5ab7f08a1fdad4d and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/c0/24401ea40fb83a790fa3bbf5ab7f08a1fdad4d differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/c2/020228db307736d1893b9761b590aa421dbafb and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/c2/020228db307736d1893b9761b590aa421dbafb differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/c3/56e023841c870ea11b155a9bd1ee67580d5fe4 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/c3/56e023841c870ea11b155a9bd1ee67580d5fe4 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/c4/4402ee0559c795677466f6ac900b2416a051d0 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/c4/4402ee0559c795677466f6ac900b2416a051d0 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/c7/19f2981fd595599c1f66f92dd97364af4ef61e and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/c7/19f2981fd595599c1f66f92dd97364af4ef61e differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/d4/e60ffa7a95b7ac9558e75802bd36daa6c94b38 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/d4/e60ffa7a95b7ac9558e75802bd36daa6c94b38 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/d7/4969053ff30939a7f95acf71256636c3dbeabd and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/d7/4969053ff30939a7f95acf71256636c3dbeabd differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/df/ff37fad84119e835a554b4ada9256f363dfc82 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/df/ff37fad84119e835a554b4ada9256f363dfc82 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/e1/3c97b6f6e606eeb0200a7f11b93bc11e499b84 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/e1/3c97b6f6e606eeb0200a7f11b93bc11e499b84 differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/e2/17c6550469705ec47fa1a344e319ab0369740c and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/e2/17c6550469705ec47fa1a344e319ab0369740c differ Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/ee/9665ee0a65669eac1dd5ce81b16fe8878714de and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/ee/9665ee0a65669eac1dd5ce81b16fe8878714de differ diff -Nru python-dbus2vdr-0.0.1/.git/objects/ef/b84ef779e824de59f9fda4a956b1635d52881b python-dbus2vdr-0.0.2/.git/objects/ef/b84ef779e824de59f9fda4a956b1635d52881b --- python-dbus2vdr-0.0.1/.git/objects/ef/b84ef779e824de59f9fda4a956b1635d52881b 2013-11-25 17:10:31.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/objects/ef/b84ef779e824de59f9fda4a956b1635d52881b 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -xMj0F)f(YPBʦ^a<٢5=BW}V_zzi[A +3R1t*zu:qtf(vv$m&"%mt(|>h:_ -a} \ No newline at end of file Binary files /tmp/IkiNacjab8/python-dbus2vdr-0.0.1/.git/objects/f7/cbd8236487c4a29604e965634bb6d31efabfb3 and /tmp/vhq5gqnWFW/python-dbus2vdr-0.0.2/.git/objects/f7/cbd8236487c4a29604e965634bb6d31efabfb3 differ diff -Nru python-dbus2vdr-0.0.1/.git/packed-refs python-dbus2vdr-0.0.2/.git/packed-refs --- python-dbus2vdr-0.0.1/.git/packed-refs 2013-11-25 17:10:31.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/packed-refs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# pack-refs with: peeled -89ae3f387695e951bbd885f81b3b09470ee7bf87 refs/remotes/origin/master diff -Nru python-dbus2vdr-0.0.1/.git/refs/heads/master python-dbus2vdr-0.0.2/.git/refs/heads/master --- python-dbus2vdr-0.0.1/.git/refs/heads/master 2013-11-25 17:10:31.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/refs/heads/master 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -89ae3f387695e951bbd885f81b3b09470ee7bf87 diff -Nru python-dbus2vdr-0.0.1/.git/refs/remotes/origin/HEAD python-dbus2vdr-0.0.2/.git/refs/remotes/origin/HEAD --- python-dbus2vdr-0.0.1/.git/refs/remotes/origin/HEAD 2013-11-25 17:10:31.000000000 +0000 +++ python-dbus2vdr-0.0.2/.git/refs/remotes/origin/HEAD 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff -Nru python-dbus2vdr-0.0.1/on_vdr.py python-dbus2vdr-0.0.2/on_vdr.py --- python-dbus2vdr-0.0.1/on_vdr.py 2013-11-25 17:13:30.000000000 +0000 +++ python-dbus2vdr-0.0.2/on_vdr.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -#!/usr/bin/python3 -from gi.repository import GObject -import dbus -from dbus.mainloop.glib import DBusGMainLoop -dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) -import logging -import argparse -import os -import signal -import subprocess -import sys -from dbus2vdr import DBus2VDR - -class Config: - def __init__(self): - argparser = argparse.ArgumentParser( - description='wait for initialized sound card(s)') - argparser.add_argument('-c', '--command', metavar='COMMAND', - dest='command', default=None, - help='command to run if vdr is running and ready') - self.args = vars(argparser.parse_args()) - -class Main: - def __init__(self): - self.config = Config() - self.bus = dbus.SystemBus() - # track vdr status changes - self.dbus2vdr = DBus2VDR(dbus.SystemBus(), instance=0, watchdog=True) - #self.vdrStatusSignal() - # bind function to Signal "Ready" - self.dbus2vdr.onSignal("Ready", self.onStart) - # bind function to Signal "Stop" - self.dbus2vdr.onSignal("Stop", self.onStop) - self.vdrStatus = 0 - self.proc = None - self.cmd = self.config.args['command'] - self.environ = os.environ - signal.signal(signal.SIGTERM, self.sigint) - signal.signal(signal.SIGINT, self.sigint) - if self.dbus2vdr.checkVDRstatus(): - logging.info("vdr is already ready") - self.onStart() - - def sigint(self, signal, *args, **kwargs): - logging.info("got %s" % signal) - self.onStop() - self.loop.quit() - sys.exit() - - def onStart(self, *args, **kwargs): - logging.info("VDR Ready") - self.vdrStatus == 1 - self.proc = subprocess.Popen("exec " + self.cmd, shell=True, env=self.environ) - #self.startup() - - def onStop(self, *args, **kwargs): - logging.info("VDR stopped") - try: - self.proc.kill() - except Exception as e: - logging.error("could not stop %s" % self.cmd) - logging.error(e) - self.proc.wait() - self.vdrStatus == 0 - -if __name__ == '__main__': - DBusGMainLoop(set_as_default=True) - #options = Options() - global main - main = Main() #options.get_options()) - #signal.signal(signal.SIGTERM, sigint) - #signal.signal(signal.SIGINT, sigint) - loop = GObject.MainLoop() - loop.run() -