[DRE-commits] [gist] 02/06: Refresh rename patch

[zeha at debian.org]

This is an automated email from the git hooks/post-receive script.

zeha pushed a commit to branch master
in repository gist.

commit 685edce97516cab3ceaf0eb496b809173241724e
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Tue Jul 11 10:55:25 2017 +0000

    Refresh rename patch
---
 debian/patches/rename | 61 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/debian/patches/rename b/debian/patches/rename
index 4fd0303..1a514c9 100644
--- a/debian/patches/rename
+++ b/debian/patches/rename
@@ -15,7 +15,7 @@ Index: gist/README.md
  upload content to https://gist.github.com/.
  
  ## Installation
-@@ -25,52 +25,52 @@ upload content to https://gist.github.co
+@@ -25,57 +25,57 @@ upload content to https://gist.github.co
  
  ‌To upload the contents of `a.rb` just:
  
@@ -66,8 +66,7 @@ Index: gist/README.md
 -    gist -e <a.rb
 +    gist-paste -e <a.rb
  
--‌And you can just ask gist to open a browser window directly with `-o`.
-+‌And you can just ask gist-paste to open a browser window directly with `-o`.
+ ‌And you can just ask gist to open a browser window directly with `-o`.
  
 -    gist -o <a.rb
 +    gist-paste -o <a.rb
@@ -79,12 +78,19 @@ Index: gist/README.md
 +    gist-paste -l : all gists for authed user
 +    gist-paste -l defunkt : list defunkt's public gists
  
+ To read a gist and print it to STDOUT
+ 
+-    gist -r GIST_ID
+-    gist -r 374130
++    gist-paste -r GIST_ID
++    gist-paste -r 374130
+ 
 -‌See `gist --help` for more detail.
 +‌See `gist-paste --help` for more detail.
  
  ## Login
  
-@@ -78,7 +78,7 @@ If you want to associate your gists with
+@@ -83,7 +83,7 @@ If you want to associate your gists with
  with gist. It doesn't store your username and password, it just uses them to get
  an OAuth2 token (with the "gist" permission).
  
@@ -93,29 +99,37 @@ Index: gist/README.md
      Obtaining OAuth2 access_token from github.
      GitHub username: ConradIrwin
      GitHub password:
-@@ -93,7 +93,7 @@ you can save your Github Enterprise toke
+@@ -96,16 +96,16 @@ file.
  
  ‌After you've done this, you can still upload gists anonymously with `-a`.
  
 -    gist -a a.rb
 +    gist-paste -a a.rb
  
- # Library
- 
-@@ -128,22 +128,22 @@ in `~/.gist`, where it can later be read
+ ### GitHub Enterprise
  
- ## GitHub enterprise
- 
--‌If you'd like `gist` to use your locally installed [GitHub Enterprise](https://enterprise.github.com/),
-+‌If you'd like `gist-paste` to use your locally installed [GitHub Enterprise](https://enterprise.github.com/),
- you need to export the `GITHUB_URL` environment variable in your `~/.bashrc`.
+-If you'd like `gist` to use your locally installed [GitHub Enterprise](https://enterprise.github.com/),
++If you'd like `gist-paste` to use your locally installed [GitHub Enterprise](https://enterprise.github.com/),
+ you need to export the `GITHUB_URL` environment variable (usually done in your `~/.bashrc`).
  
      export GITHUB_URL=http://github.internal.example.com/
  
--‌Once you've done this and restarted your terminal (or run `source ~/.bashrc`), gist will
-+‌Once you've done this and restarted your terminal (or run `source ~/.bashrc`), gist-paste will
+-Once you've done this and restarted your terminal (or run `source ~/.bashrc`), gist will
++Once you've done this and restarted your terminal (or run `source ~/.bashrc`), gist-paste will
  automatically use github enterprise instead of the public github.com
  
+ Your token for GitHub Enterprise will be stored in `.gist.<protocol>.<server.name>[.<port>]` (e.g.
+@@ -120,7 +120,7 @@ setting it to the public URL will not wo
+ If you cannot use passwords, as most Enterprise installations do, you can generate the token via the web interface
+ and then simply save the string in the correct file. Avoid line breaks or you might see:
+ ```
+-$ gist -l
++$ gist-paste -l
+ Error: Bad credentials
+ ```
+ 
+@@ -157,10 +157,10 @@ in `~/.gist`, where it can later be read
+ 
  ## Configuration
  
 -‌If you'd like `-o` or `-c` to be the default when you use the gist executable, add an
@@ -123,14 +137,11 @@ Index: gist/README.md
  alias to your `~/.bashrc` (or equivalent). For example:
  
 -    alias gist='gist -c'
-+    alias gist-paste='gist-paste -c'
++    alias gist='gist-paste -c'
  
--‌If you'd prefer gist to open a different browser, then you can export the BROWSER
-+‌If you'd prefer gist-paste to open a different browser, then you can export the BROWSER
+ ‌If you'd prefer gist to open a different browser, then you can export the BROWSER
  environment variable:
- 
-     export BROWSER=google-chrome
-@@ -152,7 +152,7 @@ If clipboard or browser integration don'
+@@ -171,7 +171,7 @@ If clipboard or browser integration don'
  (more ideally) a pull request.
  
  If you need to use an HTTP proxy to access the internet, export the `HTTP_PROXY` or
@@ -246,9 +257,9 @@ Index: gist/build/gist.1
 -gist \-l : all gists for authed user gist \-l defunkt : list defunkt\'s public gists
 +gist-paste \-l : all gists for authed user gist \-l defunkt : list defunkt\'s public gists
  .
- .IP "\(bu" 4
- See \fBgist \-\-help\fR for more detail\.
-@@ -111,7 +111,7 @@ If you want to associate your gists with
+ .IP "" 0
+ .
+@@ -127,7 +127,7 @@ If you want to associate your gists with
  .
  .nf
  
@@ -257,7 +268,7 @@ Index: gist/build/gist.1
  Obtaining OAuth2 access_token from github\.
  GitHub username: ConradIrwin
  GitHub password:
-@@ -129,7 +129,7 @@ This token is stored in \fB~/\.gist\fR a
+@@ -145,7 +145,7 @@ This token is stored in \fB~/\.gist\fR a
  After you\'ve done this, you can still upload gists anonymously with \fB\-a\fR\.
  .
  .IP

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gist.git