remove colordiff from ftpmaster package, move to -poneys

diff --git a/debian/changelog b/debian/changelog
index 52c4b817c8f63ba7b69a2fa904808f768694d1e9..1fbd9170190b4980f26a669c16073be69e783290 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ debian.org (4XXX) Xnstable; urgency=low
     - remove quinn-diff
     - remove python-coverage-test-runner
     - add libdpkg-perl
+  * ftpmaster-poneys:
+    - add colordiff
 
   [ Steve McIntyre ]
   * cdimage-search.debian.org
@@ -27,11 +29,7 @@ debian.org (4XXX) Xnstable; urgency=low
     - add iso-codes
     - add isoquery (Bug#624150)
 
-  [ Martin Zobel-Helas ]
-  * ftpmaster:
-    - add colordiff
-
- -- Martin Zobel-Helas <zobel@debian.org>  Sun, 01 May 2011 18:50:09 +0200
+ -- Peter Palfrader <weasel@debian.org>  Mon, 02 May 2011 11:40:15 +0200
 
 debian.org (43.3) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 2646928b922ee983f81a0355fae01718eeeea0b2..36e9870cb028e461643707c5a4af2635d5922a80 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -343,7 +343,7 @@ Depends: apt-utils,
        libxml-rss-perl,
        ghostscript,
        perforate,
-       wdiff,colordiff
+       wdiff,
        xz-utils (>= 4.999.9beta+20100713-1~bpo50+1)
 Description: metapackage for ftpmaster
  This package depends on everything that is needed for an ftpmaster setup.
@@ -358,7 +358,8 @@ Depends: bicyclerepair,
        pylint,
        python-mode,
        ruby-elisp,
-       gitstats
+       gitstats,
+       colordiff
 Description: metapackage for ftpmaster extras
  Things not really needed needed.