r44251 - in /packages/arpack/tags: 3.0.1-2~exp1/changelog 3.0.1-2~exp2/ 3.0.1-2~exp2/changelog 3.0.1-2~exp2/libparpack2-dev.install 3.0.1-2~exp2/libparpack2.symbols 3.0.1-2~exp2/patches/fix-alreduce-openmpi.patch 3.0.1-2~exp2/patches/series

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Sun Dec 25 23:20:59 2011
New Revision: 44251

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44251
Log:
tag of version 3.0.1-2~exp2

Added:
    packages/arpack/tags/3.0.1-2~exp2/
      - copied from r44249, packages/arpack/trunk/debian/
    packages/arpack/tags/3.0.1-2~exp2/changelog
      - copied unchanged from r44250, packages/arpack/trunk/debian/changelog
    packages/arpack/tags/3.0.1-2~exp2/libparpack2-dev.install
      - copied unchanged from r44250, packages/arpack/trunk/debian/libparpack2-dev.install
    packages/arpack/tags/3.0.1-2~exp2/libparpack2.symbols
      - copied unchanged from r44250, packages/arpack/trunk/debian/libparpack2.symbols
    packages/arpack/tags/3.0.1-2~exp2/patches/fix-alreduce-openmpi.patch
      - copied unchanged from r44250, packages/arpack/trunk/debian/patches/fix-alreduce-openmpi.patch
    packages/arpack/tags/3.0.1-2~exp2/patches/series
      - copied unchanged from r44250, packages/arpack/trunk/debian/patches/series
Modified:
    packages/arpack/tags/3.0.1-2~exp1/changelog

Modified: packages/arpack/tags/3.0.1-2~exp1/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/arpack/tags/3.0.1-2%7Eexp1/changelog?rev=44251&op=diff
==============================================================================
--- packages/arpack/tags/3.0.1-2~exp1/changelog (original)
+++ packages/arpack/tags/3.0.1-2~exp1/changelog Sun Dec 25 23:20:59 2011
@@ -1,3 +1,11 @@
+<<<<<<< .mine
+arpack (3.0.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 13 Dec 2011 17:00:30 +0100
+
+=======
 arpack (3.0.1-2~exp1) experimental; urgency=low
 
   * Split arpack into two dedicated packages:
@@ -14,6 +22,7 @@
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 13 Dec 2011 17:00:30 +0100
 
+>>>>>>> .r44249
 arpack (3.0-1) unstable; urgency=low
 
   * Switch to arpack-ng since upstream is dead.