- Exclude kernel sources from popcon results, old data skews this badly.

- Remove old kernel sources from interesting-fromcd23, and various other
      removals and updates.
    - Update the task lists and popcon again.
    - Stop excluding 686 and 686-smp kernels, as these are probably the most
      popular, and they fit on CD#1 now.
This commit is contained in:
Joey Hess 2004-08-12 03:57:24 +00:00
parent 19d5f1de63
commit 285cb363a5
8 changed files with 16328 additions and 15507 deletions

View File

@ -1036,23 +1036,23 @@ conf:
mirrorcheck: ok apt-update
$(Q)$(apt) cache dumpavail | $(mirrorcheck)
update-popcon: tasks/popularity-contest-$(CODENAME)
tasks/popularity-contest-$(CODENAME):
update-popcon:
rm -f popcon-inst
( \
echo '/*' ; \
echo ' Popularity Contest results' ; \
echo ' See the README for details on updating.' ; \
echo '' ; \
echo ' Last update: $$''Date''$$' ; \
echo ' Last update: $(shell date)' ; \
echo '*/' ; \
echo '' ; \
) > $@
) > tasks/popularity-contest-$(CODENAME)
wget --output-document popcon-inst \
http://popcon.debian.org/main/by_inst \
http://popcon.debian.org/contrib/by_inst
grep -h '^[^#]' popcon-inst | egrep -v '(Total|-----)' | \
sort -rn -k3,3 -k7,7 -k4,4 | awk '{print $$2}' >> $@
sort -rn -k3,3 -k7,7 -k4,4 | grep -v kernel-source | \
awk '{print $$2}' >> tasks/popularity-contest-$(CODENAME)
rm -f popcon-inst
# Little trick to simplify things

8
debian/changelog vendored
View File

@ -57,6 +57,12 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
- Uncomment exclude lines.
- Remove the boot.bat script and redundant and incorrect README.tools.
The alternative is to maintain and document them.
- Exclude kernel sources from popcon results, old data skews this badly.
- Remove old kernel sources from interesting-fromcd23, and various other
removals and updates.
- Update the task lists and popcon again.
- Stop excluding 686 and 686-smp kernels, as these are probably the most
popular, and they fit on CD#1 now.
* Petter Reinholdtsen
- Regenereated tasks/popularity-contest-sarge based on the current data.
- Avoid kernel versions 2.4.24 and 2.6.3 on the first i386 CD, as we
@ -79,7 +85,7 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
- Redo m68k subarch boot/install for sarge.
- Bump all subarchs to 2.4 kernel, except mac.
- Add bvme6000 boot code.
- Workaround boot/install for non-DI_WWW_HOME case.
- Workaround boot/install for non-DI_WWW_HOME case.
* Santiago Garcia
- Update isolinux.bin to the version we are shipping with Sarge.
- Update debian-installer tasks.

View File

@ -11,14 +11,6 @@ not supported.
-----
Popularity contest results:
wget http://popcon.debian.org/main/by_inst
wget http://popcon.debian.org/contrib/by_inst
grep -h '^[^#]' by_inst* | egrep -v '(Total|-----)' | sort -rn -k3,3 -k7,7 -k4,4 | awk '{print $2}'
-----
THE "USEFUL CD 1 PROJECT" RATIONALE J.A. Bezemer, Jan-Apr 2001
costar@panic.et.tudelft.nl

View File

