This is an automated email from the git hooks/post-receive script.
hmmr-guest pushed a commit to branch WIP
in repository aghermann.
commit eee66ad0ad828e732fb82f0968768b9acb46b3bb
Author: Andrei Zavada <hmmr@ra>
Date: Sun Jun 14 23:36:15 2015 +0300
move gresource files into data/ui
---
upstream/configure.ac | 1 +
upstream/data/Makefile.am | 27 ++-----------------------
upstream/data/{ => ui}/Makefile.am | 12 ++---------
upstream/data/{ => ui}/aghermann.gresource.xml | 0
upstream/data/{ => ui}/aghermann.png | Bin
upstream/data/{ => ui}/edfhed.glade | 0
upstream/data/{ => ui}/equation-uc.png | Bin
upstream/data/{ => ui}/equations1.png | Bin
upstream/data/{ => ui}/idle-bg.svg | 0
upstream/data/{ => ui}/mf.glade | 0
upstream/data/{ => ui}/mw-dialogs.glade | 0
upstream/data/{ => ui}/mw.glade | 0
upstream/data/{ => ui}/sf-artifacts.glade | 0
upstream/data/{ => ui}/sf-filters.glade | 0
upstream/data/{ => ui}/sf-patterns.glade | 0
upstream/data/{ => ui}/sf-phasediff.glade | 0
upstream/data/{ => ui}/sf-rk1968.glade | 0
upstream/data/{ => ui}/sf.glade | 0
upstream/data/{ => ui}/sm.glade | 0
19 files changed, 5 insertions(+), 35 deletions(-)
diff --git a/upstream/configure.ac b/upstream/configure.ac
index eb8ebfa..6d3027d 100644
--- a/upstream/configure.ac
+++ b/upstream/configure.ac
@@ -206,6 +206,7 @@ AC_OUTPUT([
src/tools/Makefile
data/Makefile
+ data/ui/Makefile
desktop/Makefile
desktop/aghermann.desktop
diff --git a/upstream/data/Makefile.am b/upstream/data/Makefile.am
index 1e8edca..7d12da6 100644
--- a/upstream/data/Makefile.am
+++ b/upstream/data/Makefile.am
@@ -1,8 +1,8 @@
+SUBDIRS = ui
+
uidir := $(datadir)/${PACKAGE}
ui_DATA := \
- aghermann.gresource \
- idle-bg.svg \
experiment-dl.sh
rkdir := $(datadir)/${PACKAGE}/rk1968
@@ -11,28 +11,5 @@ rk_DATA := \
basic_score.lua
EXTRA_DIST := \
- aghermann.png \
- aghermann.gresource.xml \
- sm.glade \
- mw.glade mw-dialogs.glade \
- sf.glade sf-artifacts.glade sf-filters.glade sf-patterns.glade
sf-phasediff.glade sf-rk1968.glade \
- mf.glade \
- edfhed.glade \
- idle-bg.svg equations1.png equation-uc.png \
basic_score.lua \
experiment-dl.sh
-
-CLEANFILES := \
- aghermann.gresource
-
-GRESOURCES := \
- aghermann.png \
- sm.glade \
- mw.glade mw-dialogs.glade \
- sf.glade sf-artifacts.glade sf-filters.glade sf-patterns.glade
sf-phasediff.glade sf-rk1968.glade \
- mf.glade edfhed.glade \
- equations1.png equation-uc.png \
- edfhed.glade
-
-aghermann.gresource: aghermann.gresource.xml $(GRESOURCES)
- $(glib_compile_resources) aghermann.gresource.xml
diff --git a/upstream/data/Makefile.am b/upstream/data/ui/Makefile.am
similarity index 78%
copy from upstream/data/Makefile.am
copy to upstream/data/ui/Makefile.am
index 1e8edca..13cfcb6 100644
--- a/upstream/data/Makefile.am
+++ b/upstream/data/ui/Makefile.am
@@ -2,13 +2,7 @@ uidir := $(datadir)/${PACKAGE}
ui_DATA := \
aghermann.gresource \
- idle-bg.svg \
- experiment-dl.sh
-
-rkdir := $(datadir)/${PACKAGE}/rk1968
-
-rk_DATA := \
- basic_score.lua
+ idle-bg.svg
EXTRA_DIST := \
aghermann.png \
@@ -18,9 +12,7 @@ EXTRA_DIST := \
sf.glade sf-artifacts.glade sf-filters.glade sf-patterns.glade
sf-phasediff.glade sf-rk1968.glade \
mf.glade \
edfhed.glade \
- idle-bg.svg equations1.png equation-uc.png \
- basic_score.lua \
- experiment-dl.sh
+ idle-bg.svg equations1.png equation-uc.png
CLEANFILES := \
aghermann.gresource
diff --git a/upstream/data/aghermann.gresource.xml
b/upstream/data/ui/aghermann.gresource.xml
similarity index 100%
rename from upstream/data/aghermann.gresource.xml
rename to upstream/data/ui/aghermann.gresource.xml
diff --git a/upstream/data/aghermann.png b/upstream/data/ui/aghermann.png
similarity index 100%
rename from upstream/data/aghermann.png
rename to upstream/data/ui/aghermann.png
diff --git a/upstream/data/edfhed.glade b/upstream/data/ui/edfhed.glade
similarity index 100%
rename from upstream/data/edfhed.glade
rename to upstream/data/ui/edfhed.glade
diff --git a/upstream/data/equation-uc.png b/upstream/data/ui/equation-uc.png
similarity index 100%
rename from upstream/data/equation-uc.png
rename to upstream/data/ui/equation-uc.png
diff --git a/upstream/data/equations1.png b/upstream/data/ui/equations1.png
similarity index 100%
rename from upstream/data/equations1.png
rename to upstream/data/ui/equations1.png
diff --git a/upstream/data/idle-bg.svg b/upstream/data/ui/idle-bg.svg
similarity index 100%
rename from upstream/data/idle-bg.svg
rename to upstream/data/ui/idle-bg.svg
diff --git a/upstream/data/mf.glade b/upstream/data/ui/mf.glade
similarity index 100%
rename from upstream/data/mf.glade
rename to upstream/data/ui/mf.glade
diff --git a/upstream/data/mw-dialogs.glade b/upstream/data/ui/mw-dialogs.glade
similarity index 100%
rename from upstream/data/mw-dialogs.glade
rename to upstream/data/ui/mw-dialogs.glade
diff --git a/upstream/data/mw.glade b/upstream/data/ui/mw.glade
similarity index 100%
rename from upstream/data/mw.glade
rename to upstream/data/ui/mw.glade
diff --git a/upstream/data/sf-artifacts.glade
b/upstream/data/ui/sf-artifacts.glade
similarity index 100%
rename from upstream/data/sf-artifacts.glade
rename to upstream/data/ui/sf-artifacts.glade
diff --git a/upstream/data/sf-filters.glade b/upstream/data/ui/sf-filters.glade
similarity index 100%
rename from upstream/data/sf-filters.glade
rename to upstream/data/ui/sf-filters.glade
diff --git a/upstream/data/sf-patterns.glade
b/upstream/data/ui/sf-patterns.glade
similarity index 100%
rename from upstream/data/sf-patterns.glade
rename to upstream/data/ui/sf-patterns.glade
diff --git a/upstream/data/sf-phasediff.glade
b/upstream/data/ui/sf-phasediff.glade
similarity index 100%
rename from upstream/data/sf-phasediff.glade
rename to upstream/data/ui/sf-phasediff.glade
diff --git a/upstream/data/sf-rk1968.glade b/upstream/data/ui/sf-rk1968.glade
similarity index 100%
rename from upstream/data/sf-rk1968.glade
rename to upstream/data/ui/sf-rk1968.glade
diff --git a/upstream/data/sf.glade b/upstream/data/ui/sf.glade
similarity index 100%
rename from upstream/data/sf.glade
rename to upstream/data/ui/sf.glade
diff --git a/upstream/data/sm.glade b/upstream/data/ui/sm.glade
similarity index 100%
rename from upstream/data/sm.glade
rename to upstream/data/ui/sm.glade
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/debian-med/aghermann.git
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
