From: Matthijs Kooijman Date: Wed, 27 Jan 2010 14:29:51 +0000 (+0100) Subject: apt-repository: Move equivs files into a separate dir. X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=468c04aedfcff8394549bf7d71a60bc9497fdfdf;p=apt-repository.git apt-repository: Move equivs files into a separate dir. --- diff --git a/rebuild b/rebuild index 95f7699..60d1db0 100755 --- a/rebuild +++ b/rebuild @@ -1,5 +1,5 @@ #!/bin/sh -SOURCES=sources +SOURCES=sources/equivs PACKAGES=public/packages mkdir -p $PACKAGES diff --git a/sources/debian-base-minimal b/sources/debian-base-minimal deleted file mode 100644 index 6c30a8f..0000000 --- a/sources/debian-base-minimal +++ /dev/null @@ -1,16 +0,0 @@ -Package: debian-base-minimal -Version: 4 -Depends: aptitude, info, - iputils-ping, locales, logrotate, man-db, manpages, netbase, - netcat-traditional, passwd, procps, system-log-daemon, - traceroute, whiptail, wget, apt-utils -Description: Dummy package depending on useful packages from the base system - Depends on all useful packages from the base system (some are excluded by - hand). - - This package depends on the base system installed by debootstrap (which is - less than what debian-installer gives you). - - Packages removed are: vim-tiny, dmidecode, ed, cpio, libconsole, - module-init-tools, nano, tasksel, tcpd, update-inetd, dhcp3-client, iproute, - iptables, adduser, linux-kernel-log-daemon. diff --git a/sources/debian-base-normal b/sources/debian-base-normal deleted file mode 100644 index 1d38e27..0000000 --- a/sources/debian-base-normal +++ /dev/null @@ -1,11 +0,0 @@ -Package: debian-base-normal -Version: 6 -Depends: debian-base-minimal, bzip2, console-common, console-data, - console-tools, usbutils, grub, dhcp3-client, iptables, iproute, adduser, - linux-kernel-log-daemon, at, bc, dc, dnsutils, doc-debian, nano, patch, time, - w3m -Description: Dummy package depending on useful packages from the base system - Depends on all useful packages from the base system (some are excluded by - hand). - - This package depends on the base system installed by debian-installer. diff --git a/sources/debian-useful-desktop b/sources/debian-useful-desktop deleted file mode 100644 index 67b0bbe..0000000 --- a/sources/debian-useful-desktop +++ /dev/null @@ -1,9 +0,0 @@ -Package: debian-useful-desktop -Version: 1 -Depends: debian-useful-normal, build-essential, popularity-contest, - avahi-daemon -Maintainer: Matthijs Kooijman -Description: Package depending on some useful packages - These packages were selected by Matthijs and should be installed on any - Debian system that is used as a desktop system (ie, someone works on it - directly). diff --git a/sources/debian-useful-minimal b/sources/debian-useful-minimal deleted file mode 100644 index d7a9860..0000000 --- a/sources/debian-useful-minimal +++ /dev/null @@ -1,8 +0,0 @@ -Package: debian-useful-minimal -Version: 4 -Depends: debian-base-minimal, host, less, ssh, sudo, vim, wget, reportbug, - lsof, screen, whois, bash-completion -Maintainer: Matthijs Kooijman -Description: Package depending on some useful packages - These packages were selected by Matthijs and should be installed on any - sane Debian machine, vserver, or whatever. diff --git a/sources/debian-useful-normal b/sources/debian-useful-normal deleted file mode 100644 index f43afaa..0000000 --- a/sources/debian-useful-normal +++ /dev/null @@ -1,8 +0,0 @@ -Package: debian-useful-normal -Version: 7 -Depends: debian-base-normal, debian-useful-minimal (>= 2), acpid, ifplugd, - lvm2, pciutils, tcpdump, nmap, openntpd -Maintainer: Matthijs Kooijman -Description: Package depending on some useful packages - These packages were selected by Matthijs and should be installed on any - normal Debian machine (ie, one that is a full, networked system). diff --git a/sources/debian-useful-server b/sources/debian-useful-server deleted file mode 100644 index d7c5810..0000000 --- a/sources/debian-useful-server +++ /dev/null @@ -1,10 +0,0 @@ -Package: debian-useful-server -Version: 2 -Depends: debian-useful-normal, git-core -Maintainer: Matthijs Kooijman -Description: Package depending on some useful packages - These packages were selected by Matthijs and should be installed on any - Debian machine running as an unattended server. - - This contains the following packages: - * git-core: To keep track of server configuration files. diff --git a/sources/debian-useful-vserver b/sources/debian-useful-vserver deleted file mode 100644 index 0e803ae..0000000 --- a/sources/debian-useful-vserver +++ /dev/null @@ -1,7 +0,0 @@ -Package: debian-useful-vserver -Version: 6 -Depends: debian-useful-minimal (>= 2),libpam-ldap, libnss-ldap, nullmailer | mail-transport-agent, git-core, acl -Maintainer: Matthijs Kooijman -Description: Package depending on some useful packages - These packages were selected by Matthijs and should be installed on any - Debian machine vserver guest. diff --git a/sources/equivs/debian-base-minimal b/sources/equivs/debian-base-minimal new file mode 100644 index 0000000..6c30a8f --- /dev/null +++ b/sources/equivs/debian-base-minimal @@ -0,0 +1,16 @@ +Package: debian-base-minimal +Version: 4 +Depends: aptitude, info, + iputils-ping, locales, logrotate, man-db, manpages, netbase, + netcat-traditional, passwd, procps, system-log-daemon, + traceroute, whiptail, wget, apt-utils +Description: Dummy package depending on useful packages from the base system + Depends on all useful packages from the base system (some are excluded by + hand). + + This package depends on the base system installed by debootstrap (which is + less than what debian-installer gives you). + + Packages removed are: vim-tiny, dmidecode, ed, cpio, libconsole, + module-init-tools, nano, tasksel, tcpd, update-inetd, dhcp3-client, iproute, + iptables, adduser, linux-kernel-log-daemon. diff --git a/sources/equivs/debian-base-normal b/sources/equivs/debian-base-normal new file mode 100644 index 0000000..1d38e27 --- /dev/null +++ b/sources/equivs/debian-base-normal @@ -0,0 +1,11 @@ +Package: debian-base-normal +Version: 6 +Depends: debian-base-minimal, bzip2, console-common, console-data, + console-tools, usbutils, grub, dhcp3-client, iptables, iproute, adduser, + linux-kernel-log-daemon, at, bc, dc, dnsutils, doc-debian, nano, patch, time, + w3m +Description: Dummy package depending on useful packages from the base system + Depends on all useful packages from the base system (some are excluded by + hand). + + This package depends on the base system installed by debian-installer. diff --git a/sources/equivs/debian-useful-desktop b/sources/equivs/debian-useful-desktop new file mode 100644 index 0000000..67b0bbe --- /dev/null +++ b/sources/equivs/debian-useful-desktop @@ -0,0 +1,9 @@ +Package: debian-useful-desktop +Version: 1 +Depends: debian-useful-normal, build-essential, popularity-contest, + avahi-daemon +Maintainer: Matthijs Kooijman +Description: Package depending on some useful packages + These packages were selected by Matthijs and should be installed on any + Debian system that is used as a desktop system (ie, someone works on it + directly). diff --git a/sources/equivs/debian-useful-minimal b/sources/equivs/debian-useful-minimal new file mode 100644 index 0000000..d7a9860 --- /dev/null +++ b/sources/equivs/debian-useful-minimal @@ -0,0 +1,8 @@ +Package: debian-useful-minimal +Version: 4 +Depends: debian-base-minimal, host, less, ssh, sudo, vim, wget, reportbug, + lsof, screen, whois, bash-completion +Maintainer: Matthijs Kooijman +Description: Package depending on some useful packages + These packages were selected by Matthijs and should be installed on any + sane Debian machine, vserver, or whatever. diff --git a/sources/equivs/debian-useful-normal b/sources/equivs/debian-useful-normal new file mode 100644 index 0000000..f43afaa --- /dev/null +++ b/sources/equivs/debian-useful-normal @@ -0,0 +1,8 @@ +Package: debian-useful-normal +Version: 7 +Depends: debian-base-normal, debian-useful-minimal (>= 2), acpid, ifplugd, + lvm2, pciutils, tcpdump, nmap, openntpd +Maintainer: Matthijs Kooijman +Description: Package depending on some useful packages + These packages were selected by Matthijs and should be installed on any + normal Debian machine (ie, one that is a full, networked system). diff --git a/sources/equivs/debian-useful-server b/sources/equivs/debian-useful-server new file mode 100644 index 0000000..d7c5810 --- /dev/null +++ b/sources/equivs/debian-useful-server @@ -0,0 +1,10 @@ +Package: debian-useful-server +Version: 2 +Depends: debian-useful-normal, git-core +Maintainer: Matthijs Kooijman +Description: Package depending on some useful packages + These packages were selected by Matthijs and should be installed on any + Debian machine running as an unattended server. + + This contains the following packages: + * git-core: To keep track of server configuration files. diff --git a/sources/equivs/debian-useful-vserver b/sources/equivs/debian-useful-vserver new file mode 100644 index 0000000..0e803ae --- /dev/null +++ b/sources/equivs/debian-useful-vserver @@ -0,0 +1,7 @@ +Package: debian-useful-vserver +Version: 6 +Depends: debian-useful-minimal (>= 2),libpam-ldap, libnss-ldap, nullmailer | mail-transport-agent, git-core, acl +Maintainer: Matthijs Kooijman +Description: Package depending on some useful packages + These packages were selected by Matthijs and should be installed on any + Debian machine vserver guest.