From: James Troup <james@nocrew.org>
Date: Mon, 15 May 2006 16:11:32 +0000 (-0400)
Subject: Stop using silly names, and migrate to a saner directory structure.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59fd5aa2a8be3b76dbc968429c457f096adfa472;p=dak

Stop using silly names, and migrate to a saner directory structure.
---

diff --git a/apt.conf-non-US b/config/debian-non-US/apt.conf
similarity index 100%
rename from apt.conf-non-US
rename to config/debian-non-US/apt.conf
diff --git a/apt.conf.stable-non-US b/config/debian-non-US/apt.conf.stable
similarity index 100%
rename from apt.conf.stable-non-US
rename to config/debian-non-US/apt.conf.stable
diff --git a/cron.daily-non-US b/config/debian-non-US/cron.daily
similarity index 100%
rename from cron.daily-non-US
rename to config/debian-non-US/cron.daily
diff --git a/cron.hourly-non-US b/config/debian-non-US/cron.hourly
similarity index 100%
rename from cron.hourly-non-US
rename to config/debian-non-US/cron.hourly
diff --git a/cron.unchecked-non-US b/config/debian-non-US/cron.unchecked
similarity index 100%
rename from cron.unchecked-non-US
rename to config/debian-non-US/cron.unchecked
diff --git a/cron.weekly-non-US b/config/debian-non-US/cron.weekly
similarity index 100%
rename from cron.weekly-non-US
rename to config/debian-non-US/cron.weekly
diff --git a/katie.conf-non-US b/config/debian-non-US/dak.conf
similarity index 100%
rename from katie.conf-non-US
rename to config/debian-non-US/dak.conf
diff --git a/vars-non-US b/config/debian-non-US/vars
similarity index 100%
rename from vars-non-US
rename to config/debian-non-US/vars
diff --git a/apt.conf-security b/config/debian-security/apt.conf
similarity index 100%
rename from apt.conf-security
rename to config/debian-security/apt.conf
diff --git a/apt.conf.buildd-security b/config/debian-security/apt.conf.buildd
similarity index 100%
rename from apt.conf.buildd-security
rename to config/debian-security/apt.conf.buildd
diff --git a/cron.buildd-security b/config/debian-security/cron.buildd
similarity index 100%
rename from cron.buildd-security
rename to config/debian-security/cron.buildd
diff --git a/cron.daily-security b/config/debian-security/cron.daily
similarity index 100%
rename from cron.daily-security
rename to config/debian-security/cron.daily
diff --git a/cron.unchecked-security b/config/debian-security/cron.unchecked
similarity index 100%
rename from cron.unchecked-security
rename to config/debian-security/cron.unchecked
diff --git a/katie.conf-security b/config/debian-security/dak.conf
similarity index 100%
rename from katie.conf-security
rename to config/debian-security/dak.conf
diff --git a/vars-security b/config/debian-security/vars
similarity index 100%
rename from vars-security
rename to config/debian-security/vars
diff --git a/Contents.top b/config/debian/Contents.top
similarity index 100%
rename from Contents.top
rename to config/debian/Contents.top
diff --git a/apt.conf b/config/debian/apt.conf
similarity index 100%
rename from apt.conf
rename to config/debian/apt.conf
diff --git a/apt.conf.buildd b/config/debian/apt.conf.buildd
similarity index 100%
rename from apt.conf.buildd
rename to config/debian/apt.conf.buildd
diff --git a/apt.conf.stable b/config/debian/apt.conf.stable
similarity index 100%
rename from apt.conf.stable
rename to config/debian/apt.conf.stable
diff --git a/cron.buildd b/config/debian/cron.buildd
similarity index 100%
rename from cron.buildd
rename to config/debian/cron.buildd
diff --git a/cron.daily b/config/debian/cron.daily
similarity index 100%
rename from cron.daily
rename to config/debian/cron.daily
diff --git a/cron.hourly b/config/debian/cron.hourly
similarity index 100%
rename from cron.hourly
rename to config/debian/cron.hourly
diff --git a/cron.monthly b/config/debian/cron.monthly
similarity index 100%
rename from cron.monthly
rename to config/debian/cron.monthly
diff --git a/cron.unchecked b/config/debian/cron.unchecked
similarity index 100%
rename from cron.unchecked
rename to config/debian/cron.unchecked
diff --git a/cron.weekly b/config/debian/cron.weekly
similarity index 100%
rename from cron.weekly
rename to config/debian/cron.weekly
diff --git a/katie.conf b/config/debian/dak.conf
similarity index 100%
rename from katie.conf
rename to config/debian/dak.conf
diff --git a/pseudo-packages.description b/config/debian/pseudo-packages.description
similarity index 100%
rename from pseudo-packages.description
rename to config/debian/pseudo-packages.description
diff --git a/pseudo-packages.maintainers b/config/debian/pseudo-packages.maintainers
similarity index 100%
rename from pseudo-packages.maintainers
rename to config/debian/pseudo-packages.maintainers
diff --git a/vars b/config/debian/vars
similarity index 100%
rename from vars
rename to config/debian/vars
diff --git a/examples/katie.conf b/config/examples/dak.conf
similarity index 100%
rename from examples/katie.conf
rename to config/examples/dak.conf
diff --git a/contrib/signature_checking_optional-doogie.diff b/contrib/signature_checking_optional-doogie.diff
deleted file mode 100644
index 6a5bbc66..00000000
--- a/contrib/signature_checking_optional-doogie.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: katie
-===================================================================
-RCS file: /cvs/dak/dak/katie,v
-retrieving revision 1.28
-diff -u -r1.28 katie
---- katie	2001/02/06 00:39:44	1.28
-+++ katie	2001/02/09 18:14:49
-@@ -102,7 +102,13 @@
- def check_signature (filename):
-     global reject_message
- 
--    (result, output) = commands.getstatusoutput("gpg --emulate-md-encode-bug --batch --no-options --no-default-keyring --always-trust --keyring=%s --keyring=%s < %s >/dev/null" % (Cnf["Dinstall::PGPKeyring"], Cnf["Dinstall::GPGKeyring"], filename))
-+    if Cnf.FindB("Dinstall::NoSigCheck"):
-+	return 1
-+    keyrings = ""
-+    for keyring in Cnf.ValueList("Dinstall::Keyrings"):
-+	keyrings = keyrings + " --keyring " + keyring;
-+
-+    (result, output) = commands.getstatusoutput("gpg --emulate-md-encode-bug --batch --no-options --no-default-keyring --always-trust %s < %s >/dev/null" % (keyrings, filename))
-     if (result != 0):
-         reject_message = "Rejected: GPG signature check failed on `%s'.\n%s\n" % (os.path.basename(filename), output)
-         return 0
diff --git a/ChangeLog b/dak/ChangeLog
similarity index 100%
rename from ChangeLog
rename to dak/ChangeLog
diff --git a/tea b/dak/check_archive.py
similarity index 100%
rename from tea
rename to dak/check_archive.py
diff --git a/cindy b/dak/check_overrides.py
similarity index 100%
rename from cindy
rename to dak/check_overrides.py
diff --git a/jeri b/dak/check_proposed_updates.py
similarity index 100%
rename from jeri
rename to dak/check_proposed_updates.py
diff --git a/halle b/dak/clean_proposed_updates.py
similarity index 100%
rename from halle
rename to dak/clean_proposed_updates.py
diff --git a/shania b/dak/clean_queues.py
similarity index 100%
rename from shania
rename to dak/clean_queues.py
diff --git a/rhona b/dak/clean_suites.py
similarity index 100%
rename from rhona
rename to dak/clean_suites.py
diff --git a/andrea b/dak/compare_suites.py
similarity index 100%
rename from andrea
rename to dak/compare_suites.py
diff --git a/natalie b/dak/control_overrides.py
similarity index 100%
rename from natalie
rename to dak/control_overrides.py
diff --git a/heidi b/dak/control_suite.py
similarity index 100%
rename from heidi
rename to dak/control_suite.py
diff --git a/rene b/dak/cruft_report.py
similarity index 100%
rename from rene
rename to dak/cruft_report.py
diff --git a/ashley b/dak/decode_dot_dak.py
similarity index 100%
rename from ashley
rename to dak/decode_dot_dak.py
diff --git a/fernanda.py b/dak/examine_package.py
similarity index 100%
rename from fernanda.py
rename to dak/examine_package.py
diff --git a/rosamund b/dak/find_null_maintainers.py
similarity index 100%
rename from rosamund
rename to dak/find_null_maintainers.py
diff --git a/tiffani b/dak/generate_index_diffs.py
similarity index 100%
rename from tiffani
rename to dak/generate_index_diffs.py
diff --git a/ziyi b/dak/generate_releases.py
similarity index 100%
rename from ziyi
rename to dak/generate_releases.py
diff --git a/neve b/dak/import_archive.py
similarity index 100%
rename from neve
rename to dak/import_archive.py
diff --git a/emilie b/dak/import_ldap_fingerprints.py
similarity index 100%
rename from emilie
rename to dak/import_ldap_fingerprints.py
diff --git a/julia b/dak/import_users_from_passwd.py
similarity index 100%
rename from julia
rename to dak/import_users_from_passwd.py
diff --git a/alyson b/dak/init_db.py
similarity index 100%
rename from alyson
rename to dak/init_db.py
diff --git a/rose b/dak/init_dirs.py
similarity index 100%
rename from rose
rename to dak/init_dirs.py
diff --git a/db_access.py b/dak/lib/database.py
similarity index 100%
rename from db_access.py
rename to dak/lib/database.py
diff --git a/logging.py b/dak/lib/logging.py
similarity index 100%
rename from logging.py
rename to dak/lib/logging.py
diff --git a/katie.py b/dak/lib/queue.py
similarity index 100%
rename from katie.py
rename to dak/lib/queue.py
diff --git a/utils.py b/dak/lib/utils.py
similarity index 100%
rename from utils.py
rename to dak/lib/utils.py
diff --git a/madison b/dak/ls.py
similarity index 100%
rename from madison
rename to dak/ls.py
diff --git a/charisma b/dak/make_maintainers.py
similarity index 100%
rename from charisma
rename to dak/make_maintainers.py
diff --git a/denise b/dak/make_overrides.py
similarity index 100%
rename from denise
rename to dak/make_overrides.py
diff --git a/jenna b/dak/make_suite_file_list.py
similarity index 100%
rename from jenna
rename to dak/make_suite_file_list.py
diff --git a/billie b/dak/mirror_split.py
similarity index 100%
rename from billie
rename to dak/mirror_split.py
diff --git a/alicia b/dak/override.py
similarity index 100%
rename from alicia
rename to dak/override.py
diff --git a/catherine b/dak/poolize.py
similarity index 100%
rename from catherine
rename to dak/poolize.py
diff --git a/kelly b/dak/process_accepted.py
similarity index 100%
rename from kelly
rename to dak/process_accepted.py
diff --git a/lisa b/dak/process_new.py
similarity index 100%
rename from lisa
rename to dak/process_new.py
diff --git a/jennifer b/dak/process_unchecked.py
similarity index 100%
rename from jennifer
rename to dak/process_unchecked.py
diff --git a/helena b/dak/queue_report.py
similarity index 100%
rename from helena
rename to dak/queue_report.py
diff --git a/lauren b/dak/reject_proposed_updates.py
similarity index 100%
rename from lauren
rename to dak/reject_proposed_updates.py
diff --git a/melanie b/dak/rm.py
similarity index 100%
rename from melanie
rename to dak/rm.py
diff --git a/amber b/dak/security_install.py
similarity index 100%
rename from amber
rename to dak/security_install.py
diff --git a/shell.py b/dak/shell.py
similarity index 100%
rename from shell.py
rename to dak/shell.py
diff --git a/nina b/dak/split_done.py
similarity index 100%
rename from nina
rename to dak/split_done.py
diff --git a/saffron b/dak/stats.py
similarity index 100%
rename from saffron
rename to dak/stats.py
diff --git a/claire.py b/dak/symlink_dists.py
similarity index 100%
rename from claire.py
rename to dak/symlink_dists.py
diff --git a/test/001/1.dsc b/dak/test/001/1.dsc
similarity index 100%
rename from test/001/1.dsc
rename to dak/test/001/1.dsc
diff --git a/test/001/2.dsc b/dak/test/001/2.dsc
similarity index 100%
rename from test/001/2.dsc
rename to dak/test/001/2.dsc
diff --git a/test/001/3.dsc b/dak/test/001/3.dsc
similarity index 100%
rename from test/001/3.dsc
rename to dak/test/001/3.dsc
diff --git a/test/001/4.dsc b/dak/test/001/4.dsc
similarity index 100%
rename from test/001/4.dsc
rename to dak/test/001/4.dsc
diff --git a/test/001/5.dsc b/dak/test/001/5.dsc
similarity index 100%
rename from test/001/5.dsc
rename to dak/test/001/5.dsc
diff --git a/test/001/6.dsc b/dak/test/001/6.dsc
similarity index 100%
rename from test/001/6.dsc
rename to dak/test/001/6.dsc
diff --git a/test/001/test.py b/dak/test/001/test.py
similarity index 100%
rename from test/001/test.py
rename to dak/test/001/test.py
diff --git a/test/002/empty.changes b/dak/test/002/empty.changes
similarity index 100%
rename from test/002/empty.changes
rename to dak/test/002/empty.changes
diff --git a/test/002/test.py b/dak/test/002/test.py
similarity index 100%
rename from test/002/test.py
rename to dak/test/002/test.py
diff --git a/test/003/krb5_1.2.2-4_m68k.changes b/dak/test/003/krb5_1.2.2-4_m68k.changes
similarity index 100%
rename from test/003/krb5_1.2.2-4_m68k.changes
rename to dak/test/003/krb5_1.2.2-4_m68k.changes
diff --git a/test/003/test.py b/dak/test/003/test.py
similarity index 100%
rename from test/003/test.py
rename to dak/test/003/test.py
diff --git a/test/004/test.py b/dak/test/004/test.py
similarity index 100%
rename from test/004/test.py
rename to dak/test/004/test.py
diff --git a/test/005/bogus-post.changes b/dak/test/005/bogus-post.changes
similarity index 100%
rename from test/005/bogus-post.changes
rename to dak/test/005/bogus-post.changes
diff --git a/test/005/bogus-pre.changes b/dak/test/005/bogus-pre.changes
similarity index 100%
rename from test/005/bogus-pre.changes
rename to dak/test/005/bogus-pre.changes
diff --git a/test/005/test.py b/dak/test/005/test.py
similarity index 100%
rename from test/005/test.py
rename to dak/test/005/test.py
diff --git a/test/005/valid.changes b/dak/test/005/valid.changes
similarity index 100%
rename from test/005/valid.changes
rename to dak/test/005/valid.changes
diff --git a/test/006/test.py b/dak/test/006/test.py
similarity index 100%
rename from test/006/test.py
rename to dak/test/006/test.py
diff --git a/direport b/direport
deleted file mode 100755
index e9e05cac..00000000
--- a/direport
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/perl
-
-@t = ('BYHAND', 'CONFIRM', 'NEW', 'REJECT', 'INSTALL', 'SKIP');
-
-$/="";
-IR: while (<>) {
-  for $i (1..$#t) {
-    if (/^$t[$i]/m) {
-      $data[$i] .= "$_\n";
-      $cnt[$i]++;
-      
-      if ($t[$i] eq "NEW") {
-	($dist) = (/^NEW to (.*)/m);
-	while (/^\(new\) ([^_]*)_\S* (\S*) (\S*)$/mg) {
-	  ($n,$p,$s) = ($1,$2,$3);
-	  $p = "?" if (!$p);
-	  $s = "?" if (!$s);
-	  $s = "non-free/$p" if ($dist=~'non-free' && $s!~'non-free');
-	  $s = "contrib/$p" if ($dist=~'contrib' && $s!~'contrib');
-	  $l = length($n)>15 ? 30-length($n) : 15;
-	  for $d (split(/, /,$dist)) {
-	    $d.='-contrib' if ($s =~ 'contrib' && $d!~'contrib');
-	    $d.='-non-free' if ($s =~ 'non-free' && $d!~'non-free');
-	    $override{$d} .= sprintf("%-15s %-${l}s %s\n", $n, $p, $s)
-	      if (!$over{$n});
-	    $over{$n} = 1;
-	  }
-	}
-      }
-	
-      next IR;
-    }
-  }
-  $data[0] .= "$_\n";
-  $cnt[$i]++;
-}
-
-for $i (0..$#t) {
-  print "-"x40, "\n$cnt[$i] $t[$i]\n", "-"x40, "\n$data[$i]" if $cnt[$i];
-}
-print "-"x40, "\nOVERRIDE ADDITIONS\n", "-"x40,"\n";
-for $d (sort keys %override) {
-  print "-"x5," $d\n$override{$d}\n\n";
-}
diff --git a/NEWS b/docs/NEWS
similarity index 100%
rename from NEWS
rename to docs/NEWS
diff --git a/THANKS b/docs/THANKS
similarity index 100%
rename from THANKS
rename to docs/THANKS
diff --git a/TODO b/docs/TODO
similarity index 100%
rename from TODO
rename to docs/TODO
diff --git a/tagdb.dia b/docs/database.dia
similarity index 100%
rename from tagdb.dia
rename to docs/database.dia
diff --git a/copyoverrides b/scripts/debian/copyoverrides
similarity index 100%
rename from copyoverrides
rename to scripts/debian/copyoverrides
diff --git a/mkchecksums b/scripts/debian/mkchecksums
similarity index 100%
rename from mkchecksums
rename to scripts/debian/mkchecksums
diff --git a/mklslar b/scripts/debian/mklslar
similarity index 100%
rename from mklslar
rename to scripts/debian/mklslar
diff --git a/mkmaintainers b/scripts/debian/mkmaintainers
similarity index 100%
rename from mkmaintainers
rename to scripts/debian/mkmaintainers
diff --git a/saffron.R b/scripts/debian/saffron.R
similarity index 100%
rename from saffron.R
rename to scripts/debian/saffron.R
diff --git a/wanna-build/trigger.daily b/scripts/debian/trigger.daily
similarity index 100%
rename from wanna-build/trigger.daily
rename to scripts/debian/trigger.daily
diff --git a/update-bugdoctxt b/scripts/debian/update-bugdoctxt
similarity index 100%
rename from update-bugdoctxt
rename to scripts/debian/update-bugdoctxt
diff --git a/update-mailingliststxt b/scripts/debian/update-mailingliststxt
similarity index 100%
rename from update-mailingliststxt
rename to scripts/debian/update-mailingliststxt
diff --git a/update-mirrorlists b/scripts/debian/update-mirrorlists
similarity index 100%
rename from update-mirrorlists
rename to scripts/debian/update-mirrorlists
diff --git a/update-readmenonus b/scripts/debian/update-readmenonus
similarity index 100%
rename from update-readmenonus
rename to scripts/debian/update-readmenonus
diff --git a/add_constraints.sql b/setup/add_constraints.sql
similarity index 100%
rename from add_constraints.sql
rename to setup/add_constraints.sql
diff --git a/init_pool.sql b/setup/init_pool.sql
similarity index 100%
rename from init_pool.sql
rename to setup/init_pool.sql
diff --git a/init_pool.sql-security b/setup/init_pool.sql-security
similarity index 100%
rename from init_pool.sql-security
rename to setup/init_pool.sql-security
diff --git a/Makefile b/src/Makefile
similarity index 100%
rename from Makefile
rename to src/Makefile
diff --git a/sql-aptvc.cpp b/src/sql-aptvc.cpp
similarity index 100%
rename from sql-aptvc.cpp
rename to src/sql-aptvc.cpp