From: Joachim Wiedorn <ad_debian@joonet.de>
Date: Thu, 18 Nov 2010 21:30:19 +0000 (+0100)
Subject: Update debian/watch, debian/lilo.* and debian/lilo-doc.*
X-Git-Tag: debian/23.1-1~30
X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=a250072e6d2ac064331b62726b138462ab5aaf26;p=rrq%2Fmaintain_lilo.git

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

diff --git a/debian/changelog b/debian/changelog
index daf2d20..52fd9d0 100644
--- 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
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 ae1545e..bc5d4d8 100644
--- 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 d64a3d9..1aab0ba 100644
--- 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 318a2f4..ccc5c78 100644
--- 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 4def937..05ce798 100644
--- 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 49fbadb..15227fb 100644
--- 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 fc8ed75..ef08f28 100644
--- 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 6347abe..a3ad14e 100644
--- 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 e155407..da07a66 100644
--- 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
+