From 06d7cda934b2beb0ca4d0df669c23d2a2f4baafe Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Fri, 9 Dec 2016 15:34:43 -0500
Subject: [PATCH 1/2] consolidate SQL script into standard name #3522

---
 scripts/database/upgrades/3405-filemetadata-directory-label.sql  | 1 -
 .../{3354-alt-checksum.sql => upgrade_v4.5.1_to_v4.6.sql}        | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 scripts/database/upgrades/3405-filemetadata-directory-label.sql
 rename scripts/database/upgrades/{3354-alt-checksum.sql => upgrade_v4.5.1_to_v4.6.sql} (85%)

diff --git a/scripts/database/upgrades/3405-filemetadata-directory-label.sql b/scripts/database/upgrades/3405-filemetadata-directory-label.sql
deleted file mode 100644
index 330e2718cc9..00000000000
--- a/scripts/database/upgrades/3405-filemetadata-directory-label.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE filemetadata ADD COLUMN directorylabel character varying(255);
\ No newline at end of file
diff --git a/scripts/database/upgrades/3354-alt-checksum.sql b/scripts/database/upgrades/upgrade_v4.5.1_to_v4.6.sql
similarity index 85%
rename from scripts/database/upgrades/3354-alt-checksum.sql
rename to scripts/database/upgrades/upgrade_v4.5.1_to_v4.6.sql
index 42956fcc65d..eb7d95477b6 100644
--- a/scripts/database/upgrades/3354-alt-checksum.sql
+++ b/scripts/database/upgrades/upgrade_v4.5.1_to_v4.6.sql
@@ -5,3 +5,4 @@ ALTER TABLE datafile ALTER COLUMN checksumtype SET NOT NULL;
 -- note that in the database we use "SHA1" (no hyphen) but the GUI will show "SHA-1"
 --UPDATE datafile SET checksumtype = 'SHA1';
 ALTER TABLE datafile RENAME md5 TO checksumvalue;
+ALTER TABLE filemetadata ADD COLUMN directorylabel character varying(255);

From 2764b97f83f66292b3513f3d408f44d9ca557cc3 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Fri, 9 Dec 2016 15:38:19 -0500
Subject: [PATCH 2/2] bump version to 4.6 #3522

---
 doc/sphinx-guides/source/conf.py   | 4 ++--
 doc/sphinx-guides/source/index.rst | 6 +++---
 pom.xml                            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/sphinx-guides/source/conf.py b/doc/sphinx-guides/source/conf.py
index ca7b40d4dc6..4153e93a64f 100755
--- a/doc/sphinx-guides/source/conf.py
+++ b/doc/sphinx-guides/source/conf.py
@@ -64,9 +64,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.5.1'
+version = '4.6'
 # The full version, including alpha/beta/rc tags.
-release = '4.5.1'
+release = '4.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/sphinx-guides/source/index.rst b/doc/sphinx-guides/source/index.rst
index 8fd7056c032..fa398008743 100755
--- a/doc/sphinx-guides/source/index.rst
+++ b/doc/sphinx-guides/source/index.rst
@@ -3,10 +3,10 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Dataverse 4.5.1 Guides
-======================
+Dataverse 4.6 Guides
+====================
 
-These guides are for the most recent version of Dataverse. For the guides for **version 4.5** please go `here <http://guides.dataverse.org/en/4.5/>`_.
+These guides are for the most recent version of Dataverse. For the guides for **version 4.5.1** please go `here <http://guides.dataverse.org/en/4.5.1/>`_.
 
 .. toctree::
   :glob:
diff --git a/pom.xml b/pom.xml
index 7812b866812..dd12a75e337 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>edu.harvard.iq</groupId>
     <artifactId>dataverse</artifactId>
-    <version>4.5.1</version>
+    <version>4.6</version>
     <packaging>war</packaging>
 
     <name>dataverse</name>