r36920 - in /packages/scilab/tags: 5.2.1-6/scilab-cli.install 5.2.2-7/changelog 5.2.2-9/

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Tue Oct  5 23:11:55 2010
New Revision: 36920

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36920
Log:
tag of version 5.2.2-9

Added:
    packages/scilab/tags/5.2.2-9/
      - copied from r36919, packages/scilab/trunk/debian/
Modified:
    packages/scilab/tags/5.2.1-6/scilab-cli.install
    packages/scilab/tags/5.2.2-7/changelog

Modified: packages/scilab/tags/5.2.1-6/scilab-cli.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/tags/5.2.1-6/scilab-cli.install?rev=36920&op=diff
==============================================================================
--- packages/scilab/tags/5.2.1-6/scilab-cli.install (original)
+++ packages/scilab/tags/5.2.1-6/scilab-cli.install Tue Oct  5 23:11:55 2010
@@ -1,2 +1,6 @@
 debian/tmp/usr/bin/scilab-cli
+<<<<<<< .mine
+debian/bash_completion/scilab etc/bash_completion.d/
+=======
 debian/bash_completion.d/scilab etc/bash_completion.d/
+>>>>>>> .r36906

Modified: packages/scilab/tags/5.2.2-7/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/tags/5.2.2-7/changelog?rev=36920&op=diff
==============================================================================
--- packages/scilab/tags/5.2.2-7/changelog (original)
+++ packages/scilab/tags/5.2.2-7/changelog Tue Oct  5 23:11:55 2010
@@ -1,3 +1,12 @@
+<<<<<<< .mine
+scilab (5.2.1-5) unstable; urgency=low
+
+  * Bash completion script added
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 16 Mar 2010 08:10:11 +0100
+
+scilab (5.2.1-4) unstable; urgency=low 
+=======
 scilab (5.2.2-7) unstable; urgency=low
 
   * Fix a bad upload: Not binNMU-able (Closes: #597755)
@@ -96,6 +105,7 @@
  -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 08 Mar 2010 15:58:54 +0100
 
 scilab (5.2.1-4) unstable; urgency=low
+>>>>>>> .r36906
  
   [ Christoph Korn ]
   * debian/rules, debian/watcher.sh: Add a ticker to the build to prevent