Changeset 1518 for releases

Timestamp:

Apr 25, 2010 12:33:17 PM (11 years ago)

Author:

tkr

Message:

Merging r1515:1517 from trunk

Location:

releases/0.5.29

Files:

• . (modified) (1 prop)
• commit_new_release (modified) (1 diff)
• set_externals (modified) (2 diffs)

releases/0.5.29/commit_new_release

@@ -91 +91 @@
 echo "===> Restoring version number (${stableBranch}stable) in configure.ac files"
 for i in $conf_ac_files; do
-  sed -e "s|AC_INIT\(.*\)\[[0-9\.]*\],\(.*\)|AC_INIT\1[${stableBranch}stable],\2|" $i > bla
+  sed -e "s|AC_INIT\(.*\)\[[0-9\.]*\],\(.*\)|AC_INIT\1[${stableBranch}],\2|" $i > bla
   mv bla $i
   svn di $i

releases/0.5.29/set_externals

@@ -110 +110 @@
 
   if test -r $Dependencies; then
+
+    rm -f Externals
 
     echo ''
@@ -171 +173 @@
     svn pset svn:externals -F Externals .
  
-    #Leave the new externals file there for no
+    #Leave the new externals file there for now
     #rm -f Externals