main-menu cleanup, and build-depends fix
Hi,
Some minor changes:
main-menu.c: avoid warnings
control: main-menu build-depends on the newest libdebian-installer.
MfG
Goswin
----------------------------------------------------------------------
Index: main-menu.c
===================================================================
RCS file: /cvs/debian-boot/debian-installer/main-menu/main-menu.c,v
retrieving revision 1.95
diff -u -p -r1.95 main-menu.c
--- main-menu.c 5 Oct 2003 14:53:04 -0000 1.95
+++ main-menu.c 5 Oct 2003 17:15:59 -0000
@@ -237,7 +237,7 @@ static int check_special(di_system_packa
static int satisfy_virtual(di_system_package *p) {
di_slist_node *node;
di_system_package *dep, *defpkg = NULL;
- char *choice = NULL, *language = NULL;
+ char *language = NULL;
char buf[256], *menu, *s = NULL;
size_t menu_size, menu_used, size;
int is_menu_item = 0;
@@ -426,7 +426,7 @@ static void modify_debconf_priority (int
if ( ! debconf->value )
pri = 1;
else
- for (pri = 0; pri < ARRAY_SIZE(debconf_priorities); ++pri) {
+ for (pri = 0; (unsigned)pri < ARRAY_SIZE(debconf_priorities); ++pri) {
if (0 == strcmp(debconf->value,
debconf_priorities[pri]) )
break;
@@ -457,7 +457,7 @@ static void adjust_default_priority (voi
if ( ! debconf->value )
pri = 1;
else
- for (pri = 0; pri < ARRAY_SIZE(debconf_priorities); ++pri) {
+ for (pri = 0; (unsigned)pri < ARRAY_SIZE(debconf_priorities); ++pri) {
if (0 == strcmp(debconf->value,
debconf_priorities[pri]) )
break;
@@ -471,6 +471,7 @@ static void adjust_default_priority (voi
}
int main (int argc, char **argv) {
+ if (argc) { } // avoid warning
di_system_package *p;
di_packages *packages;
di_packages_allocator *allocator;
Index: debian/control
===================================================================
RCS file: /cvs/debian-boot/debian-installer/main-menu/debian/control,v
retrieving revision 1.23
diff -u -p -r1.23 control
--- debian/control 5 Oct 2003 13:13:36 -0000 1.23
+++ debian/control 5 Oct 2003 17:15:59 -0000
@@ -3,7 +3,7 @@ Section: debian-installer
Priority: standard
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Uploaders: Joey Hess <joeyh@debian.org>, Tollef Fog Heen <tfheen@debian.org>, Martin Sjogren <sjogren@debian.org>
-Build-Depends: debhelper (>= 4.1.13), dpkg-dev (>= 1.7.0), libdebconfclient-dev, dpkg-dev (>= 1.9), libdebian-installer4-dev, po-debconf (>= 0.5.0)
+Build-Depends: debhelper (>= 4.1.13), dpkg-dev (>= 1.7.0), libdebconfclient-dev, dpkg-dev (>= 1.9), libdebian-installer4-dev (>=0.17), po-debconf (>= 0.5.0)
Standards-Version: 3.6.0
Package: main-menu
Reply to: