Update debian/watch, debian/lilo.* and debian/lilo-doc.*

diff --git a/debian/changelog b/debian/changelog
index daf2d20ce0eae2b25406b1bb64b9dda002edf378..52fd9d049cdeead6cf39281fffe631835ebfb498 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,10 +17,13 @@ lilo (1:23.1-1) unstable; urgency=low
     - 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.
+    - Add in package lilo-doc dependency to lilo.
     - Optimize package descriptions.
+  * Use new upstream address in debian/watch.
+  * Update all debian/lilo.* and debian/lilo-doc.* files.
+  * Add new debian/lilo-doc.doc-base file.
 
- -- Joachim Wiedorn <ad_debian@joonet.de>  Thu, 18 Nov 2010 18:12:02 +0100
+ -- Joachim Wiedorn <ad_debian@joonet.de>  Thu, 18 Nov 2010 20:32:02 +0100
 
 lilo (1:22.8-8.3) unstable; urgency=high
 

diff --git a/debian/lilo-doc.doc-base b/debian/lilo-doc.doc-base
new file mode 100644 (file)
index 0000000..02c3043
--- /dev/null
+++ b/debian/lilo-doc.doc-base
@@ -0,0 +1,12 @@
+Document: lilo-doc
+Title: Older LILO Documentation
+Author: Werner Almesberger, John Coffman
+Abstract: This documentations describe the functionality and
+ usage of old versions of the program and bootloader lilo.
+Section: System/Administration
+
+Format: Text
+Files: /usr/share/doc/lilo-doc/README*
+
+Format: PDF
+Files: /usr/share/doc/lilo-doc/*.pdf.gz

diff --git a/debian/lilo-doc.docs b/debian/lilo-doc.docs
index ae1545e9f9861fc68eba91b0627a126600449d38..bc5d4d890a8818d86bf9a2d22aa874164504f5cf 100644 (file)
--- a/debian/lilo-doc.docs
+++ b/debian/lilo-doc.docs
@@ -1,2 +1,10 @@
-doc/user.ps
-doc/tech.ps
+doc/user.pdf
+doc/tech.pdf
+readme/INCOMPAT
+readme/README
+readme/README.disk
+readme/README.common.problems
+readme/README.volumeID
+readme/README.pseudo
+readme/README.bitmaps
+readme/README.raid1

diff --git a/debian/lilo-doc.examples b/debian/lilo-doc.examples
index d64a3d962e787834f9b43312cdcdb96ef357709a..1aab0ba0ee80788e81f8ed17c7088161ae30c43d 100644 (file)
--- a/debian/lilo-doc.examples
+++ b/debian/lilo-doc.examples
@@ -1 +1,2 @@
-sample
+sample/lilo*.conf
+

diff --git a/debian/lilo.dirs b/debian/lilo.dirs
index 318a2f47d2af57147a07444137ad8d43f09ca62f..ccc5c782da95bc4f8563debd7bb20945da75d8ba 100644 (file)
--- a/debian/lilo.dirs
+++ b/debian/lilo.dirs
@@ -4,7 +4,5 @@ usr/lib/lilo
 usr/share/pixmaps
 usr/share/lilo
 boot
-etc
-etc/initramfs/post-update.d
-etc/kernel/postinst.d
-etc/kernel/postrm.d
+etc/initramfs
+etc/kernel

diff --git a/debian/lilo.docs b/debian/lilo.docs
index 4def9376a0a0c27ddab8547e74a47cc9cae0d8f0..05ce7982930a521e91e09c960582ba8763d4b735 100644 (file)
--- a/debian/lilo.docs
+++ b/debian/lilo.docs
@@ -1,7 +1,3 @@
-INCOMPAT
-README.disk
-README.common.problems
-README.volumeID
-README.pseudo
-README.bitmaps
-README.raid1
+README
+NEWS
+TOOLS

diff --git a/debian/lilo.examples b/debian/lilo.examples
index 49fbadb02077433b275e57ace19380a7604028ea..15227fbbb41541372ea84b537f0b3a745462c6e3 100644 (file)
--- a/debian/lilo.examples
+++ b/debian/lilo.examples
@@ -1,2 +1 @@
-QuickInst
-debian/examples/conf.sample
+sample/lilo.example.conf

diff --git a/debian/lilo.manpages b/debian/lilo.manpages
index fc8ed75cedf1f9ab7c980d95157eb2eda66b26b0..ef08f28932a38e15b7a675ad0ec36740138591d0 100644 (file)
--- a/debian/lilo.manpages
+++ b/debian/lilo.manpages
@@ -1,9 +1,8 @@
 debian/manpages/liloconfig.8
 debian/manpages/lilo.real.8
-debian/manpages/lilo_find_mbr.8
+debian/manpages/lilo-uuid-diskid.8
 debian/manpages/update-lilo.8
-manPages/activate.8
-manPages/keytab-lilo.8
-manPages/lilo.8  
-manPages/lilo.conf.5  
-manPages/mkrescue.8
+man/keytab-lilo.8
+man/lilo.8
+man/lilo.conf.5
+man/mkrescue.8

diff --git a/debian/lilo.menu b/debian/lilo.menu
index 6347abe5d85171522a7558f8aaeb0f630de81239..a3ad14ee229bd538102724f6aff15c8965fb8e65 100644 (file)
--- a/debian/lilo.menu
+++ b/debian/lilo.menu
@@ -3,5 +3,5 @@
    longtitle="Configure LInux LOader"\
    description="Configure the LInux boot LOader that will be activated\
  next time you boot."\
-   command="/usr/bin/su-to-root -p root -c /usr/sbin/liloconfig" \
+   command="su-to-root -p root -c /usr/sbin/liloconfig" \
    icon="/usr/share/pixmaps/lilo-term.xpm"

diff --git a/debian/watch b/debian/watch
index e1554078bc8d50ce48a8f9ab558fde12115e85f0..da07a6686bd689e602329bd6286a83d5fc6aeaa3 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
+# watch control file for uscan for the lilo package
 version=3
-http://home.san.rr.com/johninsd/pub/linux/lilo/lilo-(.*)\.(?:src|bin)\.tar\.gz
+http://alioth.debian.org/frs/?group_id=100507  (?:.*/)?lilo-(\d.+)\.tar\.gz
+