Update debian/control file

diff --git a/debian/changelog b/debian/changelog
index 43aebbb6649840d9c11704d0d3b33ce01626ab50..daf2d20ce0eae2b25406b1bb64b9dda002edf378 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,16 @@ lilo (1:23.1-1) unstable; urgency=low
   * Move to debhelper compatibility level 7.
   * Move to source format 3.0 (quilt).
   * Update and new formatting of debian/copyright.
+  * debian/control:
+    - Move source dependency debhelper to version >= 7.0.15.
+    - Update some versions of source dependencies and remove quilt.
+    - Update VCS urls and add new Homepage url.
+    - Remove IA64 architecture (this is already status quo).
+    - Remove double lines of Priority and Section.
+    - Add package conflicts to grub-pc and grub-legacy.
+    - Remove conflicts to manpages.
+       - Add in package lilo-doc dependency to lilo.
+    - Optimize package descriptions.
 
  -- Joachim Wiedorn <ad_debian@joonet.de>  Thu, 18 Nov 2010 18:12:02 +0100
 

diff --git a/debian/control b/debian/control
index 072d28da0e972e5ab1c00be35e783409fac82751..e93fd8ac2eba5040be6bcebdc46bfe694b0cab83 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,34 +3,35 @@ Section: admin
 Priority: optional
 Maintainer: Joachim Wiedorn <ad_debian@joonet.de>
 Uploaders: Matt Arnold <mattarnold5@gmail.com>
+Build-Depends: debhelper (>= 7.0.15), transfig, 
+ texlive-latex-base, bin86 (>= 0.16), sharutils, 
+ po-debconf (>= 0.5.0), libdevmapper-dev
 Standards-Version: 3.9.1
-Build-Depends: debhelper (>= 5.0), transfig, texlive-latex-base, bin86 (>= 0.16), sharutils, po-debconf (>= 0.5.0), libdevmapper-dev, quilt
-Vcs-Svn: svn://svn.debian.org/collab-maint/ext-maint/lilo/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/ext-maint/lilo/trunk/
+Vcs-Git: git://git.debian.org/git/lilo/debian.git
+Vcs-Browser: http://git.debian.org/?p=lilo/debian.git
+Homepage: http://lilo.alioth.debian.org/
 
 Package: lilo
-Section: admin
-Priority: optional
-Architecture: amd64 i386 ia64
-Depends: mbr, debconf (>= 1.2.9) | debconf-2.0, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: manpages (<< 1.29-3)
+Architecture: amd64 i386
+Depends: mbr, ${shlibs:Depends}, ${misc:Depends}
+Conflicts: grub-pc, grub-legacy
 Suggests: lilo-doc
-Description: LInux LOader - The Classic OS loader can load Linux and others
+Description: LInux LOader - the classic OS boot loader
+ You can use LILO to manage your Master Boot Record (with a simple text
+ screen, text menu or colorful splash graphics) or call LILO from other 
+ Boot-Loaders to jump-start the Linux kernel.
+ .
  This package contains lilo (the installer) and boot-record-images to
- install Linux, OS/2, DOS and generic Boot Sectors of other OSes.
+ install Linux, OS/2, DOS and generic Boot Sectors for other OSes.
  .
- You can use LILO to manage your Master Boot Record (with a simple text screen,
- text menu or colorful splash graphics) or call LILO from other Boot-Loaders to
- jump-start the Linux kernel.
 
 Package: lilo-doc
 Section: doc
-Priority: optional
 Architecture: all
-Depends: ${misc:Depends}
-Description: Documentation for LILO (LInux LOader)
- This package contains the postscript documentation of lilo.
+Depends: lilo (>= ${source:Version}), ${misc:Depends}
+Description: LInux LOader - Documentation for the classic OS boot loader
+ You can use LILO to manage your Master Boot Record (with a simple text 
+ screen, text menu or colorful splash graphics) or call LILO from other 
+ Boot-Loaders to jump-start the Linux kernel.
  .
- You can use LILO to manage your Master Boot Record (with a simple text screen,
- text menu or colorful splash graphics) or call LILO from other Boot-Loaders to
- jump-start the Linux kernel.
+ This package contains old PDF and README documentations of lilo.