Unblocking bsdmainutils
Hi,
before I'll start with some larger changes to bsdmainutils post etch, I
synced the debian calendar file from Joey, and included the ubuntu one.
Please unblock bsdmainutils, debdiff is attached.
--
Address: Daniel Baumann, Burgunderstrasse 3, CH-4562 Biberist
Email: daniel.baumann@panthera-systems.net
Internet: http://people.panthera-systems.net/~daniel-baumann/
diff -Nru /tmp/cimHKkJCUv/bsdmainutils-6.1.5/debian/changelog /tmp/pOdMcZDSMK/bsdmainutils-6.1.6/debian/changelog
--- /tmp/cimHKkJCUv/bsdmainutils-6.1.5/debian/changelog 2006-11-23 21:10:29.000000000 +0100
+++ /tmp/pOdMcZDSMK/bsdmainutils-6.1.6/debian/changelog 2007-01-02 18:14:35.000000000 +0100
@@ -1,3 +1,10 @@
+bsdmainutils (6.1.6) unstable; urgency=medium
+
+ * Adding calendar.ubuntu from Matt Zimmerman <mdz@ubuntu.com>.
+ * Updating calendar.debian from Martin Schulze <joey@debian.org>.
+
+ -- Daniel Baumann <daniel@debian.org> Tue, 2 Jan 2007 18:07:00 +0100
+
bsdmainutils (6.1.5) unstable; urgency=low
* New maintianer (Closes: #400077).
diff -Nru /tmp/cimHKkJCUv/bsdmainutils-6.1.5/usr.bin/calendar/calendars/calendar.debian /tmp/pOdMcZDSMK/bsdmainutils-6.1.6/usr.bin/calendar/calendars/calendar.debian
--- /tmp/cimHKkJCUv/bsdmainutils-6.1.5/usr.bin/calendar/calendars/calendar.debian 2006-08-15 08:03:30.000000000 +0200
+++ /tmp/pOdMcZDSMK/bsdmainutils-6.1.6/usr.bin/calendar/calendars/calendar.debian 2007-01-02 18:09:35.000000000 +0100
@@ -4,14 +4,12 @@
* http://cvs.infodrom.org/calendar/calendar.infodrom.debian?cvsroot=infodrom
* :pserver:anonymous@cvs.infodrom.org:/var/cvs/infodrom co calendar/calendar.infodrom.debian
*
- * $Id: calendar.infodrom.debian,v 1.14 2005/08/08 16:56:44 joey Exp $
+ * $Id: calendar.infodrom.debian,v 1.16 2006-12-10 12:23:50 joey Exp $
*/
#ifndef _calendar_infodrom_debian_
#define _calendar_infodrom_debian_
-LANG=utf-8
-
/* Project leaders */
Dec 1 Ian Jackson became Debian Project Leader, 1997
Jan 1 Wichert Akkerman became Debian Project Leader, 1999
@@ -19,6 +17,7 @@
Apr 17 Bdale Garbee became Debian Project Leader, 2002
Apr 17 Martin Michlmayr became Debian Project Leader, 2003
Apr 17 Branden Robinson became Debian Project Leader, 2005
+Apr 17 Anthony Towns became Debian Project Leader, 2006
/* Days of death */
Jun 11 Jens 'jensen' Schmalzig born in Nuremburg, 1971
@@ -42,6 +41,12 @@
Jul 19 Debian GNU/Linux 3.0 alias ``woody'' released, 2002
Jun 6 Debian GNU/Linux 3.1 alias ``sarge'' released, 2005
+/* Notably but report numbers */
+Jun 7 Debian Bug#100000 reported by David B. Harris, 2001
+Jul 4 Debian Bug#200000 reported by Michel Grentzinger, 2003
+Mar 17 Debian Bug#300000 reported by Florian Zumbiehl, 2005
+Nov 23 Debian Bug#400000 reported by Christian Perrier, 2006
+
/* Notably other dates */
Aug 16 Ian Murdock founded Debian, 1993
Jun 6 Incorporation of Software in the Public Interest completed, 1997
diff -Nru /tmp/cimHKkJCUv/bsdmainutils-6.1.5/usr.bin/calendar/calendars/calendar.ubuntu /tmp/pOdMcZDSMK/bsdmainutils-6.1.6/usr.bin/calendar/calendars/calendar.ubuntu
--- /tmp/cimHKkJCUv/bsdmainutils-6.1.5/usr.bin/calendar/calendars/calendar.ubuntu 1970-01-01 01:00:00.000000000 +0100
+++ /tmp/pOdMcZDSMK/bsdmainutils-6.1.6/usr.bin/calendar/calendars/calendar.ubuntu 2007-01-02 18:10:42.000000000 +0100
@@ -0,0 +1,20 @@
+/*
+ * Interesting dates in Ubuntu history
+ * Matt Zimmerman <mdz@ubuntu.com>, 2005-10-24
+ */
+
+#ifndef _calendar_ubuntu
+#define _calendar_ubuntu
+
+LANG=utf-8
+
+/* Ubuntu releases */
+Oct 20 Ubuntu 4.10 (Warty Warthog) released, 2004
+Apr 08 Ubuntu 5.04 (Hoary Hedgehog) released, 2005
+Oct 13 Ubuntu 5.10 (Breezy Badger) released, 2005
+Jun 1 Ubuntu 6.06 (Dapper Drake) released, 2006
+Oct 26 Ubuntu 6.10 (Edgy Eft) released, 2006
+
+/* Misc */
+
+#endif /* !_calendar_ubuntu_ */
diff -Nru /tmp/cimHKkJCUv/bsdmainutils-6.1.5/usr.bin/calendar/calendars/calendar.world /tmp/pOdMcZDSMK/bsdmainutils-6.1.6/usr.bin/calendar/calendars/calendar.world
--- /tmp/cimHKkJCUv/bsdmainutils-6.1.5/usr.bin/calendar/calendars/calendar.world 2006-08-15 08:03:30.000000000 +0200
+++ /tmp/pOdMcZDSMK/bsdmainutils-6.1.6/usr.bin/calendar/calendars/calendar.world 2007-01-02 18:25:32.000000000 +0100
@@ -19,5 +19,6 @@
#include <calendar.discordian>
#include <calendar.debian>
#include <calendar.eu>
+#include <calendar.ubuntu>
#endif /* !_calendar_world_ */
Reply to: