This is an automated email from the git hooks/post-receive script.
grinorcole-guest pushed a commit to branch master
in repository libmemcached-libmemcached-perl.
commit ba001325defa92593210b998a7580185acea7538
Author: Christopher Hoskin <christopher.hos...@gmail.com>
Date: Wed Oct 14 07:58:51 2015 +0100
Remove dependancy on specific version of libmemcached
---
debian/changelog | 10 --
debian/control | 2 +-
debian/copyright | 160 ---------------------------
debian/patches/use-system-libmemcached.patch | 20 +++-
debian/rules | 7 +-
5 files changed, 21 insertions(+), 178 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a1b56d4..9be5be3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,5 @@
libmemcached-libmemcached-perl (1.001801+dfsg-1) UNRELEASED; urgency=low
- TODO:
- - d/copyright: Paul-Hsieh looks at least weird (doesn't say what is
- allowed), Bob-Jenkins looks non-free (only "use", no distribution or
- "modification". - I think just repackaging and removing src/ completely is
- the easiest (and probably only) way forward.
- - d/control: "libmemcached-dev (= 1.0.18-4)": really only this version? or
- ">="? limiting to one version sounds like a pain for the future.
- the resulting binary package just depends on an unversioned
- "libmemcached11".
-
* Initial Release. Closes: #801254
-- Christopher Hoskin <christopher.hos...@gmail.com> Wed, 07 Oct 2015
22:08:34 +0100
diff --git a/debian/control b/debian/control
index f55e998..10bf4dd 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Perl Group
<pkg-perl-maintain...@lists.alioth.debian.org>
Uploaders: Christopher Hoskin <christopher.hos...@gmail.com>
Build-Depends: debhelper (>= 9.20120312~),
perl,
- libmemcached-dev (= 1.0.18-4),
+ libmemcached-dev,
memcached,
net-tools,
procps,
diff --git a/debian/copyright b/debian/copyright
index 53b58ef..ce58010 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -30,47 +30,6 @@ Copyright: 2004-2007, Marcus Holland-Moritz
<mhx-c...@gmx.net>
1999, Kenneth Albanowski <kja...@kjahds.com> (Version 1.x)
License: Artistic or GPL-1+
-Files: src/libmemcached/*
-Copyright: 2006-2014, Data Differential, http://datadifferential.com/
- 2006-2014, Brian Aker
-License: BSD-3-clause-TangentOrg
-
-Files: src/libmemcached/libhashkit/hsieh.cc
-Copyright: Copyright (c) 2004, 2005, Paul Hsieh
-License: Paul-Hsieh
-
-
-Files: src/libmemcached/libhashkit/md5.cc
-Copyright: Copyright (C) 1991-2, RSA Data Security, Inc.
-License: RSA-Data-Security
-
-Files: src/libmemcached/libhashkit/jenkins.cc
-Copyright: Public Domain
-License: Bob-Jenkins
-
-Files: src/libmemcached/clients/memaslap.c src/libmemcached/clients/ms_conn.*
src/libmemcached/clients/ms_memslap.h src/libmemcached/clients/ms_setting.*
src/libmemcached/clients/ms_sigsegv.h src/libmemcached/clients/ms_stats.*
src/libmemcached/clients/ms_task.* src/libmemcached/clients/ms_thread.*
-Copyright: 2009, Schooner Information Technology Inc.
-License: BSD-3-clause-TangentOrg
-
-Files: src/libmemcached/libmemcached-1.0/memcached.hpp
-Copyright: Padraig O'Sullivan <osullivan.padr...@gmail.com>
- Patrick Galbraith <p...@patg.net>
-License: BSD-3-clause-TangentOrg
-
-Files: src/libmemcached/clients/ms_sigsegv.c
-Copyright: 2009, Schooner Information Technology Inc.
- 2009, Sun Microsystems
-License: BSD-3-clause-Sun
-
-Files: src/libmemcached/libmemcached/memcached/protocol_binary.h
src/libmemcached/libmemcachedprotocol-0.0/binary.h
src/libmemcached/libmemcachedprotocol-0.0/callback.h
-Copyright: 2008, Sun Microsystems:
-License: BSD-3-clause-Sun
-
-Files: src/libmemcached/util/daemon.hpp
-Copyright: 1990, 1993, The Regents of the University of California
- 2010, Stewart Smith
-License: BSD-3-clause
-
Files: t/lib/ExtUtils/*
Copyright: 2002-2003, Ken Williams <k...@mathforum.org>
Larry Wall and the Perl 5 Porters
@@ -92,122 +51,3 @@ License: GPL-1+
On Debian systems, the complete text of version 1 of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-1'.
-License: BSD-3-clause
- 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. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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: BSD-3-clause-TangentOrg
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- .
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
- .
- * Neither the name of TangentOrg nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "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 COPYRIGHT
- OWNER OR CONTRIBUTORS 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: BSD-3-clause-Sun
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of the nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY SUN MICROSYSTEMS, INC. ``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 SUN MICROSYSTEMS, INC. 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: Paul-Hsieh
- http://www.azillionmonkeys.com/qed/weblicense.html
- The derivative content includes raw computer source code, ideas, opinions,
- and excerpts whose original source is covered under another license and
- transformations of such derivatives. Note that mere excerpts by themselves
- (with the exception of raw source code) are not considered derivative works
- under this license. Use and redistribution is limited to the following
- conditions:
- * One may not create a derivative work which, in any way, violates the
- Paul Hsieh exposition license described above on the original content.
- * One may not apply a license to a derivative work that precludes anyone
- else from using and redistributing derivative content.
- * One may not attribute any derivative content to authors not involved in
- the creation of the content, though an attribution to the author is not
- necessary.
-
-License: RSA-Data-Security
- License to copy and use this software is granted provided that it
- is identified as the "RSA Data Security, Inc. MD5 Message-Digest
- Algorithm" in all material mentioning or referencing this software
- or this function.
- .
- License is also granted to make and use derivative works provided
- that such works are identified as "derived from the RSA Data
- Security, Inc. MD5 Message-Digest Algorithm" in all material
- mentioning or referencing the derived work.
- .
- RSA Data Security, Inc. makes no representations concerning either
- the merchantability of this software or the suitability of this
- software for any particular purpose. It is provided "as is"
- without express or implied warranty of any kind.
- .
- These notices must be retained in any copies of any part of this
- documentation and/or software.
-
-License: Bob-Jenkins
- By Bob Jenkins, 2006. bob_jenk...@burtleburtle.net. You may use this
- code any way you wish, private, educational, or commercial. It's free.
- Use for hash table lookup, or anything where one collision in 2^^32 is
- acceptable. Do NOT use for cryptographic purposes.
- http://burtleburtle.net/bob/hash/index.html
-
diff --git a/debian/patches/use-system-libmemcached.patch
b/debian/patches/use-system-libmemcached.patch
index ee8d8be..900344d 100644
--- a/debian/patches/use-system-libmemcached.patch
+++ b/debian/patches/use-system-libmemcached.patch
@@ -6,13 +6,21 @@ Forwarded: not-needed
Last-Update: 2015-10-07
--- a/Makefile.PL
+++ b/Makefile.PL
-@@ -31,15 +31,17 @@
+@@ -16,7 +16,7 @@
+ }
+ }
+
+-my $lmcd_src = "src/libmemcached";
++my $lmcd_src = "src";
+ GetOptions(
+ 'g!' => \my $opt_g, # enable debugging
+ 'd!' => \my $opt_d, # debug Makefile.PL
+@@ -31,15 +31,16 @@
my $lmcd_api_ver = "1.0"; # eg $lmcd_src/libmemcached-$lmcd_api_ver/
my $lmcd_inst = getcwd()."/src_inst";
-my $lmcd_built_lib = "$lmcd_inst/lib/libmemcached$Config{lib_ext}";
-my $is_developer = (-d ".svn" || -d ".git");
-+my $lmcd_built_lib = "/usr/lib/x86_64-linux-gnu/libmemcached.so";
+my $is_developer = 0; #Packaged code is not developer
-my ($lmcd_h) = eval { build_libmemcached() };
@@ -32,7 +40,7 @@ Last-Update: 2015-10-07
my %opts;
if (my $gccversion = $Config{gccversion}) { # ask gcc to be more pedantic
-@@ -54,7 +56,7 @@
+@@ -54,7 +55,7 @@
$opts{DEFINE} .= ' -Wmissing-prototypes';
}
}
@@ -41,7 +49,7 @@ Last-Update: 2015-10-07
$opts{OPTIMIZE} = "-g" if $opt_g;
$opts{CCFLAGS} = "-pg" if $opt_pg;
my $coverage_flags = "";
-@@ -76,14 +78,14 @@
+@@ -76,14 +77,14 @@
AUTHOR => 'Tim Bunce <tim.bu...@pobox.com>',
VERSION_FROM => 'libmemcached.pm',
ABSTRACT_FROM => 'libmemcached.pm',
@@ -64,7 +72,7 @@ Last-Update: 2015-10-07
PREREQ_PM => {
'Test::More' => 0,
},
-@@ -128,7 +130,6 @@
+@@ -128,7 +129,6 @@
LMCD_SRC=$lmcd_src
LMCD_API_VER=$lmcd_api_ver
LMCD_INST=$lmcd_inst
@@ -72,7 +80,7 @@ Last-Update: 2015-10-07
}.q{
coverclean:
$(COVER) -delete
-@@ -146,9 +147,7 @@
+@@ -146,9 +146,7 @@
-cd $(LMCD_SRC) && $(MAKE) distclean
diff --git a/debian/rules b/debian/rules
index 24bd62d..a4adfeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,16 @@ BUILDHOME = $(CURDIR)/debian/build
PIDFILE = $(BUILDHOME)/memcached.pid
WHOAMI = $(shell whoami)
PORT := $(shell /bin/netstat -want | perl -w -e 'while (<>) { $$used{$$1}=1 if
/127\.0\.0\.1:(\d+)/;}; $$port = 20000; while ($$used{$$port}) { $$port++ };
print "$$port\n";')
-
+LMCV = $(shell apt-cache show libmemcached11 | sed -n -e 's/Version:
\([[:digit:]\.]*\).*/\1/p')
%:
dh $@
+override_dh_auto_configure:
+ apt-get source libmemcached
+ ln -s libmemcached-$(LMCV) src
+ dh_auto_configure
+
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
mkdir -p $(BUILDHOME)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libmemcached-libmemcached-perl.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