@ -41,20 +41,14 @@ kernel-image-2.4.25-1-k6
kernel-image-2.4.25-1-k7
kernel-image-2.4.25-1-k7-smp
kernel-image-2.4.26-1-586tsc
kernel-image-2.4.26-1-686
kernel-image-2.4.26-1-686-smp
kernel-image-2.4.26-1-k6
kernel-image-2.4.26-1-k7
kernel-image-2.4.26-1-k7-smp
kernel-image-2.4.27-1-586tsc
kernel-image-2.4.27-1-686
kernel-image-2.4.27-1-686-smp
kernel-image-2.4.27-1-k6
kernel-image-2.4.27-1-k7
kernel-image-2.4.27-1-k7-smp
kernel-image-2.4.28-1-586tsc
kernel-image-2.4.28-1-686
kernel-image-2.4.28-1-686-smp
kernel-image-2.4.28-1-k6
kernel-image-2.4.28-1-k7
kernel-image-2.4.28-1-k7-smp
@ -78,16 +72,10 @@ kernel-image-2.6.6-1-686
kernel-image-2.6.6-1-686-smp
kernel-image-2.6.6-1-k7
kernel-image-2.6.6-1-k7-smp
kernel-image-2.6.7-1-686
kernel-image-2.6.7-1-686-smp
kernel-image-2.6.7-1-k7
kernel-image-2.6.7-1-k7-smp
kernel-image-2.6.8-1-686
kernel-image-2.6.8-1-686-smp
kernel-image-2.6.8-1-k7
kernel-image-2.6.8-1-k7-smp
kernel-image-2.6.9-1-686
kernel-image-2.6.9-1-686-smp
kernel-image-2.6.9-1-k7
kernel-image-2.6.9-1-k7-smp
kernel-pcmcia-modules-2.4-386
@ -112,20 +100,14 @@ kernel-pcmcia-modules-2.4.25-1-k6
kernel-pcmcia-modules-2.4.25-1-k7
kernel-pcmcia-modules-2.4.25-1-k7-smp
kernel-pcmcia-modules-2.4.26-1-586tsc
kernel-pcmcia-modules-2.4.26-1-686
kernel-pcmcia-modules-2.4.26-1-686-smp
kernel-pcmcia-modules-2.4.26-1-k6
kernel-pcmcia-modules-2.4.26-1-k7
kernel-pcmcia-modules-2.4.26-1-k7-smp
kernel-pcmcia-modules-2.4.27-1-586tsc
kernel-pcmcia-modules-2.4.27-1-686
kernel-pcmcia-modules-2.4.27-1-686-smp
kernel-pcmcia-modules-2.4.27-1-k6
kernel-pcmcia-modules-2.4.27-1-k7
kernel-pcmcia-modules-2.4.27-1-k7-smp
kernel-pcmcia-modules-2.4.28-1-586tsc
kernel-pcmcia-modules-2.4.28-1-686
kernel-pcmcia-modules-2.4.28-1-686-smp
kernel-pcmcia-modules-2.4.28-1-k6
kernel-pcmcia-modules-2.4.28-1-k7
kernel-pcmcia-modules-2.4.28-1-k7-smp

View File

@ -1,18 +1,19 @@
/* Generally useful/interesting (and mostly small) packages that
would've ended up on CD 2 or 3 if we hadn't prevented it. */
many people expect on one of the first CDs even if they don't
show up near the top of popcon. */
dpkg-repack
grep-dctrl
hddtemp
martmontools
irda-tools
hwtools
acpid
apmd
noflushd
gpm
anacron
mc
iproute
iptables
host
bzip2
unzip
@ -32,69 +33,30 @@ kdm
pdmenu
slay
vlock
xosview
cvs
wget
masqmail
fetchmailconf
ntp-simple
elinks
w3m
konqueror
mtr
netcat
rsync
licq
centericq
pstotext
wv
a2ps
xkeycaps
gimp1.2
cupsys
sane
xsane
xscreensaver
xli
xmix
bplay
splay
xmp
mikmod
playmidi
smpeg-gtv
mp3blaster
id3
xmms
cd-discid
cdrdao
xcolorsel
xtoolwait
cdrecord
mkisofs
gphoto2
octave
csh
ee
kernel-source-2.4.21
kernel-source-2.2.25
pcmcia-source
mysql-client
xfonts-base-transcoded
g77
ddd
ccmalloc
diffstat
electric-fence
memprof
libgc6-dev
libltdl3
libltdl3-dev
stl-manual
bible-kjv
bible-kjv-text
verse
dictd
dict-vera
dict-jargon
mozilla
koffice

File diff suppressed because it is too large Load Diff

View File

@ -13,7 +13,6 @@ grep-dctrl -s Key -n -e '.*' /usr/share/tasksel/debian-tasks.desc | sed -e 's? *
apache2-mpm-prefork
bind9
canna
chinput
console-cyrillic
cpanel
@ -24,7 +23,6 @@ exim4
gnome-desktop-environment
jfbterm
kde
kterm
language-env
locales
manpages-de
@ -38,15 +36,12 @@ manpages-pt
manpages-ru
manpages-tr
manpages-zh
nabi
nfs-kernel-server
postgresql
rxvt-ml
samba
ttf-unfonts
x-window-system-core
xcin
xfonts-intl-japanese
xfonts-thai
xiterm+thai
zhcon

View File

