[med-svn] [aghermann] 22/23: separate upstream from distro-specific packaging files

andrei zavada hmmr-guest at alioth.debian.org
Sat Aug 17 18:05:45 UTC 2013


This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to branch master
in repository aghermann.

commit 9afb3c7eac5cd51b61228c6f67490c12ade05c36
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sat Aug 17 19:24:59 2013 +0300

    separate upstream from distro-specific packaging files
---
 .gitignore                                         |   41 --------------------
 Makefile.am                                        |   27 -------------
 debian/changelog                                   |    2 +-
 debian/unwanted-files                              |    1 -
 src/.gitignore                                     |    1 -
 unwanted-files                                     |   21 ----------
 .gitignore => upstream/.gitignore                  |    3 +-
 AUTHORS => upstream/AUTHORS                        |    0
 COPYING => upstream/COPYING                        |    0
 ChangeLog => upstream/ChangeLog                    |    2 +-
 INSTALL => upstream/INSTALL                        |    0
 upstream/Makefile.am                               |   16 ++++++++
 NEWS => upstream/NEWS                              |    0
 README => upstream/README                          |    0
 autogen.sh => upstream/autogen.sh                  |    0
 configure.ac => upstream/configure.ac              |    2 +-
 {data => upstream/data}/.gitignore                 |    0
 {data => upstream/data}/Makefile.am                |    0
 {data => upstream/data}/aghermann.desktop.in       |    0
 {data => upstream/data}/aghermann.gresource.xml    |    0
 {data => upstream/data}/aghermann.png              |  Bin 2592 -> 2592 bytes
 {data => upstream/data}/edfhed-gtk.desktop.in      |    0
 {data => upstream/data}/edfhed.glade               |    0
 {data => upstream/data}/equation-uc.png            |  Bin 4467 -> 4467 bytes
 {data => upstream/data}/equations1.png             |  Bin 20489 -> 20489 bytes
 {data => upstream/data}/experiment-dl.sh           |    0
 {data => upstream/data}/icon.svg                   |    0
 {data => upstream/data}/idle-bg.svg                |    0
 {data => upstream/data}/mf.glade                   |    0
 {data => upstream/data}/mw-dialogs.glade           |    0
 {data => upstream/data}/mw.glade                   |    0
 {data => upstream/data}/sf-artifacts-simple.glade  |    0
 {data => upstream/data}/sf-artifacts.glade         |    0
 {data => upstream/data}/sf-filters.glade           |    0
 {data => upstream/data}/sf-patterns.glade          |    0
 {data => upstream/data}/sf-phasediff.glade         |    0
 {data => upstream/data}/sf.glade                   |    0
 {data => upstream/data}/sm.glade                   |    0
 {doc => upstream/doc}/Makefile.am                  |    0
 {doc => upstream/doc}/org/.gitignore               |    0
 {doc => upstream/doc}/org/Makefile.am              |    0
 {doc => upstream/doc}/org/aghermann.org.in         |    0
 {doc => upstream/doc}/org/img/annotations-t.png    |  Bin 7839 -> 7839 bytes
 {doc => upstream/doc}/org/img/annotations.png      |  Bin 19066 -> 19066 bytes
 {doc => upstream/doc}/org/img/edfhed-gtk-t.png     |  Bin 20996 -> 20996 bytes
 {doc => upstream/doc}/org/img/edfhed-gtk.png       |  Bin 56713 -> 56713 bytes
 {doc => upstream/doc}/org/img/equation-uc.png      |  Bin 2478 -> 2478 bytes
 {doc => upstream/doc}/org/img/ica-t.png            |  Bin 47609 -> 47609 bytes
 {doc => upstream/doc}/org/img/ica.png              |  Bin 273800 -> 273800 bytes
 {doc => upstream/doc}/org/img/measurements-t.png   |  Bin 56122 -> 56122 bytes
 {doc => upstream/doc}/org/img/measurements.png     |  Bin 221323 -> 221323 bytes
 {doc => upstream/doc}/org/img/mf-t.png             |  Bin 25473 -> 25473 bytes
 {doc => upstream/doc}/org/img/mf.png               |  Bin 119082 -> 119082 bytes
 .../org/img/overview-single-episode-with-uc-t.png  |  Bin 13947 -> 13947 bytes
 .../org/img/overview-single-episode-with-uc.png    |  Bin 18706 -> 18706 bytes
 {doc => upstream/doc}/org/img/sf-t.png             |  Bin 67024 -> 67024 bytes
 {doc => upstream/doc}/org/img/sf.png               |  Bin 408622 -> 408622 bytes
 {doc => upstream/doc}/org/mc.org                   |    0
 {doc => upstream/doc}/org/model.org                |    0
 {doc => upstream/doc}/org/swu.org                  |    0
 {doc => upstream/doc}/org/usage.org                |    0
 {man => upstream/man}/.gitignore                   |    0
 {man => upstream/man}/agh-profile-gen.1.in         |    0
 {man => upstream/man}/aghermann.1.in               |    0
 {man => upstream/man}/edfcat.1.in                  |    0
 {man => upstream/man}/edfhed-gtk.1.in              |    0
 {man => upstream/man}/edfhed.1.in                  |    0
 {src => upstream/src}/Makefile.am                  |    0
 {src => upstream/src}/aghermann/.gitignore         |    0
 {src => upstream/src}/aghermann/Makefile.am        |    0
 .../src}/aghermann/expdesign/Makefile.am           |    0
 .../src}/aghermann/expdesign/expdesign.cc          |    0
 .../src}/aghermann/expdesign/forward-decls.hh      |    0
 .../src}/aghermann/expdesign/loadsave.cc           |    0
 .../src}/aghermann/expdesign/primaries.hh          |    0
 .../src}/aghermann/expdesign/profile.hh            |    0
 .../src}/aghermann/expdesign/recording.cc          |    0
 .../src}/aghermann/expdesign/recording.hh          |    0
 .../src}/aghermann/expdesign/subject.cc            |    0
 .../src}/aghermann/expdesign/tree-scanner.cc       |    0
 {src => upstream/src}/aghermann/globals.cc         |    0
 {src => upstream/src}/aghermann/globals.hh         |    0
 {src => upstream/src}/aghermann/ica/Makefile.am    |    0
 {src => upstream/src}/aghermann/ica/ica.hh         |    0
 {src => upstream/src}/aghermann/main.cc            |    0
 {src => upstream/src}/aghermann/model/Makefile.am  |    0
 .../src}/aghermann/model/achermann-siman.cc        |    0
 .../src}/aghermann/model/achermann-tunable.cc      |    0
 .../src}/aghermann/model/achermann-tunable.hh      |    0
 {src => upstream/src}/aghermann/model/achermann.cc |    0
 {src => upstream/src}/aghermann/model/achermann.hh |    0
 {src => upstream/src}/aghermann/model/beersma.hh   |    0
 {src => upstream/src}/aghermann/model/borbely.cc   |    0
 .../src}/aghermann/model/forward-decls.hh          |    0
 .../src}/aghermann/model/ultradian-cycle.cc        |    0
 .../src}/aghermann/patterns/Makefile.am            |    0
 .../src}/aghermann/patterns/patterns.cc            |    0
 .../src}/aghermann/patterns/patterns.hh            |    0
 .../src}/aghermann/patterns/patterns.ii            |    0
 {src => upstream/src}/aghermann/print_version.cc   |    0
 {src => upstream/src}/aghermann/rk1968/Makefile.am |    0
 {src => upstream/src}/aghermann/rk1968/rk1968.cc   |    0
 {src => upstream/src}/aghermann/rk1968/rk1968.hh   |    0
 {src => upstream/src}/aghermann/ui/Makefile.am     |    0
 .../src}/aghermann/ui/forward-decls.hh             |    0
 {src => upstream/src}/aghermann/ui/globals.cc      |    0
 {src => upstream/src}/aghermann/ui/globals.hh      |    0
 {src => upstream/src}/aghermann/ui/mf/Makefile.am  |    0
 .../src}/aghermann/ui/mf/mf-construct.cc           |    0
 {src => upstream/src}/aghermann/ui/mf/mf.cc        |    0
 {src => upstream/src}/aghermann/ui/mf/mf.hh        |    0
 {src => upstream/src}/aghermann/ui/mf/mf_cb.cc     |    0
 {src => upstream/src}/aghermann/ui/mf/mf_cb.hh     |    0
 {src => upstream/src}/aghermann/ui/misc.cc         |    0
 {src => upstream/src}/aghermann/ui/misc.hh         |    0
 {src => upstream/src}/aghermann/ui/mw/Makefile.am  |    0
 {src => upstream/src}/aghermann/ui/mw/admit-one.cc |    0
 .../src}/aghermann/ui/mw/admit-one_cb.cc           |    0
 {src => upstream/src}/aghermann/ui/mw/construct.cc |    0
 {src => upstream/src}/aghermann/ui/mw/loadsave.cc  |    0
 .../src}/aghermann/ui/mw/mainmenu_cb.cc            |    0
 .../src}/aghermann/ui/mw/measurements.cc           |    0
 .../src}/aghermann/ui/mw/measurements_cb.cc        |    0
 {src => upstream/src}/aghermann/ui/mw/mw.cc        |    0
 {src => upstream/src}/aghermann/ui/mw/mw.hh        |    0
 {src => upstream/src}/aghermann/ui/mw/mw_cb.cc     |    0
 {src => upstream/src}/aghermann/ui/mw/mw_cb.hh     |    0
 {src => upstream/src}/aghermann/ui/mw/populate.cc  |    0
 .../src}/aghermann/ui/mw/settings_cb.cc            |    0
 .../src}/aghermann/ui/mw/simulations.cc            |    0
 .../src}/aghermann/ui/mw/simulations_cb.cc         |    0
 {src => upstream/src}/aghermann/ui/mw/splash.cc    |    0
 {src => upstream/src}/aghermann/ui/mw/widgets.hh   |    0
 {src => upstream/src}/aghermann/ui/sf/Makefile.am  |    0
 {src => upstream/src}/aghermann/ui/sf/channel.cc   |    0
 {src => upstream/src}/aghermann/ui/sf/construct.cc |    0
 .../src}/aghermann/ui/sf/controls_cb.cc            |    0
 .../src}/aghermann/ui/sf/d/artifacts-construct.cc  |    0
 .../ui/sf/d/artifacts-simple-construct.cc          |    0
 .../src}/aghermann/ui/sf/d/artifacts-simple.cc     |    0
 .../src}/aghermann/ui/sf/d/artifacts-simple.hh     |    0
 .../src}/aghermann/ui/sf/d/artifacts.cc            |    0
 .../src}/aghermann/ui/sf/d/artifacts.hh            |    0
 .../src}/aghermann/ui/sf/d/artifacts_cb.cc         |    0
 .../src}/aghermann/ui/sf/d/filters-construct.cc    |    0
 {src => upstream/src}/aghermann/ui/sf/d/filters.cc |    0
 {src => upstream/src}/aghermann/ui/sf/d/filters.hh |    0
 .../src}/aghermann/ui/sf/d/filters_cb.cc           |    0
 .../src}/aghermann/ui/sf/d/patterns-construct.cc   |    0
 .../src}/aghermann/ui/sf/d/patterns-draw.cc        |    0
 .../src}/aghermann/ui/sf/d/patterns-profiles.cc    |    0
 .../src}/aghermann/ui/sf/d/patterns-profiles_cb.cc |    0
 .../src}/aghermann/ui/sf/d/patterns.cc             |    0
 .../src}/aghermann/ui/sf/d/patterns.hh             |    0
 .../src}/aghermann/ui/sf/d/patterns_cb.cc          |    0
 .../src}/aghermann/ui/sf/d/phasediff-construct.cc  |    0
 .../src}/aghermann/ui/sf/d/phasediff.cc            |    0
 .../src}/aghermann/ui/sf/d/phasediff.hh            |    0
 .../src}/aghermann/ui/sf/d/phasediff_cb.cc         |    0
 .../src/aghermann/ui/sf/d/rk1968.hh                |   29 +++++++-------
 {src => upstream/src}/aghermann/ui/sf/hypnogram.cc |    0
 .../src}/aghermann/ui/sf/hypnogram_cb.cc           |    0
 {src => upstream/src}/aghermann/ui/sf/ica.cc       |    0
 {src => upstream/src}/aghermann/ui/sf/ica_cb.cc    |    0
 .../src}/aghermann/ui/sf/mainmenu_cb.cc            |    0
 .../src}/aghermann/ui/sf/montage-overlays.cc       |    0
 {src => upstream/src}/aghermann/ui/sf/montage.cc   |    0
 .../src}/aghermann/ui/sf/montage_cb.cc             |    0
 {src => upstream/src}/aghermann/ui/sf/sf.cc        |    0
 {src => upstream/src}/aghermann/ui/sf/sf.hh        |    0
 {src => upstream/src}/aghermann/ui/sf/sf_cb.cc     |    0
 {src => upstream/src}/aghermann/ui/sf/sf_cb.hh     |    0
 {src => upstream/src}/aghermann/ui/sf/widgets.hh   |    0
 {src => upstream/src}/aghermann/ui/sm/Makefile.am  |    0
 .../src}/aghermann/ui/sm/sm-construct.cc           |    0
 {src => upstream/src}/aghermann/ui/sm/sm.cc        |    0
 {src => upstream/src}/aghermann/ui/sm/sm.hh        |    0
 {src => upstream/src}/aghermann/ui/sm/sm_cb.cc     |    0
 {src => upstream/src}/aghermann/ui/sm/sm_cb.hh     |    0
 {src => upstream/src}/aghermann/ui/ui++.cc         |    0
 {src => upstream/src}/aghermann/ui/ui++.hh         |    0
 {src => upstream/src}/aghermann/ui/ui.cc           |    0
 {src => upstream/src}/aghermann/ui/ui.hh           |    0
 {src => upstream/src}/common/Makefile.am           |    0
 {src => upstream/src}/common/alg.hh                |    0
 {src => upstream/src}/common/config-validate.hh    |    0
 {src => upstream/src}/common/containers.hh         |    0
 {src => upstream/src}/common/fs.hh                 |    0
 {src => upstream/src}/common/lang.hh               |    0
 {src => upstream/src}/common/libcommon.cc          |    0
 {src => upstream/src}/common/string.hh             |    0
 {src => upstream/src}/common/subject_id.cc         |    0
 {src => upstream/src}/common/subject_id.hh         |    0
 {src => upstream/src}/libmetrics/Makefile.am       |    0
 {src => upstream/src}/libmetrics/all.hh            |    0
 {src => upstream/src}/libmetrics/bands.hh          |    0
 {src => upstream/src}/libmetrics/forward-decls.hh  |    0
 {src => upstream/src}/libmetrics/mc-artifacts.cc   |    0
 {src => upstream/src}/libmetrics/mc-artifacts.hh   |    0
 {src => upstream/src}/libmetrics/mc-artifacts.ii   |    0
 {src => upstream/src}/libmetrics/mc.cc             |    0
 {src => upstream/src}/libmetrics/mc.hh             |    0
 .../src}/libmetrics/page-metrics-base.cc           |    0
 .../src}/libmetrics/page-metrics-base.hh           |    0
 {src => upstream/src}/libmetrics/psd.cc            |    0
 {src => upstream/src}/libmetrics/psd.hh            |    0
 {src => upstream/src}/libmetrics/swu.cc            |    0
 {src => upstream/src}/libmetrics/swu.hh            |    0
 {src => upstream/src}/libsigfile/Makefile.am       |    0
 {src => upstream/src}/libsigfile/all.hh            |    0
 {src => upstream/src}/libsigfile/channel.cc        |    0
 {src => upstream/src}/libsigfile/channel.hh        |    0
 {src => upstream/src}/libsigfile/edf-file.xml      |    0
 {src => upstream/src}/libsigfile/edf-io.cc         |    0
 {src => upstream/src}/libsigfile/edf.cc            |    0
 {src => upstream/src}/libsigfile/edf.hh            |    0
 {src => upstream/src}/libsigfile/forward-decls.hh  |    0
 {src => upstream/src}/libsigfile/page.cc           |    0
 {src => upstream/src}/libsigfile/page.hh           |    0
 {src => upstream/src}/libsigfile/source-base.cc    |    0
 {src => upstream/src}/libsigfile/source-base.hh    |    0
 {src => upstream/src}/libsigfile/tsv.cc            |    0
 {src => upstream/src}/libsigfile/tsv.hh            |    0
 {src => upstream/src}/libsigfile/typed-source.cc   |    0
 {src => upstream/src}/libsigfile/typed-source.hh   |    0
 {src => upstream/src}/libsigproc/Makefile.am       |    0
 {src => upstream/src}/libsigproc/exstrom.cc        |    0
 .../src}/libsigproc/exstrom.com/README             |    0
 .../src}/libsigproc/exstrom.com/bwbs.c             |    0
 .../src}/libsigproc/exstrom.com/liir.c             |    0
 {src => upstream/src}/libsigproc/exstrom.com/rdf.c |    0
 {src => upstream/src}/libsigproc/exstrom.hh        |    0
 {src => upstream/src}/libsigproc/ext-filters.cc    |    0
 {src => upstream/src}/libsigproc/ext-filters.hh    |    0
 {src => upstream/src}/libsigproc/ext-filters.ii    |    0
 {src => upstream/src}/libsigproc/sigproc.cc        |    0
 {src => upstream/src}/libsigproc/sigproc.hh        |    0
 {src => upstream/src}/libsigproc/sigproc.ii        |    0
 {src => upstream/src}/libsigproc/winfun.cc         |    0
 {src => upstream/src}/libsigproc/winfun.hh         |    0
 {src => upstream/src}/tools/.gitignore             |    0
 {src => upstream/src}/tools/Makefile.am            |    0
 {src => upstream/src}/tools/agh-profile-gen.cc     |    0
 {src => upstream/src}/tools/edfcat.cc              |    0
 {src => upstream/src}/tools/edfhed-gtk.cc          |    0
 {src => upstream/src}/tools/edfhed.cc              |    0
 {src => upstream/src}/tools/plot-vaf               |    0
 247 files changed, 33 insertions(+), 112 deletions(-)

