From b3b4fd448e4939fefe5c1b6ddf7f602f5238decf Mon Sep 17 00:00:00 2001 From: Steve Beattie Date: Wed, 12 Feb 2014 13:27:30 -0800 Subject: [PATCH] Reorganize layout to ease merger into upstream apparmor-utils tree. --- .project | 17 ----------------- .pydevproject | 8 -------- README.md => utils.new/README.md | 0 {Translate => utils.new/Translate}/README | 0 {Translate => utils.new/Translate}/messages.pot | 0 {Tools => utils.new}/aa-audit | 0 {Tools/manpages => utils.new}/aa-audit.pod | 0 {Tools => utils.new}/aa-autodep | 0 {Tools/manpages => utils.new}/aa-autodep.pod | 0 {Tools => utils.new}/aa-cleanprof | 0 {Tools/manpages => utils.new}/aa-cleanprof.pod | 0 {Tools => utils.new}/aa-complain | 0 {Tools/manpages => utils.new}/aa-complain.pod | 0 {Tools => utils.new}/aa-disable | 0 {Tools/manpages => utils.new}/aa-disable.pod | 0 {Tools => utils.new}/aa-enforce | 0 {Tools/manpages => utils.new}/aa-enforce.pod | 0 {Tools => utils.new}/aa-genprof | 0 {Tools/manpages => utils.new}/aa-genprof.pod | 0 {Tools => utils.new}/aa-logprof | 0 {Tools/manpages => utils.new}/aa-logprof.pod | 0 {Tools => utils.new}/aa-mergeprof | 0 {Tools/manpages => utils.new}/aa-mergeprof.pod | 0 {Tools => utils.new}/aa-unconfined | 0 {Tools/manpages => utils.new}/aa-unconfined.pod | 0 {apparmor => utils.new/apparmor}/__init__.py | 0 {apparmor => utils.new/apparmor}/aa.py | 0 {apparmor => utils.new/apparmor}/aamode.py | 0 .../apparmor}/cleanprofile.py | 0 {apparmor => utils.new/apparmor}/common.py | 0 {apparmor => utils.new/apparmor}/config.py | 0 {apparmor => utils.new/apparmor}/logparser.py | 0 {apparmor => utils.new/apparmor}/severity.py | 0 {apparmor => utils.new/apparmor}/tools.py | 0 {apparmor => utils.new/apparmor}/ui.py | 0 {apparmor => utils.new/apparmor}/yasti.py | 0 {Testing => utils.new/test}/aa_test.py | 0 {Testing => utils.new/test}/cleanprof_test.in | 0 {Testing => utils.new/test}/cleanprof_test.out | 0 {Testing => utils.new/test}/common_test.py | 0 {Testing => utils.new/test}/config_test.py | 0 {Testing => utils.new/test}/easyprof.conf | 0 {Testing => utils.new/test}/logprof.conf | 0 {Testing => utils.new/test}/minitools_test.py | 0 {Testing => utils.new/test}/regex_tests.ini | 0 {Testing => utils.new/test}/runtests-py2.sh | 0 {Testing => utils.new/test}/runtests-py3.sh | 0 {Testing => utils.new/test}/severity.db | 0 {Testing => utils.new/test}/severity_broken.db | 0 {Testing => utils.new/test}/severity_test.py | 0 50 files changed, 25 deletions(-) delete mode 100644 .project delete mode 100644 .pydevproject rename README.md => utils.new/README.md (100%) rename {Translate => utils.new/Translate}/README (100%) rename {Translate => utils.new/Translate}/messages.pot (100%) rename {Tools => utils.new}/aa-audit (100%) rename {Tools/manpages => utils.new}/aa-audit.pod (100%) rename {Tools => utils.new}/aa-autodep (100%) rename {Tools/manpages => utils.new}/aa-autodep.pod (100%) rename {Tools => utils.new}/aa-cleanprof (100%) rename {Tools/manpages => utils.new}/aa-cleanprof.pod (100%) rename {Tools => utils.new}/aa-complain (100%) rename {Tools/manpages => utils.new}/aa-complain.pod (100%) rename {Tools => utils.new}/aa-disable (100%) rename {Tools/manpages => utils.new}/aa-disable.pod (100%) rename {Tools => utils.new}/aa-enforce (100%) rename {Tools/manpages => utils.new}/aa-enforce.pod (100%) rename {Tools => utils.new}/aa-genprof (100%) rename {Tools/manpages => utils.new}/aa-genprof.pod (100%) rename {Tools => utils.new}/aa-logprof (100%) rename {Tools/manpages => utils.new}/aa-logprof.pod (100%) rename {Tools => utils.new}/aa-mergeprof (100%) rename {Tools/manpages => utils.new}/aa-mergeprof.pod (100%) rename {Tools => utils.new}/aa-unconfined (100%) rename {Tools/manpages => utils.new}/aa-unconfined.pod (100%) rename {apparmor => utils.new/apparmor}/__init__.py (100%) rename {apparmor => utils.new/apparmor}/aa.py (100%) rename {apparmor => utils.new/apparmor}/aamode.py (100%) rename {apparmor => utils.new/apparmor}/cleanprofile.py (100%) rename {apparmor => utils.new/apparmor}/common.py (100%) rename {apparmor => utils.new/apparmor}/config.py (100%) rename {apparmor => utils.new/apparmor}/logparser.py (100%) rename {apparmor => utils.new/apparmor}/severity.py (100%) rename {apparmor => utils.new/apparmor}/tools.py (100%) rename {apparmor => utils.new/apparmor}/ui.py (100%) rename {apparmor => utils.new/apparmor}/yasti.py (100%) rename {Testing => utils.new/test}/aa_test.py (100%) rename {Testing => utils.new/test}/cleanprof_test.in (100%) rename {Testing => utils.new/test}/cleanprof_test.out (100%) rename {Testing => utils.new/test}/common_test.py (100%) rename {Testing => utils.new/test}/config_test.py (100%) rename {Testing => utils.new/test}/easyprof.conf (100%) rename {Testing => utils.new/test}/logprof.conf (100%) rename {Testing => utils.new/test}/minitools_test.py (100%) rename {Testing => utils.new/test}/regex_tests.ini (100%) rename {Testing => utils.new/test}/runtests-py2.sh (100%) rename {Testing => utils.new/test}/runtests-py3.sh (100%) rename {Testing => utils.new/test}/severity.db (100%) rename {Testing => utils.new/test}/severity_broken.db (100%) rename {Testing => utils.new/test}/severity_test.py (100%) diff --git a/.project b/.project deleted file mode 100644 index 303ccdf1f..000000000 --- a/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - apparmor-profile-tools - - - - - - org.python.pydev.PyDevBuilder - - - - - - org.python.pydev.pythonNature - - diff --git a/.pydevproject b/.pydevproject deleted file mode 100644 index 9d8f69996..000000000 --- a/.pydevproject +++ /dev/null @@ -1,8 +0,0 @@ - - - -/apparmor-profile-tools - -python 3.0 -Python3.3 - diff --git a/README.md b/utils.new/README.md similarity index 100% rename from README.md rename to utils.new/README.md diff --git a/Translate/README b/utils.new/Translate/README similarity index 100% rename from Translate/README rename to utils.new/Translate/README diff --git a/Translate/messages.pot b/utils.new/Translate/messages.pot similarity index 100% rename from Translate/messages.pot rename to utils.new/Translate/messages.pot diff --git a/Tools/aa-audit b/utils.new/aa-audit similarity index 100% rename from Tools/aa-audit rename to utils.new/aa-audit diff --git a/Tools/manpages/aa-audit.pod b/utils.new/aa-audit.pod similarity index 100% rename from Tools/manpages/aa-audit.pod rename to utils.new/aa-audit.pod diff --git a/Tools/aa-autodep b/utils.new/aa-autodep similarity index 100% rename from Tools/aa-autodep rename to utils.new/aa-autodep diff --git a/Tools/manpages/aa-autodep.pod b/utils.new/aa-autodep.pod similarity index 100% rename from Tools/manpages/aa-autodep.pod rename to utils.new/aa-autodep.pod diff --git a/Tools/aa-cleanprof b/utils.new/aa-cleanprof similarity index 100% rename from Tools/aa-cleanprof rename to utils.new/aa-cleanprof diff --git a/Tools/manpages/aa-cleanprof.pod b/utils.new/aa-cleanprof.pod similarity index 100% rename from Tools/manpages/aa-cleanprof.pod rename to utils.new/aa-cleanprof.pod diff --git a/Tools/aa-complain b/utils.new/aa-complain similarity index 100% rename from Tools/aa-complain rename to utils.new/aa-complain diff --git a/Tools/manpages/aa-complain.pod b/utils.new/aa-complain.pod similarity index 100% rename from Tools/manpages/aa-complain.pod rename to utils.new/aa-complain.pod diff --git a/Tools/aa-disable b/utils.new/aa-disable similarity index 100% rename from Tools/aa-disable rename to utils.new/aa-disable diff --git a/Tools/manpages/aa-disable.pod b/utils.new/aa-disable.pod similarity index 100% rename from Tools/manpages/aa-disable.pod rename to utils.new/aa-disable.pod diff --git a/Tools/aa-enforce b/utils.new/aa-enforce similarity index 100% rename from Tools/aa-enforce rename to utils.new/aa-enforce diff --git a/Tools/manpages/aa-enforce.pod b/utils.new/aa-enforce.pod similarity index 100% rename from Tools/manpages/aa-enforce.pod rename to utils.new/aa-enforce.pod diff --git a/Tools/aa-genprof b/utils.new/aa-genprof similarity index 100% rename from Tools/aa-genprof rename to utils.new/aa-genprof diff --git a/Tools/manpages/aa-genprof.pod b/utils.new/aa-genprof.pod similarity index 100% rename from Tools/manpages/aa-genprof.pod rename to utils.new/aa-genprof.pod diff --git a/Tools/aa-logprof b/utils.new/aa-logprof similarity index 100% rename from Tools/aa-logprof rename to utils.new/aa-logprof diff --git a/Tools/manpages/aa-logprof.pod b/utils.new/aa-logprof.pod similarity index 100% rename from Tools/manpages/aa-logprof.pod rename to utils.new/aa-logprof.pod diff --git a/Tools/aa-mergeprof b/utils.new/aa-mergeprof similarity index 100% rename from Tools/aa-mergeprof rename to utils.new/aa-mergeprof diff --git a/Tools/manpages/aa-mergeprof.pod b/utils.new/aa-mergeprof.pod similarity index 100% rename from Tools/manpages/aa-mergeprof.pod rename to utils.new/aa-mergeprof.pod diff --git a/Tools/aa-unconfined b/utils.new/aa-unconfined similarity index 100% rename from Tools/aa-unconfined rename to utils.new/aa-unconfined diff --git a/Tools/manpages/aa-unconfined.pod b/utils.new/aa-unconfined.pod similarity index 100% rename from Tools/manpages/aa-unconfined.pod rename to utils.new/aa-unconfined.pod diff --git a/apparmor/__init__.py b/utils.new/apparmor/__init__.py similarity index 100% rename from apparmor/__init__.py rename to utils.new/apparmor/__init__.py diff --git a/apparmor/aa.py b/utils.new/apparmor/aa.py similarity index 100% rename from apparmor/aa.py rename to utils.new/apparmor/aa.py diff --git a/apparmor/aamode.py b/utils.new/apparmor/aamode.py similarity index 100% rename from apparmor/aamode.py rename to utils.new/apparmor/aamode.py diff --git a/apparmor/cleanprofile.py b/utils.new/apparmor/cleanprofile.py similarity index 100% rename from apparmor/cleanprofile.py rename to utils.new/apparmor/cleanprofile.py diff --git a/apparmor/common.py b/utils.new/apparmor/common.py similarity index 100% rename from apparmor/common.py rename to utils.new/apparmor/common.py diff --git a/apparmor/config.py b/utils.new/apparmor/config.py similarity index 100% rename from apparmor/config.py rename to utils.new/apparmor/config.py diff --git a/apparmor/logparser.py b/utils.new/apparmor/logparser.py similarity index 100% rename from apparmor/logparser.py rename to utils.new/apparmor/logparser.py diff --git a/apparmor/severity.py b/utils.new/apparmor/severity.py similarity index 100% rename from apparmor/severity.py rename to utils.new/apparmor/severity.py diff --git a/apparmor/tools.py b/utils.new/apparmor/tools.py similarity index 100% rename from apparmor/tools.py rename to utils.new/apparmor/tools.py diff --git a/apparmor/ui.py b/utils.new/apparmor/ui.py similarity index 100% rename from apparmor/ui.py rename to utils.new/apparmor/ui.py diff --git a/apparmor/yasti.py b/utils.new/apparmor/yasti.py similarity index 100% rename from apparmor/yasti.py rename to utils.new/apparmor/yasti.py diff --git a/Testing/aa_test.py b/utils.new/test/aa_test.py similarity index 100% rename from Testing/aa_test.py rename to utils.new/test/aa_test.py diff --git a/Testing/cleanprof_test.in b/utils.new/test/cleanprof_test.in similarity index 100% rename from Testing/cleanprof_test.in rename to utils.new/test/cleanprof_test.in diff --git a/Testing/cleanprof_test.out b/utils.new/test/cleanprof_test.out similarity index 100% rename from Testing/cleanprof_test.out rename to utils.new/test/cleanprof_test.out diff --git a/Testing/common_test.py b/utils.new/test/common_test.py similarity index 100% rename from Testing/common_test.py rename to utils.new/test/common_test.py diff --git a/Testing/config_test.py b/utils.new/test/config_test.py similarity index 100% rename from Testing/config_test.py rename to utils.new/test/config_test.py diff --git a/Testing/easyprof.conf b/utils.new/test/easyprof.conf similarity index 100% rename from Testing/easyprof.conf rename to utils.new/test/easyprof.conf diff --git a/Testing/logprof.conf b/utils.new/test/logprof.conf similarity index 100% rename from Testing/logprof.conf rename to utils.new/test/logprof.conf diff --git a/Testing/minitools_test.py b/utils.new/test/minitools_test.py similarity index 100% rename from Testing/minitools_test.py rename to utils.new/test/minitools_test.py diff --git a/Testing/regex_tests.ini b/utils.new/test/regex_tests.ini similarity index 100% rename from Testing/regex_tests.ini rename to utils.new/test/regex_tests.ini diff --git a/Testing/runtests-py2.sh b/utils.new/test/runtests-py2.sh similarity index 100% rename from Testing/runtests-py2.sh rename to utils.new/test/runtests-py2.sh diff --git a/Testing/runtests-py3.sh b/utils.new/test/runtests-py3.sh similarity index 100% rename from Testing/runtests-py3.sh rename to utils.new/test/runtests-py3.sh diff --git a/Testing/severity.db b/utils.new/test/severity.db similarity index 100% rename from Testing/severity.db rename to utils.new/test/severity.db diff --git a/Testing/severity_broken.db b/utils.new/test/severity_broken.db similarity index 100% rename from Testing/severity_broken.db rename to utils.new/test/severity_broken.db diff --git a/Testing/severity_test.py b/utils.new/test/severity_test.py similarity index 100% rename from Testing/severity_test.py rename to utils.new/test/severity_test.py