[DRE-commits] [ruby-zip] 02/02: packaging new upstream release

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-zip.

commit fb5236c7b910b06bab816c80c628c52fa85d50f8
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Mar 23 14:23:16 2014 -0300

    packaging new upstream release
---
 debian/changelog                     |  5 +++--
 debian/control                       |  2 +-
 debian/patches/ignore-simplecov.diff |  7 +++++++
 debian/patches/series                |  1 +
 debian/ruby-tests.rake               |  5 +++++
 debian/ruby-tests.rb                 | 12 ------------
 debian/rules                         |  4 ++++
 7 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f4a95c..072e32b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-ruby-zip (1.1.0-1) unstable; urgency=medium
+ruby-zip (1.1.2-1) unstable; urgency=medium
 
-  * Team upload
+  * Team upload; package being reintroduced after removal (Closes: #738745).
+  * New upstream release.
 
   [ David Suárez ]
   * New upstream release
diff --git a/debian/control b/debian/control
index dccb17a..96b2b03 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Tatsuki Sugiura <sugi at nemui.org>, Taku YASUI <tach at debian.or.jp>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.6.1~)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.6.1~), ruby-minitest
 Standards-Version: 3.9.5
 Homepage: https://github.com/rubyzip/rubyzip
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-zip.git
diff --git a/debian/patches/ignore-simplecov.diff b/debian/patches/ignore-simplecov.diff
new file mode 100644
index 0000000..a13ba6b
--- /dev/null
+++ b/debian/patches/ignore-simplecov.diff
@@ -0,0 +1,7 @@
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -1,4 +1,3 @@
+-require 'simplecov'
+ require 'minitest/autorun'
+ require 'minitest/unit'
+ require 'fileutils'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6b97100
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ignore-simplecov.diff
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
new file mode 100644
index 0000000..fd56a97
--- /dev/null
+++ b/debian/ruby-tests.rake
@@ -0,0 +1,5 @@
+require 'gem2deb/rake/testtask'
+Gem2Deb::Rake::TestTask.new do |test|
+  test.libs << 'test'
+  test.pattern = 'test/**/*_test.rb'
+end
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
deleted file mode 100644
index 5b5c4c8..0000000
--- a/debian/ruby-tests.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-$: << 'test' << 'lib' << '.'
-
-# change to the test dir because they have a hardcode relative path
-# for the data files
-Dir.chdir 'test'
-
-require 'ioextrastest.rb'
-require 'ziptest.rb'
-require 'zipfilesystemtest.rb'
-
-# do not enable +4G support test
-#require 'zip64_full_test'
diff --git a/debian/rules b/debian/rules
index 84cf711..71db91b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,4 +17,8 @@
 override_dh_auto_clean:
 	$(RM) -R test/data/generated
 	cd test && find . -maxdepth 1 -type f -and -not -iname '*.rb' -and -not -iname '.cvsignore' -delete
+	$(RM) okToDeleteMoved.txt
+	$(RM) *.bin
+	$(RM) *.zip
+	$(RM) extEntry
 

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