r36144 - in /packages/libbft/tags: 1.1.1-3/debian/changelog 1.1.2-2/ 1.1.2-2/changelog
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Mon Feb 8 17:11:41 UTC 2010
Author: sylvestre
Date: Mon Feb 8 17:11:41 2010
New Revision: 36144
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36144
Log:
taf of version 1.1.2-2
Added:
packages/libbft/tags/1.1.2-2/
- copied from r36143, packages/libbft/trunk/debian/
Modified:
packages/libbft/tags/1.1.1-3/debian/changelog
packages/libbft/tags/1.1.2-2/changelog
Modified: packages/libbft/tags/1.1.1-3/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libbft/tags/1.1.1-3/debian/changelog?rev=36144&op=diff
==============================================================================
--- packages/libbft/tags/1.1.1-3/debian/changelog (original)
+++ packages/libbft/tags/1.1.1-3/debian/changelog Mon Feb 8 17:11:41 2010
@@ -1,3 +1,11 @@
+<<<<<<< .mine
+libbft (1.1.2-2) experimental; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 30 Jan 2010 16:57:12 +0100
+
+=======
libbft (1.1.1-3) unstable; urgency=low
* FTBFS on kfreebsd-i386 on HAVE_LONG_LONG. Thanks to Cyril Brulebois for
@@ -11,6 +19,7 @@
-- Sylvestre Ledru <sylvestre at debian.org> Tue, 24 Nov 2009 18:34:26 +0100
+>>>>>>> .r36143
libbft (1.1.1-1) unstable; urgency=low
* New upstream release
Modified: packages/libbft/tags/1.1.2-2/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libbft/tags/1.1.2-2/changelog?rev=36144&op=diff
==============================================================================
--- packages/libbft/tags/1.1.2-2/changelog (original)
+++ packages/libbft/tags/1.1.2-2/changelog Mon Feb 8 17:11:41 2010
@@ -1,3 +1,9 @@
+libbft (1.1.2-2) experimental; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 30 Jan 2010 16:57:12 +0100
+
libbft (1.1.1-3) unstable; urgency=low
* FTBFS on kfreebsd-i386 on HAVE_LONG_LONG. Thanks to Cyril Brulebois for
More information about the debian-science-commits
mailing list