diff --git a/.gitignore b/.gitignore
index e74e9b5..4d1b596 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,43 +1,2 @@
-# emacs
-TAGS
 .backups/
 *~
-cscope.*
-
-# generated files
-*.gch
-*.a
-*.o
-*.la
-*.lo
-*.pc
-/*.tar.bz2
-
-# autotools
-.deps/
-.libs/
-Makefile
-Makefile.in
-aclocal*
-autom4te*
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-m4
-missing
-stamp-h1
-
-# rest
-doc/html
-doxygen
-Doxyfile
-.DirIcon
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index f8b1b57..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4
-
-SUBDIRS = src data doc
-
-EXTRA_DIST = \
-	ChangeLog \
-	autogen.sh \
-	debian/changelog \
-	debian/compat \
-	debian/control \
-	debian/copyright \
-	debian/rules \
-	debian/aghermann.sharedmimeinfo \
-	debian/aghermann.manpages \
-	debian/README.Debian \
-	debian/source/format \
-	debian/watch \
-	gentoo/aghermann.ebuild
-
-man_MANS = \
-	man/aghermann.1 \
-	man/edfcat.1 \
-	man/edfhed.1 \
-	man/edfhed-gtk.1
-
-ebuild:
-	cp gentoo/aghermann.ebuild aghermann-$(VERSION).ebuild
diff --git a/debian/changelog b/debian/changelog
index 0d185d4..0657773 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ aghermann (0.9.2-1) unstable; urgency=low
 
   * New upstream version.
 
- -- Andrei Zavada <johnhommer at gmail.com>  Xxx, xx xxx 2013 01:12:36 +0200
+ -- Andrei Zavada <johnhommer at gmail.com>  Sat, 17 Aug 2013 01:12:36 +0200
 
 aghermann (0.9.1.1-1) unstable; urgency=low
 
diff --git a/debian/unwanted-files b/debian/unwanted-files
index 4da4205..456841a 100644
--- a/debian/unwanted-files
+++ b/debian/unwanted-files
@@ -15,5 +15,4 @@ data/Makefile.in
 doc/Makefile.in
 doc/org/Makefile.in
 
-gentoo/*
 doc/org/img/*.png
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 0638d75..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.dirstamp
diff --git a/unwanted-files b/unwanted-files
deleted file mode 100644
index 2147bca..0000000
--- a/unwanted-files
+++ /dev/null
@@ -1,21 +0,0 @@
-m4/*
-aclocal.m4
-config.sub
-ltmain.sh
-depcomp
-install-sh
-autogen.sh
-configure
-config.guess
-
-Makefile.in
-src/Makefile.in
-src/*/Makefile.in
-src/aghermann/*/Makefile.in
-src/aghermann/ui/*/Makefile.in
-data/Makefile.in
-doc/Makefile.in
-doc/org/Makefile.in
-
-gentoo/*
-doc/org/img/*.png
diff --git a/.gitignore b/upstream/.gitignore
similarity index 96%
copy from .gitignore
copy to upstream/.gitignore
index e74e9b5..7b0fdbf 100644
--- a/.gitignore
+++ b/upstream/.gitignore
@@ -1,7 +1,5 @@
 # emacs
 TAGS
-.backups/
-*~
 cscope.*
 
 # generated files
@@ -15,6 +13,7 @@ cscope.*
 
 # autotools
 .deps/
+.dirstamp
 .libs/
 Makefile
 Makefile.in
diff --git a/AUTHORS b/upstream/AUTHORS
similarity index 100%
rename from AUTHORS
rename to upstream/AUTHORS
diff --git a/COPYING b/upstream/COPYING
similarity index 100%
rename from COPYING
rename to upstream/COPYING
diff --git a/ChangeLog b/upstream/ChangeLog
similarity index 99%
rename from ChangeLog
rename to upstream/ChangeLog
index 6c44823..db22760 100644
--- a/ChangeLog
+++ b/upstream/ChangeLog
@@ -1,5 +1,5 @@
 v.0.9.2 (2013-xx-xx)
-	* .
+	* Separate upstream tree from various distribution-related files.
 
 v.0.9.1.1 (2013-07-24)
 	* Fix 32-bit builds where sizeof(size_t) != sizeof(unsigned long).
diff --git a/INSTALL b/upstream/INSTALL
similarity index 100%
rename from INSTALL
rename to upstream/INSTALL
diff --git a/upstream/Makefile.am b/upstream/Makefile.am
new file mode 100644
index 0000000..75c631e
--- /dev/null
+++ b/upstream/Makefile.am
@@ -0,0 +1,16 @@
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = src data doc
+
+EXTRA_DIST = \
+	ChangeLog \
+	autogen.sh
+
+man_MANS = \
+	man/aghermann.1 \
+	man/edfcat.1 \
+	man/edfhed.1 \
+	man/edfhed-gtk.1
+
+ebuild:
+	cp gentoo/aghermann.ebuild aghermann-$(VERSION).ebuild
diff --git a/NEWS b/upstream/NEWS
similarity index 100%
rename from NEWS
rename to upstream/NEWS
diff --git a/README b/upstream/README
similarity index 100%
rename from README
rename to upstream/README
diff --git a/autogen.sh b/upstream/autogen.sh
similarity index 100%
rename from autogen.sh
rename to upstream/autogen.sh
diff --git a/configure.ac b/upstream/configure.ac
similarity index 99%
rename from configure.ac
rename to upstream/configure.ac
index d9e23c1..67e5332 100644
--- a/configure.ac
+++ b/upstream/configure.ac
@@ -1,6 +1,6 @@
 AC_COPYRIGHT([Copyright (c) 2008-13 Andrei Zavada <johnhommer at gmail.com>])
 
-AC_INIT([Aghermann], [0.9.2_rc], [johnhommer at gmail.com])
+AC_INIT([Aghermann], [0.9.2], [johnhommer at gmail.com])
 AC_CONFIG_SRCDIR([src/aghermann/main.cc])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PREREQ(2.61)
diff --git a/data/.gitignore b/upstream/data/.gitignore
similarity index 100%
rename from data/.gitignore
rename to upstream/data/.gitignore
diff --git a/data/Makefile.am b/upstream/data/Makefile.am
similarity index 100%
rename from data/Makefile.am
rename to upstream/data/Makefile.am
diff --git a/data/aghermann.desktop.in b/upstream/data/aghermann.desktop.in
similarity index 100%
rename from data/aghermann.desktop.in
rename to upstream/data/aghermann.desktop.in
diff --git a/data/aghermann.gresource.xml b/upstream/data/aghermann.gresource.xml
similarity index 100%
rename from data/aghermann.gresource.xml
rename to upstream/data/aghermann.gresource.xml
diff --git a/data/aghermann.png b/upstream/data/aghermann.png
similarity index 100%
rename from data/aghermann.png
rename to upstream/data/aghermann.png
diff --git a/data/edfhed-gtk.desktop.in b/upstream/data/edfhed-gtk.desktop.in
similarity index 100%
rename from data/edfhed-gtk.desktop.in
rename to upstream/data/edfhed-gtk.desktop.in
diff --git a/data/edfhed.glade b/upstream/data/edfhed.glade
similarity index 100%
rename from data/edfhed.glade
rename to upstream/data/edfhed.glade
diff --git a/data/equation-uc.png b/upstream/data/equation-uc.png
similarity index 100%
rename from data/equation-uc.png
rename to upstream/data/equation-uc.png
diff --git a/data/equations1.png b/upstream/data/equations1.png
similarity index 100%
rename from data/equations1.png
rename to upstream/data/equations1.png
diff --git a/data/experiment-dl.sh b/upstream/data/experiment-dl.sh
similarity index 100%
rename from data/experiment-dl.sh
rename to upstream/data/experiment-dl.sh
diff --git a/data/icon.svg b/upstream/data/icon.svg
similarity index 100%
rename from data/icon.svg
rename to upstream/data/icon.svg
diff --git a/data/idle-bg.svg b/upstream/data/idle-bg.svg
similarity index 100%
rename from data/idle-bg.svg
rename to upstream/data/idle-bg.svg
diff --git a/data/mf.glade b/upstream/data/mf.glade
similarity index 100%
rename from data/mf.glade
rename to upstream/data/mf.glade
diff --git a/data/mw-dialogs.glade b/upstream/data/mw-dialogs.glade
similarity index 100%
rename from data/mw-dialogs.glade
rename to upstream/data/mw-dialogs.glade
diff --git a/data/mw.glade b/upstream/data/mw.glade
similarity index 100%
rename from data/mw.glade
rename to upstream/data/mw.glade
diff --git a/data/sf-artifacts-simple.glade b/upstream/data/sf-artifacts-simple.glade
similarity index 100%
rename from data/sf-artifacts-simple.glade
rename to upstream/data/sf-artifacts-simple.glade
diff --git a/data/sf-artifacts.glade b/upstream/data/sf-artifacts.glade
similarity index 100%
rename from data/sf-artifacts.glade
rename to upstream/data/sf-artifacts.glade
diff --git a/data/sf-filters.glade b/upstream/data/sf-filters.glade
similarity index 100%
rename from data/sf-filters.glade
rename to upstream/data/sf-filters.glade
diff --git a/data/sf-patterns.glade b/upstream/data/sf-patterns.glade
similarity index 100%
rename from data/sf-patterns.glade
rename to upstream/data/sf-patterns.glade
diff --git a/data/sf-phasediff.glade b/upstream/data/sf-phasediff.glade
similarity index 100%
rename from data/sf-phasediff.glade
rename to upstream/data/sf-phasediff.glade
diff --git a/data/sf.glade b/upstream/data/sf.glade
similarity index 100%
rename from data/sf.glade
rename to upstream/data/sf.glade
diff --git a/data/sm.glade b/upstream/data/sm.glade
similarity index 100%
rename from data/sm.glade
rename to upstream/data/sm.glade
diff --git a/doc/Makefile.am b/upstream/doc/Makefile.am
similarity index 100%
rename from doc/Makefile.am
rename to upstream/doc/Makefile.am
diff --git a/doc/org/.gitignore b/upstream/doc/org/.gitignore
similarity index 100%
rename from doc/org/.gitignore
rename to upstream/doc/org/.gitignore
diff --git a/doc/org/Makefile.am b/upstream/doc/org/Makefile.am
similarity index 100%
rename from doc/org/Makefile.am
rename to upstream/doc/org/Makefile.am
diff --git a/doc/org/aghermann.org.in b/upstream/doc/org/aghermann.org.in
similarity index 100%
rename from doc/org/aghermann.org.in
rename to upstream/doc/org/aghermann.org.in
diff --git a/doc/org/img/annotations-t.png b/upstream/doc/org/img/annotations-t.png
similarity index 100%
rename from doc/org/img/annotations-t.png
rename to upstream/doc/org/img/annotations-t.png
diff --git a/doc/org/img/annotations.png b/upstream/doc/org/img/annotations.png
similarity index 100%
rename from doc/org/img/annotations.png
rename to upstream/doc/org/img/annotations.png
diff --git a/doc/org/img/edfhed-gtk-t.png b/upstream/doc/org/img/edfhed-gtk-t.png
similarity index 100%
rename from doc/org/img/edfhed-gtk-t.png
rename to upstream/doc/org/img/edfhed-gtk-t.png
diff --git a/doc/org/img/edfhed-gtk.png b/upstream/doc/org/img/edfhed-gtk.png
similarity index 100%
rename from doc/org/img/edfhed-gtk.png
rename to upstream/doc/org/img/edfhed-gtk.png
diff --git a/doc/org/img/equation-uc.png b/upstream/doc/org/img/equation-uc.png
similarity index 100%
rename from doc/org/img/equation-uc.png
rename to upstream/doc/org/img/equation-uc.png
diff --git a/doc/org/img/ica-t.png b/upstream/doc/org/img/ica-t.png
similarity index 100%
rename from doc/org/img/ica-t.png
rename to upstream/doc/org/img/ica-t.png
diff --git a/doc/org/img/ica.png b/upstream/doc/org/img/ica.png
similarity index 100%
rename from doc/org/img/ica.png
rename to upstream/doc/org/img/ica.png
diff --git a/doc/org/img/measurements-t.png b/upstream/doc/org/img/measurements-t.png
similarity index 100%
rename from doc/org/img/measurements-t.png
rename to upstream/doc/org/img/measurements-t.png
diff --git a/doc/org/img/measurements.png b/upstream/doc/org/img/measurements.png
similarity index 100%
rename from doc/org/img/measurements.png
rename to upstream/doc/org/img/measurements.png
diff --git a/doc/org/img/mf-t.png b/upstream/doc/org/img/mf-t.png
similarity index 100%
rename from doc/org/img/mf-t.png
rename to upstream/doc/org/img/mf-t.png
diff --git a/doc/org/img/mf.png b/upstream/doc/org/img/mf.png
similarity index 100%
rename from doc/org/img/mf.png
rename to upstream/doc/org/img/mf.png
diff --git a/doc/org/img/overview-single-episode-with-uc-t.png b/upstream/doc/org/img/overview-single-episode-with-uc-t.png
similarity index 100%
rename from doc/org/img/overview-single-episode-with-uc-t.png
rename to upstream/doc/org/img/overview-single-episode-with-uc-t.png
diff --git a/doc/org/img/overview-single-episode-with-uc.png b/upstream/doc/org/img/overview-single-episode-with-uc.png
similarity index 100%
rename from doc/org/img/overview-single-episode-with-uc.png
rename to upstream/doc/org/img/overview-single-episode-with-uc.png
diff --git a/doc/org/img/sf-t.png b/upstream/doc/org/img/sf-t.png
similarity index 100%
rename from doc/org/img/sf-t.png
rename to upstream/doc/org/img/sf-t.png
diff --git a/doc/org/img/sf.png b/upstream/doc/org/img/sf.png
similarity index 100%
rename from doc/org/img/sf.png
rename to upstream/doc/org/img/sf.png
diff --git a/doc/org/mc.org b/upstream/doc/org/mc.org
similarity index 100%
rename from doc/org/mc.org
rename to upstream/doc/org/mc.org
diff --git a/doc/org/model.org b/upstream/doc/org/model.org
similarity index 100%
rename from doc/org/model.org
rename to upstream/doc/org/model.org
diff --git a/doc/org/swu.org b/upstream/doc/org/swu.org
similarity index 100%
rename from doc/org/swu.org
rename to upstream/doc/org/swu.org
diff --git a/doc/org/usage.org b/upstream/doc/org/usage.org
similarity index 100%
rename from doc/org/usage.org
rename to upstream/doc/org/usage.org
diff --git a/man/.gitignore b/upstream/man/.gitignore
similarity index 100%
rename from man/.gitignore
rename to upstream/man/.gitignore
diff --git a/man/agh-profile-gen.1.in b/upstream/man/agh-profile-gen.1.in
similarity index 100%
rename from man/agh-profile-gen.1.in
rename to upstream/man/agh-profile-gen.1.in
diff --git a/man/aghermann.1.in b/upstream/man/aghermann.1.in
similarity index 100%
rename from man/aghermann.1.in
rename to upstream/man/aghermann.1.in
diff --git a/man/edfcat.1.in b/upstream/man/edfcat.1.in
similarity index 100%
rename from man/edfcat.1.in
rename to upstream/man/edfcat.1.in
diff --git a/man/edfhed-gtk.1.in b/upstream/man/edfhed-gtk.1.in
similarity index 100%
rename from man/edfhed-gtk.1.in
rename to upstream/man/edfhed-gtk.1.in
diff --git a/man/edfhed.1.in b/upstream/man/edfhed.1.in
similarity index 100%
rename from man/edfhed.1.in
rename to upstream/man/edfhed.1.in
diff --git a/src/Makefile.am b/upstream/src/Makefile.am
similarity index 100%
rename from src/Makefile.am
rename to upstream/src/Makefile.am
diff --git a/src/aghermann/.gitignore b/upstream/src/aghermann/.gitignore
similarity index 100%
rename from src/aghermann/.gitignore
rename to upstream/src/aghermann/.gitignore
diff --git a/src/aghermann/Makefile.am b/upstream/src/aghermann/Makefile.am
similarity index 100%
rename from src/aghermann/Makefile.am
rename to upstream/src/aghermann/Makefile.am
diff --git a/src/aghermann/expdesign/Makefile.am b/upstream/src/aghermann/expdesign/Makefile.am
similarity index 100%
rename from src/aghermann/expdesign/Makefile.am
rename to upstream/src/aghermann/expdesign/Makefile.am
diff --git a/src/aghermann/expdesign/expdesign.cc b/upstream/src/aghermann/expdesign/expdesign.cc
similarity index 100%
rename from src/aghermann/expdesign/expdesign.cc
rename to upstream/src/aghermann/expdesign/expdesign.cc
diff --git a/src/aghermann/expdesign/forward-decls.hh b/upstream/src/aghermann/expdesign/forward-decls.hh
similarity index 100%
rename from src/aghermann/expdesign/forward-decls.hh
rename to upstream/src/aghermann/expdesign/forward-decls.hh
diff --git a/src/aghermann/expdesign/loadsave.cc b/upstream/src/aghermann/expdesign/loadsave.cc
similarity index 100%
rename from src/aghermann/expdesign/loadsave.cc
rename to upstream/src/aghermann/expdesign/loadsave.cc
diff --git a/src/aghermann/expdesign/primaries.hh b/upstream/src/aghermann/expdesign/primaries.hh
similarity index 100%
rename from src/aghermann/expdesign/primaries.hh
rename to upstream/src/aghermann/expdesign/primaries.hh
diff --git a/src/aghermann/expdesign/profile.hh b/upstream/src/aghermann/expdesign/profile.hh
similarity index 100%
rename from src/aghermann/expdesign/profile.hh
rename to upstream/src/aghermann/expdesign/profile.hh
diff --git a/src/aghermann/expdesign/recording.cc b/upstream/src/aghermann/expdesign/recording.cc
similarity index 100%
rename from src/aghermann/expdesign/recording.cc
rename to upstream/src/aghermann/expdesign/recording.cc
diff --git a/src/aghermann/expdesign/recording.hh b/upstream/src/aghermann/expdesign/recording.hh
similarity index 100%
rename from src/aghermann/expdesign/recording.hh
rename to upstream/src/aghermann/expdesign/recording.hh
diff --git a/src/aghermann/expdesign/subject.cc b/upstream/src/aghermann/expdesign/subject.cc
similarity index 100%
rename from src/aghermann/expdesign/subject.cc
rename to upstream/src/aghermann/expdesign/subject.cc
diff --git a/src/aghermann/expdesign/tree-scanner.cc b/upstream/src/aghermann/expdesign/tree-scanner.cc
similarity index 100%
rename from src/aghermann/expdesign/tree-scanner.cc
rename to upstream/src/aghermann/expdesign/tree-scanner.cc
diff --git a/src/aghermann/globals.cc b/upstream/src/aghermann/globals.cc
similarity index 100%
rename from src/aghermann/globals.cc
rename to upstream/src/aghermann/globals.cc
diff --git a/src/aghermann/globals.hh b/upstream/src/aghermann/globals.hh
similarity index 100%
rename from src/aghermann/globals.hh
rename to upstream/src/aghermann/globals.hh
diff --git a/src/aghermann/ica/Makefile.am b/upstream/src/aghermann/ica/Makefile.am
similarity index 100%
rename from src/aghermann/ica/Makefile.am
rename to upstream/src/aghermann/ica/Makefile.am
diff --git a/src/aghermann/ica/ica.hh b/upstream/src/aghermann/ica/ica.hh
similarity index 100%
rename from src/aghermann/ica/ica.hh
rename to upstream/src/aghermann/ica/ica.hh
diff --git a/src/aghermann/main.cc b/upstream/src/aghermann/main.cc
similarity index 100%
rename from src/aghermann/main.cc
rename to upstream/src/aghermann/main.cc
diff --git a/src/aghermann/model/Makefile.am b/upstream/src/aghermann/model/Makefile.am
similarity index 100%
rename from src/aghermann/model/Makefile.am
rename to upstream/src/aghermann/model/Makefile.am
diff --git a/src/aghermann/model/achermann-siman.cc b/upstream/src/aghermann/model/achermann-siman.cc
similarity index 100%
rename from src/aghermann/model/achermann-siman.cc
rename to upstream/src/aghermann/model/achermann-siman.cc
diff --git a/src/aghermann/model/achermann-tunable.cc b/upstream/src/aghermann/model/achermann-tunable.cc
similarity index 100%
rename from src/aghermann/model/achermann-tunable.cc
rename to upstream/src/aghermann/model/achermann-tunable.cc
diff --git a/src/aghermann/model/achermann-tunable.hh b/upstream/src/aghermann/model/achermann-tunable.hh
similarity index 100%
rename from src/aghermann/model/achermann-tunable.hh
rename to upstream/src/aghermann/model/achermann-tunable.hh
diff --git a/src/aghermann/model/achermann.cc b/upstream/src/aghermann/model/achermann.cc
similarity index 100%
rename from src/aghermann/model/achermann.cc
rename to upstream/src/aghermann/model/achermann.cc
diff --git a/src/aghermann/model/achermann.hh b/upstream/src/aghermann/model/achermann.hh
similarity index 100%
rename from src/aghermann/model/achermann.hh
rename to upstream/src/aghermann/model/achermann.hh
diff --git a/src/aghermann/model/beersma.hh b/upstream/src/aghermann/model/beersma.hh
similarity index 100%
rename from src/aghermann/model/beersma.hh
rename to upstream/src/aghermann/model/beersma.hh
diff --git a/src/aghermann/model/borbely.cc b/upstream/src/aghermann/model/borbely.cc
similarity index 100%
rename from src/aghermann/model/borbely.cc
rename to upstream/src/aghermann/model/borbely.cc
diff --git a/src/aghermann/model/forward-decls.hh b/upstream/src/aghermann/model/forward-decls.hh
similarity index 100%
rename from src/aghermann/model/forward-decls.hh
rename to upstream/src/aghermann/model/forward-decls.hh
diff --git a/src/aghermann/model/ultradian-cycle.cc b/upstream/src/aghermann/model/ultradian-cycle.cc
similarity index 100%
rename from src/aghermann/model/ultradian-cycle.cc
rename to upstream/src/aghermann/model/ultradian-cycle.cc
diff --git a/src/aghermann/patterns/Makefile.am b/upstream/src/aghermann/patterns/Makefile.am
similarity index 100%
rename from src/aghermann/patterns/Makefile.am
rename to upstream/src/aghermann/patterns/Makefile.am
diff --git a/src/aghermann/patterns/patterns.cc b/upstream/src/aghermann/patterns/patterns.cc
similarity index 100%
rename from src/aghermann/patterns/patterns.cc
rename to upstream/src/aghermann/patterns/patterns.cc
diff --git a/src/aghermann/patterns/patterns.hh b/upstream/src/aghermann/patterns/patterns.hh
similarity index 100%
rename from src/aghermann/patterns/patterns.hh
rename to upstream/src/aghermann/patterns/patterns.hh
diff --git a/src/aghermann/patterns/patterns.ii b/upstream/src/aghermann/patterns/patterns.ii
similarity index 100%
rename from src/aghermann/patterns/patterns.ii
rename to upstream/src/aghermann/patterns/patterns.ii
diff --git a/src/aghermann/print_version.cc b/upstream/src/aghermann/print_version.cc
similarity index 100%
rename from src/aghermann/print_version.cc
rename to upstream/src/aghermann/print_version.cc
diff --git a/src/aghermann/rk1968/Makefile.am b/upstream/src/aghermann/rk1968/Makefile.am
similarity index 100%
rename from src/aghermann/rk1968/Makefile.am
rename to upstream/src/aghermann/rk1968/Makefile.am
diff --git a/src/aghermann/rk1968/rk1968.cc b/upstream/src/aghermann/rk1968/rk1968.cc
similarity index 100%
rename from src/aghermann/rk1968/rk1968.cc
rename to upstream/src/aghermann/rk1968/rk1968.cc
diff --git a/src/aghermann/rk1968/rk1968.hh b/upstream/src/aghermann/rk1968/rk1968.hh
similarity index 100%
rename from src/aghermann/rk1968/rk1968.hh
rename to upstream/src/aghermann/rk1968/rk1968.hh
diff --git a/src/aghermann/ui/Makefile.am b/upstream/src/aghermann/ui/Makefile.am
similarity index 100%
rename from src/aghermann/ui/Makefile.am
rename to upstream/src/aghermann/ui/Makefile.am
diff --git a/src/aghermann/ui/forward-decls.hh b/upstream/src/aghermann/ui/forward-decls.hh
similarity index 100%
rename from src/aghermann/ui/forward-decls.hh
rename to upstream/src/aghermann/ui/forward-decls.hh
diff --git a/src/aghermann/ui/globals.cc b/upstream/src/aghermann/ui/globals.cc
similarity index 100%
rename from src/aghermann/ui/globals.cc
rename to upstream/src/aghermann/ui/globals.cc
diff --git a/src/aghermann/ui/globals.hh b/upstream/src/aghermann/ui/globals.hh
similarity index 100%
rename from src/aghermann/ui/globals.hh
rename to upstream/src/aghermann/ui/globals.hh
diff --git a/src/aghermann/ui/mf/Makefile.am b/upstream/src/aghermann/ui/mf/Makefile.am
similarity index 100%
rename from src/aghermann/ui/mf/Makefile.am
rename to upstream/src/aghermann/ui/mf/Makefile.am
diff --git a/src/aghermann/ui/mf/mf-construct.cc b/upstream/src/aghermann/ui/mf/mf-construct.cc
similarity index 100%
rename from src/aghermann/ui/mf/mf-construct.cc
rename to upstream/src/aghermann/ui/mf/mf-construct.cc
diff --git a/src/aghermann/ui/mf/mf.cc b/upstream/src/aghermann/ui/mf/mf.cc
similarity index 100%
rename from src/aghermann/ui/mf/mf.cc
rename to upstream/src/aghermann/ui/mf/mf.cc
diff --git a/src/aghermann/ui/mf/mf.hh b/upstream/src/aghermann/ui/mf/mf.hh
similarity index 100%
rename from src/aghermann/ui/mf/mf.hh
rename to upstream/src/aghermann/ui/mf/mf.hh
diff --git a/src/aghermann/ui/mf/mf_cb.cc b/upstream/src/aghermann/ui/mf/mf_cb.cc
similarity index 100%
rename from src/aghermann/ui/mf/mf_cb.cc
rename to upstream/src/aghermann/ui/mf/mf_cb.cc
diff --git a/src/aghermann/ui/mf/mf_cb.hh b/upstream/src/aghermann/ui/mf/mf_cb.hh
similarity index 100%
rename from src/aghermann/ui/mf/mf_cb.hh
rename to upstream/src/aghermann/ui/mf/mf_cb.hh
diff --git a/src/aghermann/ui/misc.cc b/upstream/src/aghermann/ui/misc.cc
similarity index 100%
rename from src/aghermann/ui/misc.cc
rename to upstream/src/aghermann/ui/misc.cc
diff --git a/src/aghermann/ui/misc.hh b/upstream/src/aghermann/ui/misc.hh
similarity index 100%
rename from src/aghermann/ui/misc.hh
rename to upstream/src/aghermann/ui/misc.hh
diff --git a/src/aghermann/ui/mw/Makefile.am b/upstream/src/aghermann/ui/mw/Makefile.am
similarity index 100%
rename from src/aghermann/ui/mw/Makefile.am
rename to upstream/src/aghermann/ui/mw/Makefile.am
diff --git a/src/aghermann/ui/mw/admit-one.cc b/upstream/src/aghermann/ui/mw/admit-one.cc
similarity index 100%
rename from src/aghermann/ui/mw/admit-one.cc
rename to upstream/src/aghermann/ui/mw/admit-one.cc
diff --git a/src/aghermann/ui/mw/admit-one_cb.cc b/upstream/src/aghermann/ui/mw/admit-one_cb.cc
similarity index 100%
rename from src/aghermann/ui/mw/admit-one_cb.cc
rename to upstream/src/aghermann/ui/mw/admit-one_cb.cc
diff --git a/src/aghermann/ui/mw/construct.cc b/upstream/src/aghermann/ui/mw/construct.cc
similarity index 100%
rename from src/aghermann/ui/mw/construct.cc
rename to upstream/src/aghermann/ui/mw/construct.cc
diff --git a/src/aghermann/ui/mw/loadsave.cc b/upstream/src/aghermann/ui/mw/loadsave.cc
similarity index 100%
rename from src/aghermann/ui/mw/loadsave.cc
rename to upstream/src/aghermann/ui/mw/loadsave.cc
diff --git a/src/aghermann/ui/mw/mainmenu_cb.cc b/upstream/src/aghermann/ui/mw/mainmenu_cb.cc
similarity index 100%
rename from src/aghermann/ui/mw/mainmenu_cb.cc
rename to upstream/src/aghermann/ui/mw/mainmenu_cb.cc
diff --git a/src/aghermann/ui/mw/measurements.cc b/upstream/src/aghermann/ui/mw/measurements.cc
similarity index 100%
rename from src/aghermann/ui/mw/measurements.cc
rename to upstream/src/aghermann/ui/mw/measurements.cc
diff --git a/src/aghermann/ui/mw/measurements_cb.cc b/upstream/src/aghermann/ui/mw/measurements_cb.cc
similarity index 100%
rename from src/aghermann/ui/mw/measurements_cb.cc
rename to upstream/src/aghermann/ui/mw/measurements_cb.cc
diff --git a/src/aghermann/ui/mw/mw.cc b/upstream/src/aghermann/ui/mw/mw.cc
similarity index 100%
rename from src/aghermann/ui/mw/mw.cc
rename to upstream/src/aghermann/ui/mw/mw.cc
diff --git a/src/aghermann/ui/mw/mw.hh b/upstream/src/aghermann/ui/mw/mw.hh
similarity index 100%
rename from src/aghermann/ui/mw/mw.hh
rename to upstream/src/aghermann/ui/mw/mw.hh
diff --git a/src/aghermann/ui/mw/mw_cb.cc b/upstream/src/aghermann/ui/mw/mw_cb.cc
similarity index 100%
rename from src/aghermann/ui/mw/mw_cb.cc
rename to upstream/src/aghermann/ui/mw/mw_cb.cc
diff --git a/src/aghermann/ui/mw/mw_cb.hh b/upstream/src/aghermann/ui/mw/mw_cb.hh
similarity index 100%
rename from src/aghermann/ui/mw/mw_cb.hh
rename to upstream/src/aghermann/ui/mw/mw_cb.hh
diff --git a/src/aghermann/ui/mw/populate.cc b/upstream/src/aghermann/ui/mw/populate.cc
similarity index 100%
rename from src/aghermann/ui/mw/populate.cc
rename to upstream/src/aghermann/ui/mw/populate.cc
diff --git a/src/aghermann/ui/mw/settings_cb.cc b/upstream/src/aghermann/ui/mw/settings_cb.cc
similarity index 100%
rename from src/aghermann/ui/mw/settings_cb.cc
rename to upstream/src/aghermann/ui/mw/settings_cb.cc
diff --git a/src/aghermann/ui/mw/simulations.cc b/upstream/src/aghermann/ui/mw/simulations.cc
similarity index 100%
rename from src/aghermann/ui/mw/simulations.cc
rename to upstream/src/aghermann/ui/mw/simulations.cc
diff --git a/src/aghermann/ui/mw/simulations_cb.cc b/upstream/src/aghermann/ui/mw/simulations_cb.cc
similarity index 100%
rename from src/aghermann/ui/mw/simulations_cb.cc
rename to upstream/src/aghermann/ui/mw/simulations_cb.cc
diff --git a/src/aghermann/ui/mw/splash.cc b/upstream/src/aghermann/ui/mw/splash.cc
similarity index 100%
rename from src/aghermann/ui/mw/splash.cc
rename to upstream/src/aghermann/ui/mw/splash.cc
diff --git a/src/aghermann/ui/mw/widgets.hh b/upstream/src/aghermann/ui/mw/widgets.hh
similarity index 100%
rename from src/aghermann/ui/mw/widgets.hh
rename to upstream/src/aghermann/ui/mw/widgets.hh
diff --git a/src/aghermann/ui/sf/Makefile.am b/upstream/src/aghermann/ui/sf/Makefile.am
similarity index 100%
rename from src/aghermann/ui/sf/Makefile.am
rename to upstream/src/aghermann/ui/sf/Makefile.am
diff --git a/src/aghermann/ui/sf/channel.cc b/upstream/src/aghermann/ui/sf/channel.cc
similarity index 100%
rename from src/aghermann/ui/sf/channel.cc
rename to upstream/src/aghermann/ui/sf/channel.cc
diff --git a/src/aghermann/ui/sf/construct.cc b/upstream/src/aghermann/ui/sf/construct.cc
similarity index 100%
rename from src/aghermann/ui/sf/construct.cc
rename to upstream/src/aghermann/ui/sf/construct.cc
diff --git a/src/aghermann/ui/sf/controls_cb.cc b/upstream/src/aghermann/ui/sf/controls_cb.cc
similarity index 100%
rename from src/aghermann/ui/sf/controls_cb.cc
rename to upstream/src/aghermann/ui/sf/controls_cb.cc
diff --git a/src/aghermann/ui/sf/d/artifacts-construct.cc b/upstream/src/aghermann/ui/sf/d/artifacts-construct.cc
similarity index 100%
rename from src/aghermann/ui/sf/d/artifacts-construct.cc
rename to upstream/src/aghermann/ui/sf/d/artifacts-construct.cc
diff --git a/src/aghermann/ui/sf/d/artifacts-simple-construct.cc b/upstream/src/aghermann/ui/sf/d/artifacts-simple-construct.cc
similarity index 100%
rename from src/aghermann/ui/sf/d/artifacts-simple-construct.cc
rename to upstream/src/aghermann/ui/sf/d/artifacts-simple-construct.cc
diff --git a/src/aghermann/ui/sf/d/artifacts-simple.cc b/upstream/src/aghermann/ui/sf/d/artifacts-simple.cc
similarity index 100%
rename from src/aghermann/ui/sf/d/artifacts-simple.cc
rename to upstream/src/aghermann/ui/sf/d/artifacts-simple.cc
diff --git a/src/aghermann/ui/sf/d/artifacts-simple.hh b/upstream/src/aghermann/ui/sf/d/artifacts-simple.hh
similarity index 100%
rename from src/aghermann/ui/sf/d/artifacts-simple.hh
rename to upstream/src/aghermann/ui/sf/d/artifacts-simple.hh
diff --git a/src/aghermann/ui/sf/d/artifacts.cc b/upstream/src/aghermann/ui/sf/d/artifacts.cc
similarity index 100%
rename from src/aghermann/ui/sf/d/artifacts.cc
rename to upstream/src/aghermann/ui/sf/d/artifacts.cc
diff --git a/src/aghermann/ui/sf/d/artifacts.hh b/upstream/src/aghermann/ui/sf/d/artifacts.hh
similarity index 100%
rename from src/aghermann/ui/sf/d/artifacts.hh
rename to upstream/src/aghermann/ui/sf/d/artifacts.hh
diff --git a/src/aghermann/ui/sf/d/artifacts_cb.cc b/upstream/src/aghermann/ui/sf/d/artifacts_cb.cc
similarity index 100%
rename from src/aghermann/ui/sf/d/artifacts_cb.cc
rename to upstream/src/aghermann/ui/sf/d/artifacts_cb.cc
diff --git a/src/aghermann/ui/sf/d/filters-construct.cc b/upstream/src/aghermann/ui/sf/d/filters-construct.cc
similarity index 100%
rename from src/aghermann/ui/sf/d/filters-construct.cc
rename to upstream/src/aghermann/ui/sf/d/filters-construct.cc
diff --git a/src/aghermann/ui/sf/d/filters.cc b/upstream/src/aghermann/ui/sf/d/filters.cc
similarity index 100%
rename from src/aghermann/ui/sf/d/filters.cc
rename to upstream/src/aghermann/ui/sf/d/filters.cc
diff --git a/src/aghermann/ui/sf/d/filters.hh b/upstream/src/aghermann/ui/sf/d/filters.hh
similarity index 100%
rename from src/aghermann/ui/sf/d/filters.hh
rename to upstream/src/aghermann/ui/sf/d/filters.hh
diff --git a/src/aghermann/ui/sf/d/filters_cb.cc b/upstream/src/aghermann/ui/sf/d/filters_cb.cc
similarity index 100%
rename from src/aghermann/ui/sf/d/filters_cb.cc
rename to upstream/src/aghermann/ui/sf/d/filters_cb.cc
diff --git a/src/aghermann/ui/sf/d/patterns-construct.cc b/upstream/src/aghermann/ui/sf/d/patterns-construct.cc
similarity index 100%
rename from src/aghermann/ui/sf/d/patterns-construct.cc
rename to upstream/src/aghermann/ui/sf/d/patterns-construct.cc
diff --git a/src/aghermann/ui/sf/d/patterns-draw.cc b/upstream/src/aghermann/ui/sf/d/patterns-draw.cc
similarity index 100%
rename from src/aghermann/ui/sf/d/patterns-draw.cc
rename to upstream/src/aghermann/ui/sf/d/patterns-draw.cc
diff --git a/src/aghermann/ui/sf/d/patterns-profiles.cc b/upstream/src/aghermann/ui/sf/d/patterns-profiles.cc
similarity index 100%
rename from src/aghermann/ui/sf/d/patterns-profiles.cc
rename to upstream/src/aghermann/ui/sf/d/patterns-profiles.cc
diff --git a/src/aghermann/ui/sf/d/patterns-profiles_cb.cc b/upstream/src/aghermann/ui/sf/d/patterns-profiles_cb.cc
similarity index 100%
rename from src/aghermann/ui/sf/d/patterns-profiles_cb.cc
rename to upstream/src/aghermann/ui/sf/d/patterns-profiles_cb.cc
diff --git a/src/aghermann/ui/sf/d/patterns.cc b/upstream/src/aghermann/ui/sf/d/patterns.cc
similarity index 100%
rename from src/aghermann/ui/sf/d/patterns.cc
rename to upstream/src/aghermann/ui/sf/d/patterns.cc
diff --git a/src/aghermann/ui/sf/d/patterns.hh b/upstream/src/aghermann/ui/sf/d/patterns.hh
similarity index 100%
copy from src/aghermann/ui/sf/d/patterns.hh
copy to upstream/src/aghermann/ui/sf/d/patterns.hh
diff --git a/src/aghermann/ui/sf/d/patterns_cb.cc b/upstream/src/aghermann/ui/sf/d/patterns_cb.cc
similarity index 100%
rename from src/aghermann/ui/sf/d/patterns_cb.cc
rename to upstream/src/aghermann/ui/sf/d/patterns_cb.cc
diff --git a/src/aghermann/ui/sf/d/phasediff-construct.cc b/upstream/src/aghermann/ui/sf/d/phasediff-construct.cc
similarity index 100%
rename from src/aghermann/ui/sf/d/phasediff-construct.cc
rename to upstream/src/aghermann/ui/sf/d/phasediff-construct.cc
diff --git a/src/aghermann/ui/sf/d/phasediff.cc b/upstream/src/aghermann/ui/sf/d/phasediff.cc
similarity index 100%
rename from src/aghermann/ui/sf/d/phasediff.cc
rename to upstream/src/aghermann/ui/sf/d/phasediff.cc
diff --git a/src/aghermann/ui/sf/d/phasediff.hh b/upstream/src/aghermann/ui/sf/d/phasediff.hh
similarity index 100%
rename from src/aghermann/ui/sf/d/phasediff.hh
rename to upstream/src/aghermann/ui/sf/d/phasediff.hh
diff --git a/src/aghermann/ui/sf/d/phasediff_cb.cc b/upstream/src/aghermann/ui/sf/d/phasediff_cb.cc
similarity index 100%
rename from src/aghermann/ui/sf/d/phasediff_cb.cc
rename to upstream/src/aghermann/ui/sf/d/phasediff_cb.cc
diff --git a/src/aghermann/ui/sf/d/patterns.hh b/upstream/src/aghermann/ui/sf/d/rk1968.hh
similarity index 91%
rename from src/aghermann/ui/sf/d/patterns.hh
rename to upstream/src/aghermann/ui/sf/d/rk1968.hh
index 9227acd..87d6f39 100644
--- a/src/aghermann/ui/sf/d/patterns.hh
+++ b/upstream/src/aghermann/ui/sf/d/rk1968.hh
@@ -1,18 +1,17 @@
 /*
- *       File name:  aghermann/ui/sf/d/patterns.hh
+ *       File name:  aghermann/ui/sf/d/rk1968.hh
  *         Project:  Aghermann
  *          Author:  Andrei Zavada <johnhommer at gmail.com>
- * Initial version:  2013-01-24
+ * Initial version:  2013-08-04
  *
- *         Purpose:  scoring facility Patterns child dialog
+ *         Purpose:  scoring facility RK1968 assistant
  *
  *         License:  GPL
  */
 
