sync

diff --git a/THANKS b/THANKS
index 7ac86047e752773dab0e37870dc7712bcd5d5831..d6c28795ebaacf334bb3e5515c0fd46c43dfa84e 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -16,6 +16,7 @@ Drake Diedrich                       <dld@debian.org>
 Guy Maor                      <maor@debian.org>
 Jason Gunthorpe                       <jgg@debian.org>
 Joey Hess                     <joeyh@debian.org>
+Josip Rodin                   <joy@debian.org>
 Mark Brown                    <broonie@debian.org>
 Martin Michlmayr              <tbm@debian.org>
 Michael Beattie                       <mjb@debian.org>

diff --git a/TODO b/TODO
index 26b3d06d40aeb764b0d15f620af93f3372815561..f7c3371ebd099faca46770b3fcdc20caf65d17bf 100644 (file)
--- a/TODO
+++ b/TODO
@@ -4,14 +4,12 @@ TOFIX
 Urgent
 ------
 
-  o migrate proposed-updates and experimental to the pool; this allows
-    us to remove the null component handling and de facto fixes the
-    ssh + w3m multi-component problem.
+  o migrate non-US proposed-updates to the pool; this allows us to
+    remove the null component handling and de facto fixes the ssh
+    multi-component problem.
 
   o Write something to sync architectures.
 
-  o Make experimental work
-
   o fix katie's handling of source packages in different directories;
     e.g. if a package moves from main to contrib, the .orig.tar.gz
     needs to what? copy or be moved and old source removed; one of the
@@ -29,6 +27,8 @@ Urgent
 
   o Add urgency to DB for testing
 
+  o [Easy] Enable catherine
+
 Less Urgent
 -----------