[Pkg-scicomp-devel] abinit/trunk/debian

[Christophe Prud'homme]

SVN commit 1821 by prudhomm:

applied patch by ondrej and merge changelog


 M  +4 -3      abinit/trunk/debian/changelog  
 M  +1 -2      abinit/trunk/debian/control  
 M  +1 -0      abinit/trunk/debian/rules  


--- abinit/trunk/debian/changelog #1820:1821
@@ -1,8 +1,9 @@
 abinit (5.3.4.dfsg-2) unstable; urgency=low
 
-  [Christophe Prud'homme]
-  * Bug fix: "file conflicts between packages", thanks to Michael
-    Ablassmeier (Closes: #442237).
+  [Ondrej Certik]
+  * Renamed /usr/bin/newsp to /usr/bin/newsp.abinit. Bug fix: "file
+    conflicts between packages", thanks to Michael Ablassmeier (Closes:
+    #442237).
 
  -- Christophe Prud'homme <prudhomm at debian.org>  Fri, 14 Sep 2007 13:05:00 +0200
 
--- abinit/trunk/debian/control #1820:1821
@@ -2,7 +2,7 @@
 Section: science
 Priority: extra
 Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel at lists.alioth.debian.org>
-Uploaders: Christophe Prud'homme <prudhomm at debian.org>
+Uploaders: Christophe Prud'homme <prudhomm at debian.org>, Ondrej Certik <ondrej at certik.cz>
 Build-Depends: debhelper (>= 5), autotools-dev, gfortran (>= 4:4.2-1), lapack3-dev (>= 3.0.20000531a-6)
 Standards-Version: 3.7.2
 
@@ -10,7 +10,6 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: abinit-doc
-Conflicts: mp
 Description: A package for electronic structure calculations
  ABINIT is a package whose main program allows one to find the total energy,
  charge density and electronic structure of systems made of electrons and
--- abinit/trunk/debian/rules #1820:1821
@@ -83,6 +83,7 @@
 	mkdir -p debian/abinit-doc/usr/share/doc/abinit-doc/
 	mv debian/abinit-tmp/usr/abinit/5.3/doc/* debian/abinit-doc/usr/share/doc/abinit-doc/
 	mv debian/abinit-tmp/usr/abinit/5.3/tests debian/abinit-doc/usr/share/doc/abinit-doc/
+	mv debian/abinit/usr/bin/newsp debian/abinit/usr/bin/newsp.abinit
 
 
 # Build architecture-independent files here.