[Pkg-octave-commit] r1505 - in octave-pkg-dev/trunk: . debian

[Rafael Laboissiere]

Author: rafael
Date: 2008-03-25 15:06:58 +0000 (Tue, 25 Mar 2008)
New Revision: 1505

Modified:
   octave-pkg-dev/trunk/debian/install
   octave-pkg-dev/trunk/debian/rules
   octave-pkg-dev/trunk/octave-pkg-dev.pl.in
   octave-pkg-dev/trunk/postinst
   octave-pkg-dev/trunk/prerm
Log:
Use 'OCTAVE' instead of 'PACKAGE' substitution string

Modified: octave-pkg-dev/trunk/debian/install
===================================================================
--- octave-pkg-dev/trunk/debian/install	2008-03-25 15:06:21 UTC (rev 1504)
+++ octave-pkg-dev/trunk/debian/install	2008-03-25 15:06:58 UTC (rev 1505)
@@ -3,3 +3,5 @@
 postinst		usr/share/octave/debian
 prerm			usr/share/octave/debian
 get-oct-pkg-src.pl	usr/share/octave/debian
+pkg.m			usr/share/octave/debian
+cstrcat.m		usr/share/octave/debian

Modified: octave-pkg-dev/trunk/debian/rules
===================================================================
--- octave-pkg-dev/trunk/debian/rules	2008-03-25 15:06:21 UTC (rev 1504)
+++ octave-pkg-dev/trunk/debian/rules	2008-03-25 15:06:58 UTC (rev 1505)
@@ -10,7 +10,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 %: %.in
-	sed 's/@PACKAGE@/$(OCTPKG)/;s/@VERSION@/$(OCTVER)/' < $< > $@
+	sed 's/@OCTAVE@/$(OCTPKG)/;s/@VERSION@/$(OCTVER)/' < $< > $@
 
 build/octave-pkg-dev:: $(FILES)
 	chmod +x *.pl

Modified: octave-pkg-dev/trunk/octave-pkg-dev.pl.in
===================================================================
--- octave-pkg-dev/trunk/octave-pkg-dev.pl.in	2008-03-25 15:06:21 UTC (rev 1504)
+++ octave-pkg-dev/trunk/octave-pkg-dev.pl.in	2008-03-25 15:06:58 UTC (rev 1505)
@@ -54,10 +54,10 @@
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
     delsubstvar ($package, 'octave:Depends');
-    addsubstvar ($package, 'octave:Depends', '@PACKAGE@', '>= @VERSION@');
+    addsubstvar ($package, 'octave:Depends', '@OCTAVE@', '>= @VERSION@');
     for my $pkg (keys %depends) {
         addsubstvar ($package, 'octave:Depends', $pkg, $depends {$pkg});
     }
-    autoscript ($package, 'postinst', 'postinst', 's/#PACKAGE#/@PACKAGE@/');
-    autoscript ($package, 'prerm', 'prerm', 's/#PACKAGE#/@PACKAGE@/');
+    autoscript ($package, 'postinst', 'postinst', 's/#OCTAVE#/@OCTAVE@/');
+    autoscript ($package, 'prerm', 'prerm', 's/#OCTAVE#/@OCTAVE@/');
 }

Modified: octave-pkg-dev/trunk/postinst
===================================================================
--- octave-pkg-dev/trunk/postinst	2008-03-25 15:06:21 UTC (rev 1504)
+++ octave-pkg-dev/trunk/postinst	2008-03-25 15:06:58 UTC (rev 1505)
@@ -1,5 +1,5 @@
 # -*- sh -*-
 
 if [ "$1" = configure ] ; then
-    #PACKAGE# -f -q -H --no-site-file --eval "pkg ('rebuild');"
+    #OCTAVE# -f -q -H --no-site-file --eval "pkg ('rebuild');"
 fi

Modified: octave-pkg-dev/trunk/prerm
===================================================================
--- octave-pkg-dev/trunk/prerm	2008-03-25 15:06:21 UTC (rev 1504)
+++ octave-pkg-dev/trunk/prerm	2008-03-25 15:06:58 UTC (rev 1505)
@@ -2,5 +2,5 @@
 
 case "$1" in
     upgrade|remove|purge)
-        #PACKAGE# -f -q -H --no-site-file --eval "pkg ('rebuild');"
+        #OCTAVE# -f -q -H --no-site-file --eval "pkg ('rebuild');"
 esac