@ -17,21 +17,134 @@ rm dumpavail
*
*/
doc-linux-ja-html
fortune-mod
gdm
gimp-help-sv
gnome
gnome-desktop-environment
hspell-gui
imhangul
imhangul-status-applet
kde
kde-i18n-ca
kde-i18n-da
kde-i18n-de
kde-i18n-el
kde-i18n-es
kde-i18n-fr
kde-i18n-he
kde-i18n-it
kde-i18n-ja
kde-i18n-lt
kde-i18n-nb
kde-i18n-nn
kde-i18n-pl
kde-i18n-ptbr
kde-i18n-ru
kde-i18n-sv
kde-i18n-tr
kde-i18n-uk
kde-i18n-zhcn
kde-i18n-zhtw
kinput2-canna-wnn
koffice-i18n-ca
koffice-i18n-da
koffice-i18n-el
koffice-i18n-he
koffice-i18n-it
koffice-i18n-sv
koffice-i18n-tr
kterm
menu
mozilla
mlterm
mozilla-browser
mozilla-firefox-locale-uk
mozilla-locale-auto
mozilla-locale-ca
mozilla-locale-da
mozilla-locale-de-at
mozilla-locale-el
mozilla-locale-it
mozilla-locale-ja
mozilla-locale-ptbr
mozilla-psm
mozilla-thunderbird-locale-uk
myspell-en-gb
myspell-en-us
nabi
openoffice.org
openoffice.org-bin
openoffice.org-help-de
openoffice.org-help-el
openoffice.org-help-en
openoffice.org-help-es
openoffice.org-help-fr
openoffice.org-help-it
openoffice.org-help-ja
openoffice.org-help-ko
openoffice.org-help-sv
openoffice.org-help-zh-cn
openoffice.org-help-zh-tw
openoffice.org-l10n-ca
openoffice.org-l10n-da
openoffice.org-l10n-de
openoffice.org-l10n-el
openoffice.org-l10n-es
openoffice.org-l10n-fr
openoffice.org-l10n-he
openoffice.org-l10n-it
openoffice.org-l10n-ja
openoffice.org-l10n-ko
openoffice.org-l10n-nb
openoffice.org-l10n-nn
openoffice.org-l10n-pl
openoffice.org-l10n-pt-br
openoffice.org-l10n-ru
openoffice.org-l10n-sv
openoffice.org-l10n-th
openoffice.org-l10n-tr
openoffice.org-l10n-zh-cn
openoffice.org-l10n-zh-tw
ttf-baekmuk
ttf-freefont
ttf-kochi-gothic
ttf-kochi-mincho
ttf-thryomanes
ttf-unfonts
x-window-system-core
xfonts-a12k12
xfonts-ayu
xfonts-baekmuk
xfonts-biznet-iso-8859-2-100dpi
xfonts-biznet-iso-8859-2-75dpi
xfonts-biznet-iso-8859-2-base
xfonts-bolkhov-cp1251-75dpi
xfonts-bolkhov-cp1251-misc
xfonts-bolkhov-koi8r-75dpi
xfonts-bolkhov-koi8r-misc
xfonts-bolkhov-koi8u-75dpi
xfonts-bolkhov-koi8u-misc
xfonts-cronyx-cp1251-100dpi
xfonts-cronyx-isocyr-100dpi
xfonts-cronyx-isocyr-75dpi
xfonts-cronyx-isocyr-misc
xfonts-cronyx-koi8r-100dpi
xfonts-cronyx-koi8u-100dpi
xfonts-cyrillic
xfonts-intl-european
xfonts-intl-japanese
xfonts-intl-japanese-big
xfonts-kaname
xfonts-kappa20
xfonts-marumoji
xfonts-mona
xfonts-mplus
xfonts-shinonome
xfonts-terminus
xmanpages-ja
xprt-xprintorg
xxkb
analog
apache2-doc
apache2-mpm-prefork
@ -87,6 +200,9 @@ mozilla-locale-ptbr
myspell-pt-br
openoffice.org-l10n-pt-br
util-linux-locales
kde-i18n-ptbr
mozilla-locale-ptbr
openoffice.org-l10n-pt-br
aspell-ca
icatalan
kde-i18n-ca
@ -97,11 +213,14 @@ myspell-ca
openoffice.org-l10n-ca
util-linux-locales
wcatalan
kde-i18n-ca
koffice-i18n-ca
mozilla-locale-ca
openoffice.org-l10n-ca
bg5ps
cce
chdrv
chinput
cjk-latex
cpanel
debian-zh-faq-s
fortune-zh
@ -129,10 +248,12 @@ yh
yiyantang
zh-autoconvert
zhcon
kde-i18n-zhcn
openoffice.org-help-zh-cn
openoffice.org-l10n-zh-cn
bg5ps
chdrv
chinput
cjk-latex
cpanel
debian-zh-faq-t
fortune-zh
@ -158,6 +279,9 @@ yh
yiyantang
zh-autoconvert
zhcon
kde-i18n-zhtw
openoffice.org-help-zh-tw
openoffice.org-l10n-zh-tw
console-cyrillic
konwert
language-env
@ -175,6 +299,20 @@ xfonts-cronyx-koi8r-100dpi
xfonts-cronyx-koi8u-100dpi
xfonts-cyrillic
xxkb
xfonts-bolkhov-cp1251-75dpi
xfonts-bolkhov-cp1251-misc
xfonts-bolkhov-koi8r-75dpi
xfonts-bolkhov-koi8r-misc
xfonts-bolkhov-koi8u-75dpi
xfonts-bolkhov-koi8u-misc
xfonts-cronyx-cp1251-100dpi
xfonts-cronyx-isocyr-100dpi
xfonts-cronyx-isocyr-75dpi
xfonts-cronyx-isocyr-misc
xfonts-cronyx-koi8r-100dpi
xfonts-cronyx-koi8u-100dpi
xfonts-cyrillic
xxkb
aspell-da
idanish
kde-i18n-da
@ -184,6 +322,10 @@ mozilla-locale-da
openoffice.org-l10n-da
util-linux-locales
wdanish
kde-i18n-da
koffice-i18n-da
mozilla-locale-da
openoffice.org-l10n-da
doc-debian-fr
doc-linux-fr-text
ifrench-gut
@ -195,7 +337,10 @@ openoffice.org-help-fr
openoffice.org-l10n-fr
wfrench
xfonts-intl-european
xtel
kde-i18n-fr
openoffice.org-help-fr
openoffice.org-l10n-fr
xfonts-intl-european
ding
doc-linux-de
ingerman
@ -210,6 +355,10 @@ openoffice.org-help-de
openoffice.org-l10n-de
trans-de-en
wngerman
kde-i18n-de
mozilla-locale-de-at
openoffice.org-help-de
openoffice.org-l10n-de
kde-i18n-el
koffice-i18n-el
language-env
@ -219,14 +368,26 @@ openoffice.org-l10n-el
ttf-freefont
ttf-thryomanes
xfonts-intl-european
kde-i18n-el
koffice-i18n-el
mozilla-locale-el
openoffice.org-help-el
openoffice.org-l10n-el
ttf-freefont
ttf-thryomanes
xfonts-intl-european
bidiv
culmus
hspell
hspell-gui
ivritex
kde-i18n-he
koffice-i18n-he
libfribidi0
openoffice.org-l10n-he
hspell-gui
kde-i18n-he
koffice-i18n-he
openoffice.org-l10n-he
apt-howto-it
aspell-it
debian-reference-it
@ -234,6 +395,7 @@ doc-linux-it
doc-linux-it-text
fortunes-it
iitalian
kde-i18n-it
koffice-i18n-it
language-env
maint-guide-it
@ -244,14 +406,18 @@ openoffice.org-help-it
openoffice.org-l10n-it
witalian
xfonts-intl-european
asiya24-vfont
kde-i18n-it
koffice-i18n-it
mozilla-locale-it
openoffice.org-help-it
openoffice.org-l10n-it
xfonts-intl-european
canna
canna-utils
dbskkd-cdb
doc-debian-ja
doc-linux-ja-html
doc-linux-ja-text
egg
freewnn-jserver
ja-trans
jfbterm
kde-i18n-ja
@ -260,35 +426,63 @@ kterm
language-env
lv
manpages-ja
manpages-ja-dev
mlterm
mozilla-locale-ja
nkf
openoffice.org-help-ja
openoffice.org-l10n-ja
skk
skkinput
ttf-kochi-gothic
ttf-kochi-mincho
xfonts-a12k12
xfonts-ayu
xfonts-base
xfonts-intl-japanese
xfonts-intl-japanese-big
xfonts-kaname
xfonts-kappa20
xfonts-marumoji
xfonts-mona
xfonts-mplus
xfonts-shinonome
xmanpages-ja
doc-linux-ja-html
kde-i18n-ja
kinput2-canna-wnn
kterm
mlterm
mozilla-locale-ja
openoffice.org-help-ja
openoffice.org-l10n-ja
ttf-kochi-gothic
ttf-kochi-mincho
xfonts-a12k12
xfonts-ayu
xfonts-intl-japanese
xfonts-intl-japanese-big
xfonts-kaname
xfonts-kappa20
xfonts-marumoji
xfonts-mona
xfonts-mplus
xfonts-shinonome
xmanpages-ja
yc-el
doc-debian-ko
doc-linux-text-ko
hlatex
hlatex-fonts-base
imhangul
imhangul-status-applet
jfbterm
language-env
manpages-ko
mozilla-locale-ko
mozilla-locale-auto
nabi
openoffice.org-help-ko
openoffice.org-l10n-ko
ttf-baekmuk
ttf-unfonts
xfonts-baekmuk
imhangul
imhangul-status-applet
mozilla-locale-auto
nabi
openoffice.org-help-ko
openoffice.org-l10n-ko
@ -299,6 +493,7 @@ ilithuanian
kde-i18n-lt
language-env
myspell-lt
kde-i18n-lt
aspell-no
inorwegian
kde-i18n-nb
@ -307,9 +502,14 @@ language-env
locales
myspell-nb
myspell-nn
tetex-brev
openoffice.org-l10n-nb
openoffice.org-l10n-nn
util-linux-locales
wnorwegian
kde-i18n-nb
kde-i18n-nn
openoffice.org-l10n-nb
openoffice.org-l10n-nn
doc-linux-pl
doc-linux-pl-html
fonty
@ -324,6 +524,11 @@ wpolish
xfonts-biznet-iso-8859-2-100dpi
xfonts-biznet-iso-8859-2-75dpi
xfonts-biznet-iso-8859-2-base
kde-i18n-pl
openoffice.org-l10n-pl
xfonts-biznet-iso-8859-2-100dpi
xfonts-biznet-iso-8859-2-75dpi
xfonts-biznet-iso-8859-2-base
console-cyrillic
irussian
kde-i18n-ru
@ -331,12 +536,19 @@ konwert
language-env
manpages-ru
mueller7-dict
myspell-ru
openoffice.org-l10n-ru
re
xfonts-bolkhov-koi8r-75dpi
xfonts-bolkhov-koi8r-misc
xfonts-cronyx-koi8r-100dpi
xfonts-intl-european
kde-i18n-ru
openoffice.org-l10n-ru
xfonts-bolkhov-koi8r-75dpi
xfonts-bolkhov-koi8r-misc
xfonts-cronyx-koi8r-100dpi
xfonts-intl-european
aspell-es
debian-guide-es
debian-reference-es
@ -354,6 +566,26 @@ openoffice.org-help-es
openoffice.org-l10n-es
util-linux-locales
wspanish
kde-i18n-es
openoffice.org-help-es
openoffice.org-l10n-es
aspell-sv
doc-linux-sv-html
gimp-help-sv
iswedish
kde-i18n-sv
koffice-i18n-sv
locales
myspell-sv-se
openoffice.org-help-sv
openoffice.org-l10n-sv
util-linux-locales
wswedish
gimp-help-sv
kde-i18n-sv
koffice-i18n-sv
openoffice.org-help-sv
openoffice.org-l10n-sv
cttex
language-env
nonlock
@ -361,12 +593,20 @@ openoffice.org-l10n-th
ttmkfdir
xfonts-thai
xiterm+thai
openoffice.org-l10n-th
console-terminus
kde-i18n-tr
koffice-i18n-tr
language-env
locales
manpages-tr
openoffice.org-l10n-tr
util-linux-locales
xfonts-terminus
kde-i18n-tr
koffice-i18n-tr
openoffice.org-l10n-tr
xfonts-terminus
aspell-ukr
console-cyrillic
kde-i18n-uk
@ -378,3 +618,10 @@ xfonts-bolkhov-koi8u-75dpi
xfonts-bolkhov-koi8u-misc
xfonts-cronyx-koi8u-100dpi
xfonts-intl-european
kde-i18n-uk
mozilla-firefox-locale-uk
mozilla-thunderbird-locale-uk
xfonts-bolkhov-koi8u-75dpi
xfonts-bolkhov-koi8u-misc
xfonts-cronyx-koi8u-100dpi
xfonts-intl-european