[Cdd-commits] r396 - cdd/trunk/cdd/debian

[CDD Subversion Commit]

Author: tille
Date: Mon Sep 26 10:55:51 2005
New Revision: 396

Modified:
   cdd/trunk/cdd/debian/changelog
   cdd/trunk/cdd/debian/control
   cdd/trunk/cdd/debian/lintian.overrides
Log:
Fixed some dependencies


Modified: cdd/trunk/cdd/debian/changelog
==============================================================================
--- cdd/trunk/cdd/debian/changelog	(original)
+++ cdd/trunk/cdd/debian/changelog	Mon Sep 26 10:55:51 2005
@@ -3,6 +3,13 @@
   * Fix problem with resulting *.dsc files that did not list the
     files that were actually created in the Binary line
   * No changes necessary Standards-Version: 3.6.2
+  * Removed: Conflicts: med-common (<= 0.4); which was never released
+    in stable
+  * Removed Depends: debconf (>= 0.5) - there is no debconf usage in cdd
+    directly
+  * Increased dependant menu version from 2.1.12 to 2.1.25
+  * Adapted lintian.overrides to reflect the change in menu
+    (files now in /usr/share/menu instead of /usr/lib/menu)
 
  -- Andreas Tille <tille at debian.org>  Sun, 25 Sep 2005 21:36:29 +0200
 

Modified: cdd/trunk/cdd/debian/control
==============================================================================
--- cdd/trunk/cdd/debian/control	(original)
+++ cdd/trunk/cdd/debian/control	Mon Sep 26 10:55:51 2005
@@ -9,7 +9,6 @@
 Package: cdd-dev
 Architecture: all
 Section: devel
-Depends: ${misc:Depends}
 Suggests: cdd-doc
 Description: Custom Debian Distributions common files for developing meta packages
  This package makes life easier when packaging meta packages.  Perhaps
@@ -20,8 +19,7 @@
 Package: cdd-common
 Architecture: all
 Section: misc
-Depends: adduser, ${misc:Depends}
-Conflicts: med-common (<= 0.4)
+Depends: adduser, menu (>= 2.1.25)
 Suggests: cdd-doc
 Description: Custom Debian Distributions common package
  This package builds the basic infra structure for meta packages.

Modified: cdd/trunk/cdd/debian/lintian.overrides
==============================================================================
--- cdd/trunk/cdd/debian/lintian.overrides	(original)
+++ cdd/trunk/cdd/debian/lintian.overrides	Mon Sep 26 10:55:51 2005
@@ -4,9 +4,9 @@
 # That's why neither postinst nor postrm will call update-menus and
 # if they would it would just be a useless call because it just exits 0
 # if called by root.
-cdd-common: postinst-does-not-call-updatemenus usr/lib/menu/cdd-menu
-cdd-common: postrm-does-not-call-updatemenus usr/lib/menu/cdd-menu
+cdd-common: postinst-does-not-call-updatemenus usr/share/menu/cdd-menu
+cdd-common: postrm-does-not-call-updatemenus usr/share/menu/cdd-menu
 
 # For obvious reasons the script has to be executable which is the
 # intended use for scripts which dynamically create menu entries.
-cdd-common: executable-in-usr-lib-menu usr/lib/menu/cdd-menu 0755
+cdd-common: executable-in-usr-lib-menu usr/share/menu/cdd-menu 0755