[DRE-commits] [gist] 06/07: Stop depending on ruby-ronn, which needs the obsolete ruby-hpricot

[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 e8d69a4b8bdda92a30bc74a93e5bb04760241c9a
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Tue Aug 18 23:00:01 2015 +0000

    Stop depending on ruby-ronn, which needs the obsolete ruby-hpricot
---
 debian/control        |   1 -
 debian/patches/rename | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/rules          |  13 ++-----
 3 files changed, 105 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index 2884923..387d277 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Build-Depends: debhelper (>= 9~),
                gem2deb,
                locales,
                rake,
-               ruby-ronn,
                ruby-rspec,
                ruby-webmock
 Standards-Version: 3.9.6
diff --git a/debian/patches/rename b/debian/patches/rename
index 7bcce47..08d0534 100644
--- a/debian/patches/rename
+++ b/debian/patches/rename
@@ -165,3 +165,104 @@ Index: gist/gist.gemspec
  
    s.add_development_dependency 'rake'
    s.add_development_dependency 'ronn'
+Index: gist/build/gist.1
+===================================================================
+--- gist.orig/build/gist.1
++++ gist/build/gist.1
+@@ -37,67 +37,67 @@ brew install gist
+ To upload the contents of \fBa\.rb\fR just:
+ .
+ .IP
+-gist a\.rb
++gist-paste a\.rb
+ .
+ .IP "\(bu" 4
+ Upload multiple files:
+ .
+ .IP
+-gist a b c gist *\.rb
++gist-paste a b c gist *\.rb
+ .
+ .IP "\(bu" 4
+ By default it reads from STDIN, and you can set a filename with \fB\-f\fR\.
+ .
+ .IP
+-gist \-f test\.rb <a\.rb
++gist-paste \-f test\.rb <a\.rb
+ .
+ .IP "\(bu" 4
+ Alternatively, you can just paste from the clipboard:
+ .
+ .IP
+-gist \-P
++gist-paste \-P
+ .
+ .IP "\(bu" 4
+ Use \fB\-p\fR to make the gist private:
+ .
+ .IP
+-gist \-p a\.rb
++gist-paste \-p a\.rb
+ .
+ .IP "\(bu" 4
+ Use \fB\-d\fR to add a description:
+ .
+ .IP
+-gist \-d "Random rbx bug" a\.rb
++gist-paste \-d "Random rbx bug" a\.rb
+ .
+ .IP "\(bu" 4
+ You can update existing gists with \fB\-u\fR:
+ .
+ .IP
+-gist \-u GIST_ID FILE_NAME gist \-u 42f2c239d2eb57299408 test\.txt
++gist-paste \-u GIST_ID FILE_NAME gist \-u 42f2c239d2eb57299408 test\.txt
+ .
+ .IP "\(bu" 4
+ If you\'d like to copy the resulting URL to your clipboard, use \fB\-c\fR\.
+ .
+ .IP
+-gist \-c <a\.rb
++gist-paste \-c <a\.rb
+ .
+ .IP "\(bu" 4
+ If you\'d like to copy the resulting embeddable URL to your clipboard, use \fB\-e\fR\.
+ .
+ .IP
+-gist \-e <a\.rb
++gist-paste \-e <a\.rb
+ .
+ .IP "\(bu" 4
+ And you can just ask gist to open a browser window directly with \fB\-o\fR\.
+ .
+ .IP
+-gist \-o <a\.rb
++gist-paste \-o <a\.rb
+ .
+ .IP "\(bu" 4
+ To list (public gists or all gists for authed user) gists for user
+ .
+ .IP
+-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
+ .
+ .nf
+ 
+-gist \-\-login
++gist-paste \-\-login
+ Obtaining OAuth2 access_token from github\.
+ GitHub username: ConradIrwin
+ GitHub password:
+@@ -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
+-gist \-a a\.rb
++gist-paste \-a a\.rb
+ .
+ .IP "" 0
+ .
diff --git a/debian/rules b/debian/rules
index a3a4411..1fb6aab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,18 +15,13 @@
 	dh $@ --buildsystem=ruby --with ruby
 
 override_dh_auto_build:
-	if [ ! -d build.shipped ]; then \
-		mv build build.shipped; \
-	fi
-	LC_ALL=C.UTF-8 rake man
 	mv bin/gist bin/gist-paste
+	mv build/gist.1 build/gist-paste.1
 
 override_dh_auto_clean:
-	if [ -d build.shipped ]; then \
-		rm -rf build; \
-		mv build.shipped build; \
-	fi
 	if [ -f bin/gist-paste ]; then \
 		mv bin/gist-paste bin/gist; \
 	fi
-
+	if [ -f build/gist-paste.1 ]; then \
+		mv build/gist-paste.1 build/gist.1; \
+	fi

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