diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 24 | ||||
| -rw-r--r-- | debian/control | 5 |
2 files changed, 29 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index bf818b4..2020dcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +<<<<<<< HEAD +======= +pyg (0.9.6-4) unstable; urgency=low + + * added some more header to be stripepd in mail2news class + closes:Bug#165322 + + -- Cosimo Alfarano <kalfa@debian.org> Tue, 2 Mar 2004 21:40:59 +0100 + +pyg (0.9.6-3.1) unstable; urgency=low + + * apply the full (not modified) version of the Matt's patch, for + compatibility reasons + + -- Cosimo Alfarano <kalfa@debian.org> Thu, 6 Nov 2003 23:46:31 +0100 + +pyg (0.9.6-3) unstable; urgency=low + + * applied a modified version of patch from Matt Kraai sent in BTS + closes:Bug#213936 + + -- Cosimo Alfarano <kalfa@debian.org> Wed, 5 Nov 2003 11:59:29 +0100 + +>>>>>>> 32401d9... pyg 0.9.6-4 from archive.debian.org pyg (0.9.6-2) unstable; urgency=low * typos in debian/control fixed (closes: #125276) diff --git a/debian/control b/debian/control index 55cb948..f5076b3 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,13 @@ Source: pyg Section: news Priority: optional Maintainer: Cosimo Alfarano <kalfa@debian.org> +<<<<<<< HEAD Standards-Version: 3.5.6.0 Build-Depends: debhelper, python-dev (>= 2.1), flex, bison +======= +Standards-Version: 3.6.1.0 +Build-Depends: debhelper (>= 3.0), python-dev (>= 2.1), flex, bison +>>>>>>> 32401d9... pyg 0.9.6-4 from archive.debian.org Package: pyg Architecture: any |