diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-10-31 00:09:07 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-10-31 00:09:07 +0100 |
| commit | 60d0f60fd744f491c8e6c4ef8b6cdf99cbafd725 (patch) | |
| tree | 5adef00c50b9b29ed8f9cda1d6b3010c4a25b96e /debian/control | |
| parent | 7d45df0f60658c229989ff8f275691ddd49cb150 (diff) | |
| parent | ce7fb7fffac216476bb287950d463328c34849d7 (diff) | |
Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd
Conflicts:
debian/changelog
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/control b/debian/control index 969dc9e9..96b4ae16 100644 --- a/debian/control +++ b/debian/control @@ -19,11 +19,11 @@ Essential: yes Depends: ${misc:Depends}, sysv-rc, ${shlibs:Depends} Breaks: gnumach (<< 2:1.3.99.dfsg.cvs20070526-1), libc0.3 (<< 2.11.2-12) Suggests: hurd-doc -Provides: makedev, login, random-egd +Provides: makedev, login Replaces: makedev, login, random-egd -Conflicts: makedev, login, random-egd +Conflicts: makedev, login Architecture: hurd-i386 -Description: The GNU Hurd +Description: GNU Hurd This is the GNU Hurd package. It contains essential system software and libraries. @@ -31,11 +31,11 @@ Package: hurd-dev Priority: standard Section: libdevel Architecture: hurd-i386 -Depends: ${misc:Depends}, hurd +Depends: ${misc:Depends}, hurd (= ${binary:Version}) Provides: libsem-dev Replaces: libsem-dev Conflicts: libsem-dev -Description: The GNU Hurd (development files) +Description: GNU Hurd (development files) This package includes the header files and the static libraries. Package: hurd-dbg @@ -43,7 +43,7 @@ Priority: extra Section: debug Architecture: hurd-i386 Depends: ${misc:Depends}, hurd (= ${binary:Version}) -Description: The GNU Hurd (debugging files) +Description: GNU Hurd (debugging files) This package includes the unstripped binaries and libraries. Package: hurd-doc @@ -52,7 +52,7 @@ Section: doc Architecture: all Depends: ${misc:Depends} Suggests: hurd (>= ${source:Version}) -Description: The GNU Hurd manual +Description: GNU Hurd manual This package includes the manual in info and HTML format. Package: hurd-udeb @@ -62,6 +62,6 @@ Section: debian-installer Architecture: hurd-i386 Depends: ${misc:Depends} Provides: hurd, ext2-modules, fat-modules, ipv6-modules, isofs-modules, loop-modules, mouse-modules, nfs-modules, socket-modules, ufs-modules -Description: The GNU Hurd - udeb +Description: GNU Hurd - udeb This is the GNU Hurd udeb package. It contains essential system software and libraries. |