From bb43233a367fcdbb73a4152bb3f9f30e305b2abb Mon Sep 17 00:00:00 2001 From: Benjamin Edward Webb Date: Sun, 8 Oct 2017 13:14:06 -0500 Subject: [PATCH 1/3] Updated README.md; Added step 4 to automatic script; Added to contributors.txt --- CONTRIBUTORS.txt | 1 + README.md | 22 +++++++++++----------- update-new-version.sh | 4 ++++ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 8fc3428..5488708 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -4,3 +4,4 @@ Francesco Levorato (flevour) Andy Balaam (andybalaam) Patrick Lucas Stefan65 +Ben Webb (benjaminedwardwebb) diff --git a/README.md b/README.md index 7cc87f8..a9dee35 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # intellij-idea-community .deb Packages of IntelliJ IDEA Community Edition for Ubuntu -The latest upstream version is 2017.2.4 which is included in the package version 2017.2.4. +The latest upstream version is 2017.2.5 which is included in the package version 2017.2.5. ## Adding the ppa to Ubuntu @@ -13,20 +13,20 @@ sudo apt-get install intellij-idea-community ## Updating the package -To update the version follow the following steps (the old version is here 2017.2.3 and the new one 15.0.2): +To update the version follow these steps. Replace all instances of `[year].[major].[minor]` with the new version numbers (e.g., 2017.2.5++). 1. Fork the repo 2. Create your own feature branch ``` - git checkout -b version-2017.2.4 + git checkout -b version-[year].[major].[minor] ``` 3. Rename the following ``` - mv intellij-idea-community_2017.2.3 intellij-idea-community_2017.2.4 - mv intellij-idea-community_2017.2.3.orig.tar.gz intellij-idea-community_2017.2.4.orig.tar.gz + mv intellij-idea-community_2017.2.5 intellij-idea-community_[year].[major].[minor] + mv intellij-idea-community_2017.2.5.orig.tar.gz intellij-idea-community_[year].[major].[minor].orig.tar.gz ``` 4. Edit the README.md and update the version numbers @@ -34,7 +34,7 @@ To update the version follow the following steps (the old version is here 2017.2 5. Go into the build files directory ``` - cd intellij-idea-community_2017.2.4/debian + cd intellij-idea-community_[year].[major].[minor]/debian ``` 6. Edit the changelog file and prepend a new changelog entry. You can just copy an old one and update the values in it @@ -62,13 +62,13 @@ To update the version follow the following steps (the old version is here 2017.2 11. Remove the old files ``` - rm intellij-idea-community_2017.2.3-1* + rm intellij-idea-community_2017.2.5-1* ``` 12. Install the package to test it ``` - sudo dpkg -i intellij-idea-community_2017.2.4_all.deb + sudo dpkg -i intellij-idea-community_[year].[major].[minor]_all.deb ``` 13. If everything works, add yourself to the CONTRIBUTORS.txt @@ -77,20 +77,20 @@ To update the version follow the following steps (the old version is here 2017.2 ``` git add -A - git commit -m "Version 2017.2.4" + git commit -m "Version [year].[major].[minor]" ``` 15. Push to the branch ``` - git push origin version-2017.2.4 + git push origin version-[year].[major].[minor] ``` 16. Create new pull request ## Automatically do steps 2 to 12 -Run `./update-new-version.sh 2017.2.3 2017.2.4` +Run `./update-new-version.sh 2017.2.5 [year].[major].[minor]` ## Setting up the build environment diff --git a/update-new-version.sh b/update-new-version.sh index 7a3bae2..e105154 100755 --- a/update-new-version.sh +++ b/update-new-version.sh @@ -13,6 +13,10 @@ function main { mv intellij-idea-community_{$old,$new} mv intellij-idea-community_{$old,$new}.orig.tar.gz + # 4. Edit README.md to update latest version number. + sed "s/$old/$new/g" ./README.md > ./README.md.tmp + mv ./README.md.tmp ./README.md + echo "intellij-idea-community ($new-1) artful; urgency=low * Upstream Version $new From 959df24d384c988b67c13d831e91c7842907c3e5 Mon Sep 17 00:00:00 2001 From: Benjamin Edward Webb Date: Sun, 8 Oct 2017 13:20:25 -0500 Subject: [PATCH 2/3] Revert "Updated README.md; Added step 4 to automatic script; Added to contributors.txt" This reverts commit bb43233a367fcdbb73a4152bb3f9f30e305b2abb. --- CONTRIBUTORS.txt | 1 - README.md | 22 +++++++++++----------- update-new-version.sh | 4 ---- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 5488708..8fc3428 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -4,4 +4,3 @@ Francesco Levorato (flevour) Andy Balaam (andybalaam) Patrick Lucas Stefan65 -Ben Webb (benjaminedwardwebb) diff --git a/README.md b/README.md index a9dee35..7cc87f8 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # intellij-idea-community .deb Packages of IntelliJ IDEA Community Edition for Ubuntu -The latest upstream version is 2017.2.5 which is included in the package version 2017.2.5. +The latest upstream version is 2017.2.4 which is included in the package version 2017.2.4. ## Adding the ppa to Ubuntu @@ -13,20 +13,20 @@ sudo apt-get install intellij-idea-community ## Updating the package -To update the version follow these steps. Replace all instances of `[year].[major].[minor]` with the new version numbers (e.g., 2017.2.5++). +To update the version follow the following steps (the old version is here 2017.2.3 and the new one 15.0.2): 1. Fork the repo 2. Create your own feature branch ``` - git checkout -b version-[year].[major].[minor] + git checkout -b version-2017.2.4 ``` 3. Rename the following ``` - mv intellij-idea-community_2017.2.5 intellij-idea-community_[year].[major].[minor] - mv intellij-idea-community_2017.2.5.orig.tar.gz intellij-idea-community_[year].[major].[minor].orig.tar.gz + mv intellij-idea-community_2017.2.3 intellij-idea-community_2017.2.4 + mv intellij-idea-community_2017.2.3.orig.tar.gz intellij-idea-community_2017.2.4.orig.tar.gz ``` 4. Edit the README.md and update the version numbers @@ -34,7 +34,7 @@ To update the version follow these steps. Replace all instances of `[year].[majo 5. Go into the build files directory ``` - cd intellij-idea-community_[year].[major].[minor]/debian + cd intellij-idea-community_2017.2.4/debian ``` 6. Edit the changelog file and prepend a new changelog entry. You can just copy an old one and update the values in it @@ -62,13 +62,13 @@ To update the version follow these steps. Replace all instances of `[year].[majo 11. Remove the old files ``` - rm intellij-idea-community_2017.2.5-1* + rm intellij-idea-community_2017.2.3-1* ``` 12. Install the package to test it ``` - sudo dpkg -i intellij-idea-community_[year].[major].[minor]_all.deb + sudo dpkg -i intellij-idea-community_2017.2.4_all.deb ``` 13. If everything works, add yourself to the CONTRIBUTORS.txt @@ -77,20 +77,20 @@ To update the version follow these steps. Replace all instances of `[year].[majo ``` git add -A - git commit -m "Version [year].[major].[minor]" + git commit -m "Version 2017.2.4" ``` 15. Push to the branch ``` - git push origin version-[year].[major].[minor] + git push origin version-2017.2.4 ``` 16. Create new pull request ## Automatically do steps 2 to 12 -Run `./update-new-version.sh 2017.2.5 [year].[major].[minor]` +Run `./update-new-version.sh 2017.2.3 2017.2.4` ## Setting up the build environment diff --git a/update-new-version.sh b/update-new-version.sh index e105154..7a3bae2 100755 --- a/update-new-version.sh +++ b/update-new-version.sh @@ -13,10 +13,6 @@ function main { mv intellij-idea-community_{$old,$new} mv intellij-idea-community_{$old,$new}.orig.tar.gz - # 4. Edit README.md to update latest version number. - sed "s/$old/$new/g" ./README.md > ./README.md.tmp - mv ./README.md.tmp ./README.md - echo "intellij-idea-community ($new-1) artful; urgency=low * Upstream Version $new From af47a1eecbb96153b7aa5900fe53f4ee8f85ddba Mon Sep 17 00:00:00 2001 From: Benjamin Edward Webb Date: Sun, 8 Oct 2017 13:24:07 -0500 Subject: [PATCH 3/3] Updated README; Added step 4 to auto update script; Added to CONTRIBUTORS.txt --- CONTRIBUTORS.txt | 1 + README.md | 22 +++++++++++----------- update-new-version.sh | 4 ++++ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 8fc3428..5488708 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -4,3 +4,4 @@ Francesco Levorato (flevour) Andy Balaam (andybalaam) Patrick Lucas Stefan65 +Ben Webb (benjaminedwardwebb) diff --git a/README.md b/README.md index 7cc87f8..a9dee35 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # intellij-idea-community .deb Packages of IntelliJ IDEA Community Edition for Ubuntu -The latest upstream version is 2017.2.4 which is included in the package version 2017.2.4. +The latest upstream version is 2017.2.5 which is included in the package version 2017.2.5. ## Adding the ppa to Ubuntu @@ -13,20 +13,20 @@ sudo apt-get install intellij-idea-community ## Updating the package -To update the version follow the following steps (the old version is here 2017.2.3 and the new one 15.0.2): +To update the version follow these steps. Replace all instances of `[year].[major].[minor]` with the new version numbers (e.g., 2017.2.5++). 1. Fork the repo 2. Create your own feature branch ``` - git checkout -b version-2017.2.4 + git checkout -b version-[year].[major].[minor] ``` 3. Rename the following ``` - mv intellij-idea-community_2017.2.3 intellij-idea-community_2017.2.4 - mv intellij-idea-community_2017.2.3.orig.tar.gz intellij-idea-community_2017.2.4.orig.tar.gz + mv intellij-idea-community_2017.2.5 intellij-idea-community_[year].[major].[minor] + mv intellij-idea-community_2017.2.5.orig.tar.gz intellij-idea-community_[year].[major].[minor].orig.tar.gz ``` 4. Edit the README.md and update the version numbers @@ -34,7 +34,7 @@ To update the version follow the following steps (the old version is here 2017.2 5. Go into the build files directory ``` - cd intellij-idea-community_2017.2.4/debian + cd intellij-idea-community_[year].[major].[minor]/debian ``` 6. Edit the changelog file and prepend a new changelog entry. You can just copy an old one and update the values in it @@ -62,13 +62,13 @@ To update the version follow the following steps (the old version is here 2017.2 11. Remove the old files ``` - rm intellij-idea-community_2017.2.3-1* + rm intellij-idea-community_2017.2.5-1* ``` 12. Install the package to test it ``` - sudo dpkg -i intellij-idea-community_2017.2.4_all.deb + sudo dpkg -i intellij-idea-community_[year].[major].[minor]_all.deb ``` 13. If everything works, add yourself to the CONTRIBUTORS.txt @@ -77,20 +77,20 @@ To update the version follow the following steps (the old version is here 2017.2 ``` git add -A - git commit -m "Version 2017.2.4" + git commit -m "Version [year].[major].[minor]" ``` 15. Push to the branch ``` - git push origin version-2017.2.4 + git push origin version-[year].[major].[minor] ``` 16. Create new pull request ## Automatically do steps 2 to 12 -Run `./update-new-version.sh 2017.2.3 2017.2.4` +Run `./update-new-version.sh 2017.2.5 [year].[major].[minor]` ## Setting up the build environment diff --git a/update-new-version.sh b/update-new-version.sh index 7a3bae2..e105154 100755 --- a/update-new-version.sh +++ b/update-new-version.sh @@ -13,6 +13,10 @@ function main { mv intellij-idea-community_{$old,$new} mv intellij-idea-community_{$old,$new}.orig.tar.gz + # 4. Edit README.md to update latest version number. + sed "s/$old/$new/g" ./README.md > ./README.md.tmp + mv ./README.md.tmp ./README.md + echo "intellij-idea-community ($new-1) artful; urgency=low * Upstream Version $new