r44061 - in /packages/scilab-toolboxes/celestlab/trunk/debian: ./ changelog orig-tar.sh patches/series patches/upper_case.diff rules

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Thu Nov 24 12:11:52 2011
New Revision: 44061

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44061
Log:
  * New upstream release
  * us76_path.diff: Applied upstream
  * orig-tar.sh: Update of the repack script

Added:
    packages/scilab-toolboxes/celestlab/trunk/debian/patches/series
    packages/scilab-toolboxes/celestlab/trunk/debian/patches/upper_case.diff
Modified:
    packages/scilab-toolboxes/celestlab/trunk/debian/   (props changed)
    packages/scilab-toolboxes/celestlab/trunk/debian/changelog
    packages/scilab-toolboxes/celestlab/trunk/debian/orig-tar.sh
    packages/scilab-toolboxes/celestlab/trunk/debian/rules

Propchange: packages/scilab-toolboxes/celestlab/trunk/debian/
------------------------------------------------------------------------------
    MergeWithUpstream = 1

Modified: packages/scilab-toolboxes/celestlab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/celestlab/trunk/debian/changelog?rev=44061&op=diff
==============================================================================
--- packages/scilab-toolboxes/celestlab/trunk/debian/changelog (original)
+++ packages/scilab-toolboxes/celestlab/trunk/debian/changelog Thu Nov 24 12:11:52 2011
@@ -1,6 +1,8 @@
 scilab-celestlab (2.2.0-1-1) unstable; urgency=low
 
   * New upstream release
+  * us76_path.diff: Applied upstream
+  * orig-tar.sh: Update of the repack script
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 03 Sep 2011 19:23:55 +0200
 

Modified: packages/scilab-toolboxes/celestlab/trunk/debian/orig-tar.sh
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/celestlab/trunk/debian/orig-tar.sh?rev=44061&op=diff
==============================================================================
--- packages/scilab-toolboxes/celestlab/trunk/debian/orig-tar.sh (original)
+++ packages/scilab-toolboxes/celestlab/trunk/debian/orig-tar.sh Thu Nov 24 12:11:52 2011
@@ -2,12 +2,12 @@
 
 # called by uscan with '--upstream-version' <version> <file>
 DIR=celestlab
-TAR=../scilab-celestlab_$2.orig.tar.gz
+TAR=../scilab-celestlab_$2.orig.tar.bz2
 
 # clean up the upstream tarball
 tar zxvf $3
 find $DIR -type f -exec chmod -x {} \;
-tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
+tar -c -j -f $TAR -X debian/orig-tar.exclude $DIR
 rm -rf $DIR $3
 
 # move to directory 'tarballs'

Added: packages/scilab-toolboxes/celestlab/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/celestlab/trunk/debian/patches/series?rev=44061&op=file
==============================================================================
--- packages/scilab-toolboxes/celestlab/trunk/debian/patches/series (added)
+++ packages/scilab-toolboxes/celestlab/trunk/debian/patches/series Thu Nov 24 12:11:52 2011
@@ -1,0 +1,2 @@
+upper_case.diff
+

Added: packages/scilab-toolboxes/celestlab/trunk/debian/patches/upper_case.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/celestlab/trunk/debian/patches/upper_case.diff?rev=44061&op=file
==============================================================================
--- packages/scilab-toolboxes/celestlab/trunk/debian/patches/upper_case.diff (added)
+++ packages/scilab-toolboxes/celestlab/trunk/debian/patches/upper_case.diff Thu Nov 24 12:11:52 2011
@@ -1,0 +1,26 @@
+Index: scilab-celestlab-2.2.0-1/help/en_US/geometry_events/CL_gm_pixelSize.xml
+===================================================================
+--- scilab-celestlab-2.2.0-1.orig/help/en_US/geometry_events/CL_gm_pixelSize.xml	2011-11-24 12:24:52.000000000 +0100
++++ scilab-celestlab-2.2.0-1/help/en_US/geometry_events/CL_gm_pixelSize.xml	2011-11-24 12:25:02.000000000 +0100
+@@ -45,7 +45,7 @@
+ when the sensor is tilted at an angle (<emphasis role="bold">tilt</emphasis>) to the vertical. </para>
+ <para> Two effects are responsible for the change of size: increase of distance
+ (reflected in f1 and f2) and increase of incidence angle (reflected in f1 only). </para>
+-<para><inlinemediaobject><imageobject><imagedata fileref="pixel_size.gif"/></imageobject></inlinemediaobject></para>
++<para><inlinemediaobject><imageobject><imagedata fileref="pixel_size.GIF"/></imageobject></inlinemediaobject></para>
+ <para></para></listitem>
+ <listitem>
+ <para><emphasis role="bold">Note:</emphasis></para>
+Index: scilab-celestlab-2.2.0-1/macros/geometry_events/CL_gm_pixelSize.sci
+===================================================================
+--- scilab-celestlab-2.2.0-1.orig/macros/geometry_events/CL_gm_pixelSize.sci	2011-11-24 12:24:52.000000000 +0100
++++ scilab-celestlab-2.2.0-1/macros/geometry_events/CL_gm_pixelSize.sci	2011-11-24 12:25:07.000000000 +0100
+@@ -26,7 +26,7 @@
+ // when the sensor is tilted at an angle (<b>tilt</b>) to the vertical. </p>
+ // <p> Two effects are responsible for the change of size: increase of distance 
+ // (reflected in f1 and f2) and increase of incidence angle (reflected in f1 only). </p>
+-// <p><inlinemediaobject><imageobject><imagedata fileref="pixel_size.gif"/></imageobject></inlinemediaobject></p>
++// <p><inlinemediaobject><imageobject><imagedata fileref="pixel_size.GIF"/></imageobject></inlinemediaobject></p>
+ // <p></p></listitem>
+ // <listitem>
+ // <p><b>Note:</b></p>

Modified: packages/scilab-toolboxes/celestlab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/celestlab/trunk/debian/rules?rev=44061&op=diff
==============================================================================
--- packages/scilab-toolboxes/celestlab/trunk/debian/rules (original)
+++ packages/scilab-toolboxes/celestlab/trunk/debian/rules Thu Nov 24 12:11:52 2011
@@ -2,7 +2,6 @@
 # Copyright 2008 Sylvestre Ledru <sylvestre.ledru at inria.fr>
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 build-indep: 
 		DEB_MAKE_ENVVARS=SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/bin/scilab -nw -f builder.sce