Browse Source

* Patch from Romain BEAUGRAND <rbeaugrand@easter-eggs.com> to order()

to fix the case of a package with no deps, which is added to the head
     of the list. Closes: #95315

r567
keep-around/c8703c509368e1805e513d61f98a9d17d2cdd9cc
Joey Hess 22 years ago
parent
commit
7818150b59
  1. 2
      TODO
  2. 8
      debian/changelog
  3. 4
      debian/control
  4. 6
      debian/rules
  5. 8
      main-menu.c

2
TODO

@ -14,7 +14,7 @@
linear mode. (BEST)
* Update to new debconf stuff -- no isdefault flag setting needed; use seen
flag instead.
flag instead. Waiting for cdebconf to support it..
* Figure out how to handle configuring only one virtual package (pick off
of a menu?) if the menu item depends on a virtual package.
Aj:

8
debian/changelog

@ -1,3 +1,11 @@
main-menu (0.008) unstable; urgency=low
* Patch from Romain BEAUGRAND <rbeaugrand@easter-eggs.com> to order()
to fix the case of a package with no deps, which is added to the head
of the list. Closes: #95315
-- Joey Hess <joeyh@debian.org> Thu, 3 May 2001 21:12:57 -0400
main-menu (0.007) unstable; urgency=low
* Really allow retrying of failed menu entries.

4
debian/control

@ -2,8 +2,8 @@ Source: main-menu
Section: debian-installer
Priority: standard
Maintainer: Joey Hess <joeyh@debian.org>
Build-Depends: debhelper (>= 2.1.18), dpkg-dev (>= 1.7.0), cdebconf-dev
Standards-Version: 3.5.0.0
Build-Depends: debhelper (>= 2.1.18), dpkg-dev (>= 1.7.0), cdebconf-dev, dpkg-dev (>= 1.9)
Standards-Version: 3.5.4.0
Package: main-menu
Architecture: any

6
debian/rules

@ -12,7 +12,6 @@ PACKAGE=$(shell dh_listpackages)
VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
ARCH=$(shell dpkg --print-architecture)
FILENAME=$(PACKAGE)_$(VERSION)_$(ARCH).udeb
PRIORITY=$(shell grep ^Priority: debian/control | cut -d ' ' -f 2)
build: build-stamp
build-stamp:
@ -50,10 +49,7 @@ binary-arch: build install
dh_fixperms
dh_installdeb
dh_shlibdeps
# Don't write your stupid guesses to debian/files.
dh_gencontrol -- -fdebian/files~
# Register file manually.
dpkg-distaddfile $(FILENAME) debian-installer $(PRIORITY)
dh_gencontrol -- -n$(FILENAME)
dh_builddeb --filename=$(FILENAME)
binary: binary-indep binary-arch

8
main-menu.c

@ -61,13 +61,13 @@ void order(struct package_t *p, struct package_t **head, struct package_t **tail
order(found, head, tail);
}
if (*head) {
if (*head)
(*tail)->next = *tail = p;
(*tail)->next = NULL;
}
else
*head = *tail = p;
(*tail)->next = NULL;
p->processed = 1;
}

Loading…
Cancel
Save