Merge remote branch 'sledge/master'

* sledge/master:
  add cdimage-search metapackage
  changelog entry for recent change
  add dosfstools for cdbuilder

Signed-off-by: Peter Palfrader <peter@palfrader.org>

diff --git a/debian/changelog b/debian/changelog
index 06ce61e23863006e99781d2e5d9d7d95e9ab1380..69990511f28e68f4628a5cd8c7b9b17267473745 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ debian.org (4XXX) Xnstable; urgency=low
     - add libdbd-sqlite3-perl
   * apt-in-chroot: "fix" bashism.
 
+  [ Steve McIntyre ]
+  * cdimage-search.debian.org
+    - add cdimage-search metapackage
+
  -- Peter Palfrader <weasel@debian.org>  Fri, 01 Apr 2011 22:55:17 +0200
 
 debian.org (43.3) unstable; urgency=low

diff --git a/debian/control b/debian/control
index f5279b2a857f2d27752902c0436506d7e19a5811..3f04fb33d027920942dee5760ced28eb073632b8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -399,6 +399,12 @@ Depends: bittornado,
 Description: metapackage for cdbuilder
  This package depends on all the packages that are needed for a cdbuilder setup.
 
+Package: debian.org-cdimage-search.debian.org
+Architecture: all
+Depends: libconfigreader-simple-perl
+Description: metapackage for cdimage-search.debian.org
+ This package depends on all the packages that are needed for the CD/DVD search CGI website
+
 Package: debian.org-manpages.debian.org
 Architecture: all
 Depends: locales-all,