[Secure-testing-commits] r13608 - in data: . packages

[Michael Gilbert]

Author: gilbert-guest
Date: 2009-12-20 05:08:20 +0000 (Sun, 20 Dec 2009)
New Revision: 13608

Modified:
   data/embedded-code-copies
   data/packages/removed-packages
Log:
fix up tracking of some embeds

Modified: data/embedded-code-copies
===================================================================
--- data/embedded-code-copies	2009-12-19 21:34:50 UTC (rev 13607)
+++ data/embedded-code-copies	2009-12-20 05:08:20 UTC (rev 13608)
@@ -15,11 +15,10 @@
         be determined, or <unfixable> for unavoidable cases (e.g., forks
         that add real value)
 sort: static (linking statically against a lib)
-      embed (embedding a copy of the library into another source package)
-      fork (the package is not just embedding code but it is a fork and
-            thus might share parts of the source code)
-      old-version (the package is an older version of essentially
-                   the same code)
+      embed (embeds a copy of the library into another source package)
+      modified-embed (embeds a code copy that differs from upstream code)
+      fork (a full-blown fork of another source package)
+      old-version (an older version of essentially the same code)
 
 The srcpkg might be some string to identify the code if there is no
 specific source package.
@@ -162,15 +161,15 @@
 	- mysql-ocaml <unfixed> (embed)
 	- php4 <unfixed> (embed)
 
-iceape
-	- iceweasel <unfixed> (fork)
-	- icedove <unfixed> (fork)
-	- xulrunner <unfixed> (fork)
+xulrunner
+	- iceape <unfixed> (embed; bug #561749)
+	- iceweasel 2.0.0.19 (embed)
+	- icedove <unfixed> (embed; bug #561750)
 	- kompozer <unfixed> (embed; bug #532168)
-	- galeon <unfixed> (fork)
-	- epiphany-browser <unfixed> (fork)
-	- conkeror <unfixed> (fork)
-	- kazehakase <unfixed> (fork)
+	- galeon 2.0.2-4 (embed)
+	- epiphany-browser 2.14.3-8 (embed)
+	- conkeror 0.9~git080629-2 (embed)
+	- kazehakase 0.4.2-1 (embed)
 
 xli
 	- xloadimage <unfixed> (embed)
@@ -868,7 +867,7 @@
 	- qt4-x11 <unfixed> (embed)
 
 libzip
-	- php5 <unfixed> (fork)
+	- php5 <unfixable> (modified-embed)
 	- odt2txt <unfixed> (embed; bug #523808)
 
 json.php (not packaged; should be replaced with php's built-in functions)
@@ -1578,7 +1577,7 @@
 	- sbnc 1.2-8 (embed)
 	- sdcc <unfixed> (embed)
 	- wml <unfixed> (embed)
-	- proftpd-dfsg <unfixed> (embed)
+	- proftpd-dfsg <unfixed> (embed; bug #561748)
 	- babel 1.4.0.dfsg-5 (embed)
 	- libprelude 0.9.14-2 (embed)
 	- heartbeat 2.1.4-7 (embed)
@@ -1597,3 +1596,6 @@
 
 ghostscript
 	- gs-gpl <removed> (old-version)
+
+icedove
+	- thunderbird <removed> (old-version)

Modified: data/packages/removed-packages
===================================================================
--- data/packages/removed-packages	2009-12-19 21:34:50 UTC (rev 13607)
+++ data/packages/removed-packages	2009-12-20 05:08:20 UTC (rev 13608)
@@ -45,6 +45,7 @@
 kernel-patch-ctx
 kernel-source-2.2.10
 kernel-source-2.2.19
+kernel-source-2.2.20
 kernel-source-2.2.22
 kernel-source-2.4.16
 kernel-source-2.4.17