r38602 - /packages/code-aster/astk/trunk/debian/changelog

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Mon Jun 27 15:27:32 2011
New Revision: 38602

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38602
Log:
bad merge

Modified:
    packages/code-aster/astk/trunk/debian/changelog

Modified: packages/code-aster/astk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/changelog?rev=38602&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/changelog (original)
+++ packages/code-aster/astk/trunk/debian/changelog Mon Jun 27 15:27:32 2011
@@ -1,7 +1,6 @@
 astk (1.8.4-4) unstable; urgency=low
 
-  * debian/rules: 
-      move mpirun_template to usr/lib/codeaster/asrun/data (closes: #627540)
+  * move mpirun_template to usr/lib/codeaster/asrun/data (closes: #627540)
   * fix lintian errors and warnings
   * add codeaster-run.lintian-overrides