backports: FSF address, don't disable rsync, use SelfUpdateTrees not

SelfUpdateCVSTrees
fink · Oct 24, 2007 · 3552a5c · 3552a5c
1 parent 16e173e
commit 3552a5c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,8 @@
 2007-10-24  Dave Morrison  <drm@finkproject.org>
 
 	* postinstall.pl.in: better documentation, and cp -> cp -f
+	* bootstrap: backports: FSF address, don't disable rsync, use
+	SelfUpdateTrees not SelfUpdateCVSTrees
 
 2007-10-23  Dave Morrison  <drm@finkproject.org>
 

diff --git a/bootstrap b/bootstrap
@@ -21,7 +21,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA	 02111-1307, USA.
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA.
 #
 
 use 5.008_001;	 # perl 5.8.1 or newer required
@@ -405,14 +405,8 @@ Basepath: $installto
 RootMethod: $rootmethod
 Trees: local/main stable/main stable/crypto
 Distribution: $distribution
-SelfUpdateCVSTrees: $distribution_infodir{$distribution}
+SelfUpdateTrees: $distribution_infodir{$distribution}
 EOF
-	# We temporarily force cvs updating for 10.5, until we've decided
-	# how to handle rsync updating
-
-	if ($distribution eq "10.5") {
-		print CONFIG "SelfUpdateMethod: cvs\n";
-}
 
 close(CONFIG) or die "can't write configuration $configpath: $!\n";