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 87633e8c9a778211560d8df07b340143f04a5449
Author: Christopher Hoskin <christopher.hos...@gmail.com>
Date: Tue Oct 13 21:42:38 2015 +0100
Removed unnecessary explicit dependancy from debian/control
Removed documents and examples from bundled libmemcached
Removed assumption of amd64 architecture from Makefile.PL and other cruft
Refactored tests to make use of smoke-env and smoke-setup
---
debian/changelog | 16 ------------
debian/control | 1 -
debian/libmemcached-libmemcached-perl.docs | 7 ------
debian/libmemcached-libmemcached-perl.examples | 1 -
debian/patches/use-system-libmemcached.patch | 34 +++++++++++++++++++++-----
debian/tests/control | 15 ------------
debian/tests/custom-smoke | 14 -----------
debian/tests/pkg-perl/SKIP | 2 --
debian/tests/pkg-perl/smoke-env | 1 +
debian/tests/pkg-perl/smoke-setup | 2 ++
10 files changed, 31 insertions(+), 62 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ea83e67..cadd13e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,6 @@
libmemcached-libmemcached-perl (1.001801-1) UNRELEASED; urgency=low
TODO:
- - the package will fail to build on all architectures except amd64 due to
- "/usr/lib/x86_64-linux-gnu/libmemcached.so" in the patch.
- (later:) tested on i386:
- make[1]: *** No rule to make target
'/usr/lib/x86_64-linux-gnu/libmemcached.so', needed by 'libmemcached.o'. Stop.
- either -lmemcached or similar works, or DEB_HOST_MULTIARCH helps to find
- the patch; or it can be removed if this is a makefile target ...
- - side note: in Makefile.PL, 'my $is_developer = (-d ".svn" || -d ".git");'
- looks wrong for us
- - autopkgtest: (just a thought, haven't tried): maybe the new
- debian/tests/pkg-perl/smoke-setup script option would avoid having to
- setup a whole new test
- - debian/libmemcached-libmemcached-perl.examples: looks more like examples
- of embedded libmemcached?
- - debian/libmemcached-libmemcached-perl.docs: probably all except the TODO
- is not needed?
- 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
@@ -24,7 +9,6 @@ libmemcached-libmemcached-perl (1.001801-1) UNRELEASED;
urgency=low
">="? limiting to one version sounds like a pain for the future.
the resulting binary package just depends on an unversioned
"libmemcached11".
- - d/control: libpod-coverage-perl is probably not needed explicitly
* Initial Release. Closes: #801254
diff --git a/debian/control b/debian/control
index 916a6ac..f55e998 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends: debhelper (>= 9.20120312~),
procps,
libpod-coverage-perl,
libtest-pod-perl,
- libtest-pod-coverage-perl
Standards-Version: 3.9.6
Vcs-Browser:
https://anonscm.debian.org/cgit/pkg-perl/packages/libmemcached-libmemcached-perl.git
Vcs-Git:
git://anonscm.debian.org/pkg-perl/packages/libmemcached-libmemcached-perl.git
diff --git a/debian/libmemcached-libmemcached-perl.docs
b/debian/libmemcached-libmemcached-perl.docs
index ea8704f..1333ed7 100644
--- a/debian/libmemcached-libmemcached-perl.docs
+++ b/debian/libmemcached-libmemcached-perl.docs
@@ -1,8 +1 @@
-README.md
TODO
-src/README
-src/libmemcached/README
-src/libmemcached/README.FIRST
-src/libmemcached/NEWS
-src/libmemcached/TODO
-src/libmemcached/libmemcached/memcached/README.txt
diff --git a/debian/libmemcached-libmemcached-perl.examples
b/debian/libmemcached-libmemcached-perl.examples
deleted file mode 100644
index eccca46..0000000
--- a/debian/libmemcached-libmemcached-perl.examples
+++ /dev/null
@@ -1 +0,0 @@
-src/libmemcached/example
diff --git a/debian/patches/use-system-libmemcached.patch
b/debian/patches/use-system-libmemcached.patch
index e75cbf9..ee8d8be 100644
--- a/debian/patches/use-system-libmemcached.patch
+++ b/debian/patches/use-system-libmemcached.patch
@@ -11,8 +11,9 @@ Last-Update: 2015-10-07
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 = (-d ".svn" || -d ".git");
++my $is_developer = 0; #Packaged code is not developer
-my ($lmcd_h) = eval { build_libmemcached() };
-if ($@) {
@@ -31,7 +32,16 @@ Last-Update: 2015-10-07
my %opts;
if (my $gccversion = $Config{gccversion}) { # ask gcc to be more pedantic
-@@ -76,13 +78,13 @@
+@@ -54,7 +56,7 @@
+ $opts{DEFINE} .= ' -Wmissing-prototypes';
+ }
+ }
+-$opts{LIBS} = ["-lstdc++"]; # else error: libmemcached.so: undefined symbol:
__gxx_personality_v0
++$opts{LIBS} = ["-lstdc++ -lmemcached"]; # else error: libmemcached.so:
undefined symbol: __gxx_personality_v0
+ $opts{OPTIMIZE} = "-g" if $opt_g;
+ $opts{CCFLAGS} = "-pg" if $opt_pg;
+ my $coverage_flags = "";
+@@ -76,14 +78,14 @@
AUTHOR => 'Tim Bunce <tim.bu...@pobox.com>',
VERSION_FROM => 'libmemcached.pm',
ABSTRACT_FROM => 'libmemcached.pm',
@@ -42,6 +52,7 @@ Last-Update: 2015-10-07
- # then the installed lib would get preference over ours.
- # So we explicitly refer to our static library. That also avoids the
- # need to worry about what library might get used at runtime.
+- LDFROM => '$(OBJECT)'." $lmcd_built_lib",
+# INC => "-I$lmcd_inst/include",
+# # We want to link to *our* private libmemcached and not one that
+# # might already be installed on the system. The LIBS config gets
@@ -49,15 +60,26 @@ Last-Update: 2015-10-07
+# # then the installed lib would get preference over ours.
+# # So we explicitly refer to our static library. That also avoids the
+# # need to worry about what library might get used at runtime.
- LDFROM => '$(OBJECT)'." $lmcd_built_lib",
++# LDFROM => '$(OBJECT)'." $lmcd_built_lib",
PREREQ_PM => {
'Test::More' => 0,
-@@ -146,7 +148,7 @@
+ },
+@@ -128,7 +130,6 @@
+ LMCD_SRC=$lmcd_src
+ LMCD_API_VER=$lmcd_api_ver
+ LMCD_INST=$lmcd_inst
+-LMCD_BUILT_LIB=$lmcd_built_lib
+ }.q{
+ coverclean:
+ $(COVER) -delete
+@@ -146,9 +147,7 @@
-cd $(LMCD_SRC) && $(MAKE) distclean
-libmemcached.c : $(XSUBPPDIR)/ParseXS.pm typemap
+-
+-$(OBJECT) : $(LMCD_BUILT_LIB)
+#libmemcached.c : $(XSUBPPDIR)/ParseXS.pm typemap
- $(OBJECT) : $(LMCD_BUILT_LIB)
-
+ svnmanifest::
+ svn list -R -r HEAD | sort |grep -v '/$$' > MANIFEST
diff --git a/debian/tests/control b/debian/tests/control
deleted file mode 100644
index 56657cf..0000000
--- a/debian/tests/control
+++ /dev/null
@@ -1,15 +0,0 @@
-Test-Command: /usr/share/pkg-perl-autopkgtest/runner build-deps
-Depends: @, @builddeps@, pkg-perl-autopkgtest
-
-Test-Command: /usr/share/pkg-perl-autopkgtest/runner runtime-deps
-Depends: @, pkg-perl-autopkgtest
-
-Test-Command: /usr/share/pkg-perl-autopkgtest/runner
runtime-deps-and-recommends
-Depends: @, pkg-perl-autopkgtest
-Restrictions: needs-recommends
-
-Test-Command: /usr/share/pkg-perl-autopkgtest/runner heavy-deps
-Depends: @, pkg-perl-autopkgtest, pkg-perl-autopkgtest-heavy
-
-Tests: custom-smoke
-Depends: @, memcached, procps, pkg-perl-autopkgtest, net-tools, netbase
diff --git a/debian/tests/custom-smoke b/debian/tests/custom-smoke
deleted file mode 100644
index 4ac7401..0000000
--- a/debian/tests/custom-smoke
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-PIDFILE=${ADTTMP}/m.pid
-PORT=$(/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";')
-export PERL_LIBMEMCACHED_TEST_SERVERS=127.0.0.1:${PORT}
-
-echo $MEMCACHED_SERVERS
-
-/usr/bin/memcached -u `whoami` -p$PORT -P$PIDFILE -d
-/usr/share/pkg-perl-autopkgtest/build-deps.d/smoke
-RET=$?
-[ ! -s $PIDFILE ] || /bin/kill `cat ${PIDFILE}`
-exit $RET
-
diff --git a/debian/tests/pkg-perl/SKIP b/debian/tests/pkg-perl/SKIP
deleted file mode 100644
index a0b2493..0000000
--- a/debian/tests/pkg-perl/SKIP
+++ /dev/null
@@ -1,2 +0,0 @@
-# needs a running memcached
-smoke
diff --git a/debian/tests/pkg-perl/smoke-env b/debian/tests/pkg-perl/smoke-env
new file mode 100644
index 0000000..392c1a7
--- /dev/null
+++ b/debian/tests/pkg-perl/smoke-env
@@ -0,0 +1 @@
+PERL_LIBMEMCACHED_TEST_SERVERS=`/bin/netstat -want | perl -w -e 'while (<>) {
$used{$1}=1 if /127\.0\.0\.1:(\d+)/;}; $port = 20000; while ($used{$port}) {
$port++ }; print "127.0.0.1:$port\n";'`
diff --git a/debian/tests/pkg-perl/smoke-setup
b/debian/tests/pkg-perl/smoke-setup
new file mode 100755
index 0000000..ccd0076
--- /dev/null
+++ b/debian/tests/pkg-perl/smoke-setup
@@ -0,0 +1,2 @@
+PERL_LIBMEMCACHED_TEST_PORT=${PERL_LIBMEMCACHED_TEST_SERVERS#127.0.0.1:}
+memcached -d -p $PERL_LIBMEMCACHED_TEST_PORT
--
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
