Rebased ref, commits from common ancestor: commit 17b2aea61cbe16146ac9480fd452c45c5110f1da Author: Julien Cristau <[EMAIL PROTECTED]> Date: Thu Jul 17 22:50:14 2008 +0200
Fixup the changelog I forgot to push before preparing the release, but didn't actually upload, so fix the merge and try again. diff --git a/debian/changelog b/debian/changelog index bf79ecc..c1bbd49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,6 @@ -libxfont (1:1.3.3-2) UNRELEASED; urgency=low - - [ Brice Goglin ] - * Add upstream URL to debian/copyright. - * Add a link to www.X.org and a reference to the upstream module - in the long description. - - -- Brice Goglin <[EMAIL PROTECTED]> Fri, 13 Jun 2008 11:19:28 +0200 - libxfont (1:1.3.3-1) unstable; urgency=high + [ Julien Cristau ] * Drop dependency on x11-common from libxfont1{,-dbg}. * New upstream bugfix release. * Disable the type1 rasterizer and support for speedo font files. The @@ -16,7 +8,12 @@ libxfont (1:1.3.3-1) unstable; urgency=high since before etch anyway. * Urgency high so the above gets in lenny. - -- Julien Cristau <[EMAIL PROTECTED]> Thu, 17 Jul 2008 22:18:47 +0200 + [ Brice Goglin ] + * Add upstream URL to debian/copyright. + * Add a link to www.X.org and a reference to the upstream module + in the long description. + + -- Julien Cristau <[EMAIL PROTECTED]> Thu, 17 Jul 2008 22:50:03 +0200 libxfont (1:1.3.2-1) unstable; urgency=low commit 6c489afe98d6a3ed4141d31c387dd510d4ef7fd2 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Fri Jun 13 10:38:13 2008 +0200 Misc fixes to debian/control and debian/copyright * Add upstream URL to debian/copyright. * Add a link to www.X.org and a reference to the upstream module in the long description. diff --git a/debian/changelog b/debian/changelog index c0a36e1..395cfc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ libxfont (1:1.3.2-2) UNRELEASED; urgency=low + [ Julien Cristau ] * Drop dependency on x11-common from libxfont1{,-dbg}. - -- Julien Cristau <[EMAIL PROTECTED]> Sun, 18 May 2008 21:05:38 +0200 + [ Brice Goglin ] + * Add upstream URL to debian/copyright. + * Add a link to www.X.org and a reference to the upstream module + in the long description. + + -- Brice Goglin <[EMAIL PROTECTED]> Fri, 13 Jun 2008 11:19:28 +0200 libxfont (1:1.3.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index b96e99a..5da3171 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,12 @@ Description: X11 font rasterisation library selection and rasterisation (through external libraries). . More information about X.Org can be found at: + <URL:http://www.X.org> <URL:http://xorg.freedesktop.org> <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> + . + This module can be found at + git://anongit.freedesktop.org/git/xorg/lib/libXfont Package: libxfont1-dbg Section: libdevel @@ -33,8 +37,12 @@ Description: X11 font rasterisation library (debug package) Non-developers likely have little use for this package. . More information about X.Org can be found at: + <URL:http://www.X.org> <URL:http://xorg.freedesktop.org> <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> + . + This module can be found at + git://anongit.freedesktop.org/git/xorg/lib/libXfont Package: libxfont-dev Section: libdevel @@ -50,5 +58,9 @@ Description: X11 font rasterisation library (development headers) libxfont1. Non-developers likely have little use for this package. . More information about X.Org can be found at: + <URL:http://www.X.org> <URL:http://xorg.freedesktop.org> <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> + . + This module can be found at + git://anongit.freedesktop.org/git/xorg/lib/libXfont diff --git a/debian/copyright b/debian/copyright index 1cd3635..f0127fc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,3 +1,6 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/lib/ + Copyright (c) 1997 by Mark Leisher Copyright (c) 1998-2003 by Juliusz Chroboczek -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]