[DRE-commits] [ruby-ferret] 11/12: remove embedded bzlib convenience copy when cleaning instead of repacking

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-ferret.

commit dcbc8013411ea73eb69678a2814c1c71d50456f8
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Nov 25 00:57:22 2013 +0100

    remove embedded bzlib convenience copy when cleaning instead of repacking
    
    add copyright notice for embedded bzlib
---
 debian/changelog |  2 ++
 debian/copyright | 38 ++++++++++++++++++++++++++++++++++++++
 debian/rules     |  5 +++--
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 37fe2e5..e3af03e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ruby-ferret (0.11.8.5-1) UNRELEASED; urgency=low
   * Drop fix_compatibility_with_minitest.patch and
     block_variables_have_local_scopes.patch (applied upstream)
   * Remove indications that the source has been repacked (not true anymore)
+  * Remove embedded copy of bzlib when cleaning instead of repacking
+  * Add copyright notice for the embedded copy of bzlib
   * Install RELEASE_NOTES as documentation
 
  -- Cédric Boutillier <boutil at debian.org>  Sun, 24 Nov 2013 22:39:29 +0100
diff --git a/debian/copyright b/debian/copyright
index ee9e90d..211e3e8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,6 +21,10 @@ Files: ext/posh.c ext/posh.c
 Copyright: Copyright (c) 2004, Brian Hook
 License: BSD-3-clause
 
+Files: ext/BZLIB_* ext/bzlib*
+Copyright: 1996-2010 Julian R Seward
+License: BSD-4-clause
+
 Files: debian/*
 Copyright: 2007-2011 Leandro Nunes dos Santos <leandronunes at colivre.coop.br>
            2007-2011 Antonio Terceiro <terceiro at debian.org>
@@ -57,6 +61,40 @@ License: BSD-3-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+License: BSD-4-clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ .
+ 2. The origin of this software must not be misrepresented; you must 
+    not claim that you wrote the original software.  If you use this 
+    software in a product, an acknowledgment in the product 
+    documentation would be appreciated but is not required.
+ .
+ 3. Altered source versions must be plainly marked as such, and must
+    not be misrepresented as being the original software.
+ .
+ 4. The name of the author may not be used to endorse or promote 
+    products derived from this software without specific prior written 
+    permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the
diff --git a/debian/rules b/debian/rules
index baff5f7..9070047 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,8 @@
 %:
 	dh $@ --buildsystem=ruby --with ruby
 
-override_dh_auto_clean:
-	dh_auto_clean
+override_dh_clean:
+	dh_clean
 	rm -rf test/temp
+	rm -f ext/bzlib* ext/BZLIB_*
 

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