From 2003425ea1e739d94cc28cad9fc1f923dba35769 Mon Sep 17 00:00:00 2001 From: Thomas Perl Date: Sat, 21 Feb 2015 21:46:19 +0100 Subject: [PATCH] Update submodules, import minidb --- .gitignore | 1 + .gitmodules | 3 +++ dev_symlinks.sh | 1 + gpodder-core | 2 +- gpodder-ui-qml | 2 +- minidb | 1 + rpm/harbour-org.gpodder.sailfish.spec | 1 + 7 files changed, 9 insertions(+), 2 deletions(-) create mode 160000 minidb diff --git a/.gitignore b/.gitignore index 43b50c8..23949e6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ main.py podcastparser.py qml/common __pycache__ +minidb.py diff --git a/.gitmodules b/.gitmodules index f4bc982..9511f4c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "podcastparser"] path = podcastparser url = git://github.com/gpodder/podcastparser.git +[submodule "minidb"] + path = minidb + url = git://github.com/thp/minidb.git diff --git a/dev_symlinks.sh b/dev_symlinks.sh index 93878c0..9040d2a 100644 --- a/dev_symlinks.sh +++ b/dev_symlinks.sh @@ -6,3 +6,4 @@ ln -sf gpodder-core/src/gpodder . ln -sf podcastparser/podcastparser.py . ln -sf gpodder-ui-qml/main.py . ln -sf ../gpodder-ui-qml/common qml +ln -sf minidb/minidb.py . diff --git a/gpodder-core b/gpodder-core index fb89aff..97a4310 160000 --- a/gpodder-core +++ b/gpodder-core @@ -1 +1 @@ -Subproject commit fb89aff9d7162797e521a10abb42ccdd94626f69 +Subproject commit 97a4310a56cbb8e6726733a1c0cec6cc62e420e3 diff --git a/gpodder-ui-qml b/gpodder-ui-qml index 6bbfb17..4dc4895 160000 --- a/gpodder-ui-qml +++ b/gpodder-ui-qml @@ -1 +1 @@ -Subproject commit 6bbfb175f526f0a94e06c75686944758c1790763 +Subproject commit 4dc489597a45effbec51f0cc5cf1274a581c6609 diff --git a/minidb b/minidb new file mode 160000 index 0000000..afdf73e --- /dev/null +++ b/minidb @@ -0,0 +1 @@ +Subproject commit afdf73ee5bc9403942f35478919618ec8f04fdce diff --git a/rpm/harbour-org.gpodder.sailfish.spec b/rpm/harbour-org.gpodder.sailfish.spec index ec515c4..2e8ec4a 100644 --- a/rpm/harbour-org.gpodder.sailfish.spec +++ b/rpm/harbour-org.gpodder.sailfish.spec @@ -29,6 +29,7 @@ TARGET=%{buildroot}/%{_datadir}/%{name} mkdir -p $TARGET cp -rpv gpodder-core/src/* $TARGET/ cp -rpv podcastparser/podcastparser.py $TARGET/ +cp -rpv minidb/minidb.py $TARGET/ cp -rpv gpodder-ui-qml/main.py $TARGET/ cp -rpv qml $TARGET/ cp -rpv gpodder-ui-qml/common $TARGET/qml/