Changeset 1581:9b4081b29202

Timestamp:

08/25/13 18:46:29 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Cope with new README.md rather than old README for build and update, addresses #1510

Files:

• Makefile (modified) (2 diffs)
• inc/dbschema/upgrade.php (modified) (1 diff)

Makefile

@@ -11 +11 @@
      
      ## Copy needed folders and files
-     cp -pRf ./admin ./inc ./themes ./index.php ./CHANGELOG ./CREDITS ./LICENSE ./README ./$(DC)/
+     cp -pRf ./admin ./inc ./themes ./index.php ./CHANGELOG ./CREDITS ./LICENSE ./README.md ./CONTRIBUTING.md ./$(DC)/
      
      ## Locales directory
@@ -88 +88 @@
 
 deb:
-     cp ./README debian/README
+     cp ./README.md debian/README
      dpkg-buildpackage -rfakeroot
 

inc/dbschema/upgrade.php

@@ -336 +336 @@
                }
 
-               if (version_compare($version, '2.5.1', '<='))
+               if (version_compare($version,'2.5.1','<='))
                {
                     // Flash enhanced upload no longer needed
                     @unlink(DC_ROOT.'/'.'inc/swf/swfupload.swf');
+               }
+
+               if (version_compare($version,'2.6','<='))
+               {
+                    // README has been replaced by README.md and CONTRIBUTING.md
+                    @unlink(DC_ROOT.'/'.'README');
                }