aboutsummaryrefslogtreecommitdiffstats
path: root/debian/changelog
diff options
context:
space:
mode:
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog15
1 files changed, 9 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 2020dcf..458e5aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,12 @@
-<<<<<<< HEAD
-=======
+pyg (0.9.6-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update package to the last python policy (Closes: #380905).
+ * Bump DH_COMPAT to 4.
+ * Bump Standards-Version to 3.7.2.
+
+ -- Pierre Habouzit <madcoder@debian.org> Sat, 12 Aug 2006 14:01:38 +0200
+
pyg (0.9.6-4) unstable; urgency=low
* added some more header to be stripepd in mail2news class
@@ -21,7 +28,6 @@ pyg (0.9.6-3) unstable; urgency=low
-- 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)
@@ -191,6 +197,3 @@ pyg (0.9-1) unstable; urgency=low
-- Cosimo Alfarano <alfarano@students.cs.unibo.it> Sun, 25 Jun 2000 17:52:35 +0200
-Local variables:
-mode: debian-changelog
-End: