diff -u kgb-bot-1.06/debian/control kgb-bot-1.06/debian/control --- kgb-bot-1.06/debian/control +++ kgb-bot-1.06/debian/control @@ -25,7 +25,8 @@ Vcs-Browser: http://svn.debian.org/viewsvn/kgb/kgb/ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian KGB Maintainers -Uploaders: Martín Ferrari , Damyan Ivanov +Uploaders: Martín Ferrari , Damyan Ivanov , + gregor herrmann Standards-Version: 3.9.1 Homepage: http://kgb.alioth.debian.org/ diff -u kgb-bot-1.06/debian/changelog kgb-bot-1.06/debian/changelog --- kgb-bot-1.06/debian/changelog +++ kgb-bot-1.06/debian/changelog @@ -1,3 +1,24 @@ +kgb-bot (1.06-2ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #688284). Remaining changes: + - debian/control: build dependency on language-pack-bg-base and deleted + build dependency on missing locales-all. This fixes a FTBFS + - debian/rules: deleted test on versions as it always fails with ubuntu + versioning + + -- Angel Abad Thu, 09 Dec 2010 22:58:28 +0100 + +kgb-bot (1.06-2) unstable; urgency=low + + [ gregor herrmann ] + * Add a postrm script to remove the log in purge; thanks to Holger Levsen + and piuparts for the bug report (closes: #605978). + * Add a logrotate config file. + * Add /me to Uploaders. + * debian/copyright: switch to DEP5 formatting. + + -- Damyan Ivanov Sun, 05 Dec 2010 17:37:01 +0200 + kgb-bot (1.06-1ubuntu1) natty; urgency=low * Merge from debian unstable. Remaining changes: @@ -298 +318,0 @@ - diff -u kgb-bot-1.06/debian/copyright kgb-bot-1.06/debian/copyright --- kgb-bot-1.06/debian/copyright +++ kgb-bot-1.06/debian/copyright @@ -1,29 +1,20 @@ -Upstream source is available frop http://alioth.debian.org/projects/kgb - -Upstream authors: - Martín Ferrari - Damyan Ivanov - gregor herrmann +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Maintainer: Debian KGB Maintainers +Source: http://alioth.debian.org/projects/kgb +Name: App::KGB +Files: * Copyright: -# Copyright © 2008 Martín Ferrari -# Copyright © 2008,2009,2010 Damyan Ivanov -# Copyright © 2010 gregor herrmann - -License: -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 51 -# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + 2008, Martín Ferrari + 2008, 2009, 2010, Damyan Ivanov + 2010, gregor herrmann +License: GPL-2+ -On Debian systems, the complete text of GNU General Public License is available -in /usr/share/common-licenses/GPL-2 +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + . + On Debian systems, the complete text of version 2 of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2'. only in patch2: unchanged: --- kgb-bot-1.06.orig/debian/kgb-bot.postrm +++ kgb-bot-1.06/debian/kgb-bot.postrm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e +set -u + +LOG=/var/log/kgb-bot.log + +if [ "$1" = "purge" ] ; then + rm -f $LOG* +fi + +#DEBHELPER# only in patch2: unchanged: --- kgb-bot-1.06.orig/debian/kgb-bot.logrotate +++ kgb-bot-1.06/debian/kgb-bot.logrotate @@ -0,0 +1,7 @@ +/var/log/kgb-bot.log { + weekly + rotate 4 + compress + missingok + create 644 Debian-kgb root +}