-#ifndef AGH_AGHERMANN_UI_SF_D_PATTERNS_H_
-#define AGH_AGHERMANN_UI_SF_D_PATTERNS_H_
+#ifndef AGH_AGHERMANN_UI_SF_D_RK1968_H_
+#define AGH_AGHERMANN_UI_SF_D_RK1968_H_
 
-#include "aghermann/patterns/patterns.hh"
 #include "aghermann/ui/sf/sf.hh"
 
 #if HAVE_CONFIG_H && !defined(VERSION)
@@ -21,17 +20,17 @@
 
 using namespace std;
 
-namespace agh {
-namespace ui {
+namespace aghui {
 
 
-struct SPatternsDialogWidgets {
+struct SRK1968DialogWidgets {
 
-	SPatternsDialogWidgets (SScoringFacility&); // need access to mAllChannels
-       ~SPatternsDialogWidgets ();
+	SRK1968DialogWidgets (SScoringFacility&); // need access to mAllChannels
+       ~SRK1968DialogWidgets ();
 
 	GtkBuilder *builder;
 
+	
 	GtkListStore
 		*mSFFDPatterns,
 		*mSFFDChannels;
@@ -187,13 +186,12 @@ struct SScoringFacility::SPatternsDialog
 	void set_thing_da_width( int);
 	void set_field_da_width( int);
 
-	agh::ui::SScoringFacility&
+	aghui::SScoringFacility&
 		_p;
 };
 
 
-}
-} // namespace agh::ui
+} // namespace aghui
 
 extern "C" {
 void eSFFDPatternList_changed_cb( GtkComboBox*, gpointer);
@@ -226,11 +224,10 @@ void eSFFD_any_criteria_value_changed_cb( GtkSpinButton*, gpointer);
 void iSFFD_any_field_profile_type_toggled_cb( GtkRadioMenuItem*, gpointer);
 }
 
-#endif // AGH_AGHERMANN_UI_SF_D_PATTERNS_H_
+#endif // AGH_AGHERMANN_UI_SF_D_RK1968_H_
 
 // Local Variables:
 // Mode: c++
 // indent-tabs-mode: 8
 // tab-width: 8
-// c-basic-offset: 8
 // End:
diff --git a/src/aghermann/ui/sf/hypnogram.cc b/upstream/src/aghermann/ui/sf/hypnogram.cc
similarity index 100%
rename from src/aghermann/ui/sf/hypnogram.cc
rename to upstream/src/aghermann/ui/sf/hypnogram.cc
diff --git a/src/aghermann/ui/sf/hypnogram_cb.cc b/upstream/src/aghermann/ui/sf/hypnogram_cb.cc
similarity index 100%
rename from src/aghermann/ui/sf/hypnogram_cb.cc
rename to upstream/src/aghermann/ui/sf/hypnogram_cb.cc
diff --git a/src/aghermann/ui/sf/ica.cc b/upstream/src/aghermann/ui/sf/ica.cc
similarity index 100%
rename from src/aghermann/ui/sf/ica.cc
rename to upstream/src/aghermann/ui/sf/ica.cc
diff --git a/src/aghermann/ui/sf/ica_cb.cc b/upstream/src/aghermann/ui/sf/ica_cb.cc
similarity index 100%
rename from src/aghermann/ui/sf/ica_cb.cc
rename to upstream/src/aghermann/ui/sf/ica_cb.cc
diff --git a/src/aghermann/ui/sf/mainmenu_cb.cc b/upstream/src/aghermann/ui/sf/mainmenu_cb.cc
similarity index 100%
rename from src/aghermann/ui/sf/mainmenu_cb.cc
rename to upstream/src/aghermann/ui/sf/mainmenu_cb.cc
diff --git a/src/aghermann/ui/sf/montage-overlays.cc b/upstream/src/aghermann/ui/sf/montage-overlays.cc
similarity index 100%
rename from src/aghermann/ui/sf/montage-overlays.cc
rename to upstream/src/aghermann/ui/sf/montage-overlays.cc
diff --git a/src/aghermann/ui/sf/montage.cc b/upstream/src/aghermann/ui/sf/montage.cc
similarity index 100%
rename from src/aghermann/ui/sf/montage.cc
rename to upstream/src/aghermann/ui/sf/montage.cc
diff --git a/src/aghermann/ui/sf/montage_cb.cc b/upstream/src/aghermann/ui/sf/montage_cb.cc
similarity index 100%
rename from src/aghermann/ui/sf/montage_cb.cc
rename to upstream/src/aghermann/ui/sf/montage_cb.cc
diff --git a/src/aghermann/ui/sf/sf.cc b/upstream/src/aghermann/ui/sf/sf.cc
similarity index 100%
rename from src/aghermann/ui/sf/sf.cc
rename to upstream/src/aghermann/ui/sf/sf.cc
diff --git a/src/aghermann/ui/sf/sf.hh b/upstream/src/aghermann/ui/sf/sf.hh
similarity index 100%
rename from src/aghermann/ui/sf/sf.hh
rename to upstream/src/aghermann/ui/sf/sf.hh
diff --git a/src/aghermann/ui/sf/sf_cb.cc b/upstream/src/aghermann/ui/sf/sf_cb.cc
similarity index 100%
rename from src/aghermann/ui/sf/sf_cb.cc
rename to upstream/src/aghermann/ui/sf/sf_cb.cc
diff --git a/src/aghermann/ui/sf/sf_cb.hh b/upstream/src/aghermann/ui/sf/sf_cb.hh
similarity index 100%
rename from src/aghermann/ui/sf/sf_cb.hh
rename to upstream/src/aghermann/ui/sf/sf_cb.hh
diff --git a/src/aghermann/ui/sf/widgets.hh b/upstream/src/aghermann/ui/sf/widgets.hh
similarity index 100%
rename from src/aghermann/ui/sf/widgets.hh
rename to upstream/src/aghermann/ui/sf/widgets.hh
diff --git a/src/aghermann/ui/sm/Makefile.am b/upstream/src/aghermann/ui/sm/Makefile.am
similarity index 100%
rename from src/aghermann/ui/sm/Makefile.am
rename to upstream/src/aghermann/ui/sm/Makefile.am
diff --git a/src/aghermann/ui/sm/sm-construct.cc b/upstream/src/aghermann/ui/sm/sm-construct.cc
similarity index 100%
rename from src/aghermann/ui/sm/sm-construct.cc
rename to upstream/src/aghermann/ui/sm/sm-construct.cc
diff --git a/src/aghermann/ui/sm/sm.cc b/upstream/src/aghermann/ui/sm/sm.cc
similarity index 100%
rename from src/aghermann/ui/sm/sm.cc
rename to upstream/src/aghermann/ui/sm/sm.cc
diff --git a/src/aghermann/ui/sm/sm.hh b/upstream/src/aghermann/ui/sm/sm.hh
similarity index 100%
rename from src/aghermann/ui/sm/sm.hh
rename to upstream/src/aghermann/ui/sm/sm.hh
diff --git a/src/aghermann/ui/sm/sm_cb.cc b/upstream/src/aghermann/ui/sm/sm_cb.cc
similarity index 100%
rename from src/aghermann/ui/sm/sm_cb.cc
rename to upstream/src/aghermann/ui/sm/sm_cb.cc
diff --git a/src/aghermann/ui/sm/sm_cb.hh b/upstream/src/aghermann/ui/sm/sm_cb.hh
similarity index 100%
rename from src/aghermann/ui/sm/sm_cb.hh
rename to upstream/src/aghermann/ui/sm/sm_cb.hh
diff --git a/src/aghermann/ui/ui++.cc b/upstream/src/aghermann/ui/ui++.cc
similarity index 100%
rename from src/aghermann/ui/ui++.cc
rename to upstream/src/aghermann/ui/ui++.cc
diff --git a/src/aghermann/ui/ui++.hh b/upstream/src/aghermann/ui/ui++.hh
similarity index 100%
rename from src/aghermann/ui/ui++.hh
rename to upstream/src/aghermann/ui/ui++.hh
diff --git a/src/aghermann/ui/ui.cc b/upstream/src/aghermann/ui/ui.cc
similarity index 100%
rename from src/aghermann/ui/ui.cc
rename to upstream/src/aghermann/ui/ui.cc
diff --git a/src/aghermann/ui/ui.hh b/upstream/src/aghermann/ui/ui.hh
similarity index 100%
rename from src/aghermann/ui/ui.hh
rename to upstream/src/aghermann/ui/ui.hh
diff --git a/src/common/Makefile.am b/upstream/src/common/Makefile.am
similarity index 100%
rename from src/common/Makefile.am
rename to upstream/src/common/Makefile.am
diff --git a/src/common/alg.hh b/upstream/src/common/alg.hh
similarity index 100%
rename from src/common/alg.hh
rename to upstream/src/common/alg.hh
diff --git a/src/common/config-validate.hh b/upstream/src/common/config-validate.hh
similarity index 100%
rename from src/common/config-validate.hh
rename to upstream/src/common/config-validate.hh
diff --git a/src/common/containers.hh b/upstream/src/common/containers.hh
similarity index 100%
rename from src/common/containers.hh
rename to upstream/src/common/containers.hh
diff --git a/src/common/fs.hh b/upstream/src/common/fs.hh
similarity index 100%
rename from src/common/fs.hh
rename to upstream/src/common/fs.hh
diff --git a/src/common/lang.hh b/upstream/src/common/lang.hh
similarity index 100%
rename from src/common/lang.hh
rename to upstream/src/common/lang.hh
diff --git a/src/common/libcommon.cc b/upstream/src/common/libcommon.cc
similarity index 100%
rename from src/common/libcommon.cc
rename to upstream/src/common/libcommon.cc
diff --git a/src/common/string.hh b/upstream/src/common/string.hh
similarity index 100%
rename from src/common/string.hh
rename to upstream/src/common/string.hh
diff --git a/src/common/subject_id.cc b/upstream/src/common/subject_id.cc
similarity index 100%
rename from src/common/subject_id.cc
rename to upstream/src/common/subject_id.cc
diff --git a/src/common/subject_id.hh b/upstream/src/common/subject_id.hh
similarity index 100%
rename from src/common/subject_id.hh
rename to upstream/src/common/subject_id.hh
diff --git a/src/libmetrics/Makefile.am b/upstream/src/libmetrics/Makefile.am
similarity index 100%
rename from src/libmetrics/Makefile.am
rename to upstream/src/libmetrics/Makefile.am
diff --git a/src/libmetrics/all.hh b/upstream/src/libmetrics/all.hh
similarity index 100%
rename from src/libmetrics/all.hh
rename to upstream/src/libmetrics/all.hh
diff --git a/src/libmetrics/bands.hh b/upstream/src/libmetrics/bands.hh
similarity index 100%
rename from src/libmetrics/bands.hh
rename to upstream/src/libmetrics/bands.hh
diff --git a/src/libmetrics/forward-decls.hh b/upstream/src/libmetrics/forward-decls.hh
similarity index 100%
rename from src/libmetrics/forward-decls.hh
rename to upstream/src/libmetrics/forward-decls.hh
diff --git a/src/libmetrics/mc-artifacts.cc b/upstream/src/libmetrics/mc-artifacts.cc
similarity index 100%
rename from src/libmetrics/mc-artifacts.cc
rename to upstream/src/libmetrics/mc-artifacts.cc
diff --git a/src/libmetrics/mc-artifacts.hh b/upstream/src/libmetrics/mc-artifacts.hh
similarity index 100%
rename from src/libmetrics/mc-artifacts.hh
rename to upstream/src/libmetrics/mc-artifacts.hh
diff --git a/src/libmetrics/mc-artifacts.ii b/upstream/src/libmetrics/mc-artifacts.ii
similarity index 100%
rename from src/libmetrics/mc-artifacts.ii
rename to upstream/src/libmetrics/mc-artifacts.ii
diff --git a/src/libmetrics/mc.cc b/upstream/src/libmetrics/mc.cc
similarity index 100%
rename from src/libmetrics/mc.cc
rename to upstream/src/libmetrics/mc.cc
diff --git a/src/libmetrics/mc.hh b/upstream/src/libmetrics/mc.hh
similarity index 100%
rename from src/libmetrics/mc.hh
rename to upstream/src/libmetrics/mc.hh
diff --git a/src/libmetrics/page-metrics-base.cc b/upstream/src/libmetrics/page-metrics-base.cc
similarity index 100%
rename from src/libmetrics/page-metrics-base.cc
rename to upstream/src/libmetrics/page-metrics-base.cc
diff --git a/src/libmetrics/page-metrics-base.hh b/upstream/src/libmetrics/page-metrics-base.hh
similarity index 100%
rename from src/libmetrics/page-metrics-base.hh
rename to upstream/src/libmetrics/page-metrics-base.hh
diff --git a/src/libmetrics/psd.cc b/upstream/src/libmetrics/psd.cc
similarity index 100%
rename from src/libmetrics/psd.cc
rename to upstream/src/libmetrics/psd.cc
diff --git a/src/libmetrics/psd.hh b/upstream/src/libmetrics/psd.hh
similarity index 100%
rename from src/libmetrics/psd.hh
rename to upstream/src/libmetrics/psd.hh
diff --git a/src/libmetrics/swu.cc b/upstream/src/libmetrics/swu.cc
similarity index 100%
rename from src/libmetrics/swu.cc
rename to upstream/src/libmetrics/swu.cc
diff --git a/src/libmetrics/swu.hh b/upstream/src/libmetrics/swu.hh
similarity index 100%
rename from src/libmetrics/swu.hh
rename to upstream/src/libmetrics/swu.hh
diff --git a/src/libsigfile/Makefile.am b/upstream/src/libsigfile/Makefile.am
similarity index 100%
rename from src/libsigfile/Makefile.am
rename to upstream/src/libsigfile/Makefile.am
diff --git a/src/libsigfile/all.hh b/upstream/src/libsigfile/all.hh
similarity index 100%
rename from src/libsigfile/all.hh
rename to upstream/src/libsigfile/all.hh
diff --git a/src/libsigfile/channel.cc b/upstream/src/libsigfile/channel.cc
similarity index 100%
rename from src/libsigfile/channel.cc
rename to upstream/src/libsigfile/channel.cc
diff --git a/src/libsigfile/channel.hh b/upstream/src/libsigfile/channel.hh
similarity index 100%
rename from src/libsigfile/channel.hh
rename to upstream/src/libsigfile/channel.hh
diff --git a/src/libsigfile/edf-file.xml b/upstream/src/libsigfile/edf-file.xml
similarity index 100%
rename from src/libsigfile/edf-file.xml
rename to upstream/src/libsigfile/edf-file.xml
diff --git a/src/libsigfile/edf-io.cc b/upstream/src/libsigfile/edf-io.cc
similarity index 100%
rename from src/libsigfile/edf-io.cc
rename to upstream/src/libsigfile/edf-io.cc
diff --git a/src/libsigfile/edf.cc b/upstream/src/libsigfile/edf.cc
similarity index 100%
rename from src/libsigfile/edf.cc
rename to upstream/src/libsigfile/edf.cc
diff --git a/src/libsigfile/edf.hh b/upstream/src/libsigfile/edf.hh
similarity index 100%
rename from src/libsigfile/edf.hh
rename to upstream/src/libsigfile/edf.hh
diff --git a/src/libsigfile/forward-decls.hh b/upstream/src/libsigfile/forward-decls.hh
similarity index 100%
rename from src/libsigfile/forward-decls.hh
rename to upstream/src/libsigfile/forward-decls.hh
diff --git a/src/libsigfile/page.cc b/upstream/src/libsigfile/page.cc
similarity index 100%
rename from src/libsigfile/page.cc
rename to upstream/src/libsigfile/page.cc
diff --git a/src/libsigfile/page.hh b/upstream/src/libsigfile/page.hh
similarity index 100%
rename from src/libsigfile/page.hh
rename to upstream/src/libsigfile/page.hh
diff --git a/src/libsigfile/source-base.cc b/upstream/src/libsigfile/source-base.cc
similarity index 100%
rename from src/libsigfile/source-base.cc
rename to upstream/src/libsigfile/source-base.cc
diff --git a/src/libsigfile/source-base.hh b/upstream/src/libsigfile/source-base.hh
similarity index 100%
rename from src/libsigfile/source-base.hh
rename to upstream/src/libsigfile/source-base.hh
diff --git a/src/libsigfile/tsv.cc b/upstream/src/libsigfile/tsv.cc
similarity index 100%
rename from src/libsigfile/tsv.cc
rename to upstream/src/libsigfile/tsv.cc
diff --git a/src/libsigfile/tsv.hh b/upstream/src/libsigfile/tsv.hh
similarity index 100%
rename from src/libsigfile/tsv.hh
rename to upstream/src/libsigfile/tsv.hh
diff --git a/src/libsigfile/typed-source.cc b/upstream/src/libsigfile/typed-source.cc
similarity index 100%
rename from src/libsigfile/typed-source.cc
rename to upstream/src/libsigfile/typed-source.cc
diff --git a/src/libsigfile/typed-source.hh b/upstream/src/libsigfile/typed-source.hh
similarity index 100%
rename from src/libsigfile/typed-source.hh
rename to upstream/src/libsigfile/typed-source.hh
diff --git a/src/libsigproc/Makefile.am b/upstream/src/libsigproc/Makefile.am
similarity index 100%
rename from src/libsigproc/Makefile.am
rename to upstream/src/libsigproc/Makefile.am
diff --git a/src/libsigproc/exstrom.cc b/upstream/src/libsigproc/exstrom.cc
similarity index 100%
rename from src/libsigproc/exstrom.cc
rename to upstream/src/libsigproc/exstrom.cc
diff --git a/src/libsigproc/exstrom.com/README b/upstream/src/libsigproc/exstrom.com/README
similarity index 100%
rename from src/libsigproc/exstrom.com/README
rename to upstream/src/libsigproc/exstrom.com/README
diff --git a/src/libsigproc/exstrom.com/bwbs.c b/upstream/src/libsigproc/exstrom.com/bwbs.c
similarity index 100%
rename from src/libsigproc/exstrom.com/bwbs.c
rename to upstream/src/libsigproc/exstrom.com/bwbs.c
diff --git a/src/libsigproc/exstrom.com/liir.c b/upstream/src/libsigproc/exstrom.com/liir.c
similarity index 100%
rename from src/libsigproc/exstrom.com/liir.c
rename to upstream/src/libsigproc/exstrom.com/liir.c
diff --git a/src/libsigproc/exstrom.com/rdf.c b/upstream/src/libsigproc/exstrom.com/rdf.c
similarity index 100%
rename from src/libsigproc/exstrom.com/rdf.c
rename to upstream/src/libsigproc/exstrom.com/rdf.c
diff --git a/src/libsigproc/exstrom.hh b/upstream/src/libsigproc/exstrom.hh
similarity index 100%
rename from src/libsigproc/exstrom.hh
rename to upstream/src/libsigproc/exstrom.hh
diff --git a/src/libsigproc/ext-filters.cc b/upstream/src/libsigproc/ext-filters.cc
similarity index 100%
rename from src/libsigproc/ext-filters.cc
rename to upstream/src/libsigproc/ext-filters.cc
diff --git a/src/libsigproc/ext-filters.hh b/upstream/src/libsigproc/ext-filters.hh
similarity index 100%
rename from src/libsigproc/ext-filters.hh
rename to upstream/src/libsigproc/ext-filters.hh
diff --git a/src/libsigproc/ext-filters.ii b/upstream/src/libsigproc/ext-filters.ii
similarity index 100%
rename from src/libsigproc/ext-filters.ii
rename to upstream/src/libsigproc/ext-filters.ii
diff --git a/src/libsigproc/sigproc.cc b/upstream/src/libsigproc/sigproc.cc
similarity index 100%
rename from src/libsigproc/sigproc.cc
rename to upstream/src/libsigproc/sigproc.cc
diff --git a/src/libsigproc/sigproc.hh b/upstream/src/libsigproc/sigproc.hh
similarity index 100%
rename from src/libsigproc/sigproc.hh
rename to upstream/src/libsigproc/sigproc.hh
diff --git a/src/libsigproc/sigproc.ii b/upstream/src/libsigproc/sigproc.ii
similarity index 100%
rename from src/libsigproc/sigproc.ii
rename to upstream/src/libsigproc/sigproc.ii
diff --git a/src/libsigproc/winfun.cc b/upstream/src/libsigproc/winfun.cc
similarity index 100%
rename from src/libsigproc/winfun.cc
rename to upstream/src/libsigproc/winfun.cc
diff --git a/src/libsigproc/winfun.hh b/upstream/src/libsigproc/winfun.hh
similarity index 100%
rename from src/libsigproc/winfun.hh
rename to upstream/src/libsigproc/winfun.hh
diff --git a/src/tools/.gitignore b/upstream/src/tools/.gitignore
similarity index 100%
rename from src/tools/.gitignore
rename to upstream/src/tools/.gitignore
diff --git a/src/tools/Makefile.am b/upstream/src/tools/Makefile.am
similarity index 100%
rename from src/tools/Makefile.am
rename to upstream/src/tools/Makefile.am
diff --git a/src/tools/agh-profile-gen.cc b/upstream/src/tools/agh-profile-gen.cc
similarity index 100%
rename from src/tools/agh-profile-gen.cc
rename to upstream/src/tools/agh-profile-gen.cc
diff --git a/src/tools/edfcat.cc b/upstream/src/tools/edfcat.cc
similarity index 100%
rename from src/tools/edfcat.cc
rename to upstream/src/tools/edfcat.cc
diff --git a/src/tools/edfhed-gtk.cc b/upstream/src/tools/edfhed-gtk.cc
similarity index 100%
rename from src/tools/edfhed-gtk.cc
rename to upstream/src/tools/edfhed-gtk.cc
diff --git a/src/tools/edfhed.cc b/upstream/src/tools/edfhed.cc
similarity index 100%
rename from src/tools/edfhed.cc
rename to upstream/src/tools/edfhed.cc
diff --git a/src/tools/plot-vaf b/upstream/src/tools/plot-vaf
similarity index 100%
rename from src/tools/plot-vaf
rename to upstream/src/tools/plot-vaf

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git



More information about the debian-med-commit mailing list