[DRE-commits] [atig] 03/05: Refresh patches

[Youhei SASAKI]

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

uwabami-guest pushed a commit to annotated tag debian/0.5.0-1
in repository atig.

commit 83a917bd8128699e75fccef64f4cf5883e3414c6
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Sun Dec 27 14:21:28 2015 +0900

    Refresh patches
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/atig.install                                      |  1 +
 debian/changelog                                         |  6 ++++++
 .../0001-Drop-Bundler-and-RubyGems-dependencies.patch    | 16 ++++++----------
 .../0002-Disable-update-checker-for-Debian-Package.patch | 13 ++-----------
 debian/patches/series                                    |  2 +-
 debian/rules                                             |  5 +++++
 6 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/debian/atig.install b/debian/atig.install
new file mode 100644
index 0000000..d0e5438
--- /dev/null
+++ b/debian/atig.install
@@ -0,0 +1 @@
+exe/* usr/bin/
diff --git a/debian/changelog b/debian/changelog
index 4dd7ddc..4d94a4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+atig (0.5.0-1) unstable; urgency=medium
+
+  * Imported Upstream version 0.5.0
+
+ -- Youhei SASAKI <uwabami at gfd-dennou.org>  Sun, 27 Dec 2015 14:05:56 +0900
+
 atig (0.4.5-2) unstable; urgency=medium
 
   * Update patches: import upstream Git HEAD
diff --git a/debian/patches/0001-Drop-Bundler-and-RubyGems-dependencies.patch b/debian/patches/0001-Drop-Bundler-and-RubyGems-dependencies.patch
index 93d81e8..04f06fc 100644
--- a/debian/patches/0001-Drop-Bundler-and-RubyGems-dependencies.patch
+++ b/debian/patches/0001-Drop-Bundler-and-RubyGems-dependencies.patch
@@ -8,20 +8,16 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  spec/spec_helper.rb | 6 +++++-
  2 files changed, 5 insertions(+), 2 deletions(-)
 
-diff --git a/atig.gemspec b/atig.gemspec
-index f3fd020..b504a53 100644
 --- a/atig.gemspec
 +++ b/atig.gemspec
-@@ -22,7 +22,6 @@ Gem::Specification.new do |gem|
-   gem.add_dependency 'oauth', ['>= 0']
-   gem.add_dependency 'twitter-text', ['~> 1.7.0']
+@@ -23,7 +23,6 @@
+   spec.add_dependency 'oauth', ['>= 0']
+   spec.add_dependency 'twitter-text', ['~> 1.7.0']
  
--  gem.add_development_dependency 'bundler'
-   gem.add_development_dependency 'rake'
-   gem.add_development_dependency 'coveralls'
+-  spec.add_development_dependency 'bundler'
+   spec.add_development_dependency 'rake'
+   spec.add_development_dependency 'coveralls'
  end
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 39a4f10..b7233c5 100644
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
 @@ -1,5 +1,9 @@
diff --git a/debian/patches/0002-Disable-update-checker-for-Debian-Package.patch b/debian/patches/0002-Disable-update-checker-for-Debian-Package.patch
index bc60381..27581a6 100644
--- a/debian/patches/0002-Disable-update-checker-for-Debian-Package.patch
+++ b/debian/patches/0002-Disable-update-checker-for-Debian-Package.patch
@@ -11,8 +11,6 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  delete mode 100644 lib/atig/update_checker.rb
  delete mode 100644 spec/update_checker_spec.rb
 
-diff --git a/lib/atig/channel/timeline.rb b/lib/atig/channel/timeline.rb
-index 0ef28bc..3f4d982 100644
 --- a/lib/atig/channel/timeline.rb
 +++ b/lib/atig/channel/timeline.rb
 @@ -2,7 +2,7 @@
@@ -24,7 +22,7 @@ index 0ef28bc..3f4d982 100644
  
  module Atig
    module Channel
-@@ -23,19 +23,19 @@ module Atig
+@@ -23,19 +23,19 @@
            end
          end
  
@@ -57,9 +55,6 @@ index 0ef28bc..3f4d982 100644
  
          db.statuses.listen do|entry|
            if db.followings.include?(entry.user) or
-diff --git a/lib/atig/update_checker.rb b/lib/atig/update_checker.rb
-deleted file mode 100644
-index 1125c3b..0000000
 --- a/lib/atig/update_checker.rb
 +++ /dev/null
 @@ -1,56 +0,0 @@
@@ -119,15 +114,11 @@ index 1125c3b..0000000
 -    module_function :latest, :commits, :server_version, :local_repos?, :git?, :git_repos?
 -  end
 -end
-diff --git a/spec/update_checker_spec.rb b/spec/update_checker_spec.rb
-deleted file mode 100644
-index 5141733..0000000
 --- a/spec/update_checker_spec.rb
 +++ /dev/null
-@@ -1,55 +0,0 @@
+@@ -1,54 +0,0 @@
 -# -*- mode:ruby; coding:utf-8 -*-
 -
--require File.expand_path( '../spec_helper', __FILE__ )
 -require 'atig/update_checker'
 -
 -describe Atig::UpdateChecker,'when use git version' do
diff --git a/debian/patches/series b/debian/patches/series
index 0ff135f..e390e76 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-import-git-head_2015-08-14.patch
+# import-git-head_2015-08-14.patch
 0001-Drop-Bundler-and-RubyGems-dependencies.patch
 0002-Disable-update-checker-for-Debian-Package.patch
diff --git a/debian/rules b/debian/rules
index 4c25ffa..f448167 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,11 @@
 %:
 	dh $@ --with ruby --buildsystem ruby
 
+override_dh_auto_install:
+	dh_auto_install
+	rm -f $(CURDIR)/debian/atig/usr/bin/console
+	rm -f $(CURDIR)/debian/atig/usr/bin/setup
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -f $(CURDIR)/*.db

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