Undo previous brain-damage (r176).

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..f56dc0e
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,47 @@
+webdvd (0.6) unstable; urgency=low
+
+  * Cleaned up internal naming and some data structures
+  * Improved menu navigation code
+  * Added support for linking to chapters
+  * Added code to tell Mozilla the target screen resolution
+
+ -- Ben Hutchings <ben@decadentplace.org.uk>  Sat, 24 Dec 2005 23:53:09 +0000
+
+webdvd (0.5) unstable; urgency=low
+
+  * Disabled scrollbars
+  * Added early check for missing video files
+  * Added support for linking to custom VOB lists
+  * Changed X server spawning to avoid displays allocated by ssh
+
+ -- Ben Hutchings <ben@decadentplace.org.uk>  Thu, 15 Dec 2005 01:07:33 +0000
+
+webdvd (0.4) unstable; urgency=low
+
+  * Implemented preview mode
+  * Added support for use of page filenames on the command line
+
+ -- Ben Hutchings <ben@decadentplace.org.uk>  Mon, 05 Dec 2005 00:33:45 +0000
+
+webdvd (0.3) unstable; urgency=low
+
+  * Cleaned up command-line arguments
+  * Added spawning of dvdauthor and other necessary external programs
+  * Eliminated creation of files in the current directory
+  * Changed conditions for starting to process pages, fixing a failed assertion
+
+ -- Ben Hutchings <ben@decadentplace.org.uk>  Mon, 28 Nov 2005 00:00:50 +0000
+
+webdvd (0.2) unstable; urgency=low
+
+  * Debianised
+  * Corrected length of background filename buffer
+  * Worked around bogus error generated by imglib2
+
+ -- Ben Hutchings <ben@decadentplace.org.uk>  Sat, 12 Nov 2005 15:24:07 +0000
+
+webdvd (0.1) unstable; urgency=low
+
+  * Initial version
+
+ -- Ben Hutchings <ben@decadentplace.org.uk>  Thu, 03 Nov 2005 02:04:02 +0000

diff --git a/debian/changelog.base b/debian/changelog.base
deleted file mode 100644 (file)
index f56dc0e..0000000
--- a/debian/changelog.base
+++ /dev/null
@@ -1,47 +0,0 @@
-webdvd (0.6) unstable; urgency=low
-
-  * Cleaned up internal naming and some data structures
-  * Improved menu navigation code
-  * Added support for linking to chapters
-  * Added code to tell Mozilla the target screen resolution
-
- -- Ben Hutchings <ben@decadentplace.org.uk>  Sat, 24 Dec 2005 23:53:09 +0000
-
-webdvd (0.5) unstable; urgency=low
-
-  * Disabled scrollbars
-  * Added early check for missing video files
-  * Added support for linking to custom VOB lists
-  * Changed X server spawning to avoid displays allocated by ssh
-
- -- Ben Hutchings <ben@decadentplace.org.uk>  Thu, 15 Dec 2005 01:07:33 +0000
-
-webdvd (0.4) unstable; urgency=low
-
-  * Implemented preview mode
-  * Added support for use of page filenames on the command line
-
- -- Ben Hutchings <ben@decadentplace.org.uk>  Mon, 05 Dec 2005 00:33:45 +0000
-
-webdvd (0.3) unstable; urgency=low
-
-  * Cleaned up command-line arguments
-  * Added spawning of dvdauthor and other necessary external programs
-  * Eliminated creation of files in the current directory
-  * Changed conditions for starting to process pages, fixing a failed assertion
-
- -- Ben Hutchings <ben@decadentplace.org.uk>  Mon, 28 Nov 2005 00:00:50 +0000
-
-webdvd (0.2) unstable; urgency=low
-
-  * Debianised
-  * Corrected length of background filename buffer
-  * Worked around bogus error generated by imglib2
-
- -- Ben Hutchings <ben@decadentplace.org.uk>  Sat, 12 Nov 2005 15:24:07 +0000
-
-webdvd (0.1) unstable; urgency=low
-
-  * Initial version
-
- -- Ben Hutchings <ben@decadentplace.org.uk>  Thu, 03 Nov 2005 02:04:02 +0000