This is an automated email from the git hooks/post-receive script. dod pushed a commit to branch dods in repository libmongodb-perl.
commit cdcdcecc985100fe75080121d935342a0842bfb6 Author: Dominique Dumont <d...@debian.org> Date: Sun Jun 22 16:40:24 2014 +0200 merged with gregoa's work --- debian/changelog | 26 ++++++++++++++++++++------ debian/control | 7 ++++--- debian/copyright | 11 +++++++---- debian/libmongodb-perl.docs | 1 + debian/patches/5.14-ccflags.patch | 28 ---------------------------- debian/patches/fix-db-test | 20 -------------------- debian/patches/fix-manpage-spelling.patch | 29 ----------------------------- debian/patches/fix-utf8-in-pod | 14 -------------- debian/patches/series | 1 + debian/patches/spelling.patch | 17 +++++++++++++++++ debian/rules | 5 +++-- debian/watch | 1 - 12 files changed, 53 insertions(+), 107 deletions(-) diff --git a/debian/changelog b/debian/changelog index 948cf8f..dfdad7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,25 @@ -libmongodb-perl (0.704.1.0-1~1.gbpfc0683) UNRELEASED; urgency=medium +libmongodb-perl (0.704.1.0-1) unstable; urgency=medium - ** SNAPSHOT build @fc068329fa15a00e71576957edfd055422ce6e0c ** + * Remove repackaging framework. The dubios directory is gone. - * watch: mongo-meta-driver is gone. repack is no longer required - * Imported Upstream version 0.704.1.0 - - -- Dominique Dumont <d...@debian.org> Sat, 21 Jun 2014 18:46:49 +0200 + * New upstream release. + PERL-108: removed previously-deprecated AUTOLOAD functions. + * Update upstream and packaging copyright years; + add new third-party files. + * Update build and runtime dependencies. + * Drop patch fix-utf8-in-pod, fixed upstream. + * Drop patch fix-manpage-spelling.patch, merged upstream. + * Drop patch fix-db-test, fixed upstream. + * Drop patch 5.14-ccflags.patch, not needed anymore. + * Add patch to fix a spelling mistake in the POD. + * debian/rules: override_dh_clean: upstream backup file was removed. + * debian/rules: wrap override_dh_auto_test in check for nocheck in + DEB_BUILD_OPTIONS. dh_auto_test honours DEB_BUILD_OPTIONS already, but + we're manually starting and tearing down a mongod instance which is + not necessary if we don't run the tests. + * Install CONTRIBUTING.md documentation. + + -- gregor herrmann <gre...@debian.org> Sun, 22 Jun 2014 01:10:06 +0200 libmongodb-perl (0.702.2+ds-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index af8ee77..f1eeb91 100644 --- a/debian/control +++ b/debian/control @@ -7,10 +7,10 @@ Uploaders: Stefan Hornburg (Racke) <ra...@linuxia.de>, Dominique Dumont <d...@debian.org> Section: perl Priority: optional -Build-Depends: debhelper (>= 9.20120312), +Build-Depends: debhelper (>= 9.20120312~), libboolean-perl, libclass-method-modifiers-perl, - libconfig-autoconf-perl, + libconfig-autoconf-perl (>= 0.22), libdata-dump-perl, libdata-types-perl, libdatetime-perl (>= 2:0.7800), @@ -25,13 +25,14 @@ Build-Depends: debhelper (>= 9.20120312), libtest-deep-perl, libtest-exception-perl, libtest-fatal-perl, - libtest-pod-perl, libtest-warn-perl, libthrowable-perl, libtie-ixhash-perl, libtry-tiny-perl, mongodb-server [i386 amd64], net-tools, + perl, + perl (>= 5.13.4) | libtest-simple-perl (>= 0.96), procps Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libmongodb-perl.git diff --git a/debian/copyright b/debian/copyright index ff08d0b..39d2de6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,14 +1,13 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Contact: Mike Friedman <fri...@mongodb.com> Upstream-Name: MongoDB -Upstream-Contact: Mike Friedman <fri...@mongodb.com> Source: https://metacpan.org/release/MongoDB Copyright: bson files uses headers from yajl which are not part of the API (e.g. yajl/header.h). Hence this copy of yajl files cannot be removed. Files: * -Copyright: 2009-2013, 10gen, Inc. - 2013, MongoDB, Inc. +Copyright: 2009-2014, MongoDB, Inc. License: Apache-2.0 Files: bson/bson-md5.* @@ -24,6 +23,10 @@ Files: bson/bson-stdint-win32.h Copyright: 2006-2013 Alexander Chemeris License: BSD +Files: pstdint.h +Copyright: 2005-2011, Paul Hsieh +License: BSD-3-clause + Files: inc/Module/* Copyright: 2002-2012, Adam Kennedy <ad...@cpan.org> 2002-2012, Audrey Tang <autri...@autrijus.org> @@ -44,7 +47,7 @@ License: ISC Files: debian/* Copyright: 2010, Stefan Hornburg (Racke) <ra...@linuxia.de> 2011, Dominic Hargreaves <d...@earth.li> - 2011-2013, gregor herrmann <gre...@debian.org>, + 2011-2014, gregor herrmann <gre...@debian.org>, 2013, Harlan Lieberman-Berg <h.liebermanb...@gmail.com> License: Artistic or GPL-1+ diff --git a/debian/libmongodb-perl.docs b/debian/libmongodb-perl.docs new file mode 100644 index 0000000..a1892e3 --- /dev/null +++ b/debian/libmongodb-perl.docs @@ -0,0 +1 @@ +CONTRIBUTING.md diff --git a/debian/patches/5.14-ccflags.patch b/debian/patches/5.14-ccflags.patch deleted file mode 100644 index 6ec67a7..0000000 --- a/debian/patches/5.14-ccflags.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: add $Config{ccflags} to CCFLAGS to fix FTBFS with perl 5.14 -Origin: vendor -Bug-Debian: http://bugs.debian.org/638894 -Forwarded: not-needed -Author: Dominic Hargreaves <d...@earth.li> -Reviewed-by: gregor herrmann <gre...@debian.org> -Last-Update: 2011-09-23 - ---- a/ext/Module/Install/PRIVATE/Mongo.pm -+++ b/ext/Module/Install/PRIVATE/Mongo.pm -@@ -1,5 +1,6 @@ - use strict; - use warnings; -+use Config; - - package Module::Install::PRIVATE::Mongo; - -@@ -18,6 +19,10 @@ - my $custom_cflags = 0; - my $ccflags = $self->makemaker_args->{CCFLAGS}; - -+ # #638894 -+ $ccflags .= " $Config{ccflags}"); -+ $custom_cflags = 1; -+ - if ($Config{osname} eq 'darwin') { - my @arch = $Config::Config{ccflags} =~ m/-arch\s+(\S+)/g; - my $archStr = join '', map { " -arch $_ " } @arch; diff --git a/debian/patches/fix-db-test b/debian/patches/fix-db-test deleted file mode 100644 index 4793df9..0000000 --- a/debian/patches/fix-db-test +++ /dev/null @@ -1,20 +0,0 @@ -Description:Fix db test - Change the expected error string to a new value - issued by mongodb. The change also accepts - older error string to be backward compatible. - . - See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=730913#19 for rationale -Bug:http://rt.cpan.org/Public/Bug/Display.html?id=91085 -Bug-Debian:https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=730913 -Author:dod ---- a/t/db.t -+++ b/t/db.t -@@ -49,7 +49,7 @@ - is('hello, world', $hello, 'db eval'); - - my $err = $db->eval('function(x) { xreturn "hello, "+x; }', ["world"]); --like($err, qr/(?:compile|execution) failed/, 'js err'); -+like($err, qr/(?:compile|execution) failed|exception: SyntaxError: Unexpected string/, 'js err'); - - # tie - { diff --git a/debian/patches/fix-manpage-spelling.patch b/debian/patches/fix-manpage-spelling.patch deleted file mode 100644 index 26431d3..0000000 --- a/debian/patches/fix-manpage-spelling.patch +++ /dev/null @@ -1,29 +0,0 @@ -Description: Fix minor spelling error -Author: Harlan Lieberman-Berg <h.liebermanb...@gmail.com> -Author: Dominic Hargreaves <d...@earth.li> -Bug: https://jira.mongodb.org/browse/PERL-239 -Forwarded: yes ---- a/lib/MongoDB/Connection.pm -+++ b/lib/MongoDB/Connection.pm -@@ -183,7 +183,7 @@ safe insert times out and croaks. - I<MongoDB server version 2.0+: "majority" and Data Center Awareness> - - As of MongoDB 2.0+, the 'w' parameter can be passed strings. This can be done by passing it the string "majority" this will wait till the B<majority> of --of the nodes in the replica set have recieved the data. For more information see: http://www.mongodb.org/display/DOCS/getLastError+Command#getLastErrorCommand-majority -+of the nodes in the replica set have received the data. For more information see: http://www.mongodb.org/display/DOCS/getLastError+Command#getLastErrorCommand-majority - - This can be useful for "Data Center Awareness." In v2.0+, you can "tag" replica members. With "tagging" you can specify a new "getLastErrorMode" where you can create new - rules on how your data is replicated. To used you getLastErrorMode, you pass in the name of the mode to the 'w' parameter. For more infomation see: http://www.mongodb.org/display/DOCS/Data+Center+Awareness -diff --git a/lib/MongoDB/OID.pm b/lib/MongoDB/OID.pm -index fe24e8c..b1be426 100644 ---- a/lib/MongoDB/OID.pm -+++ b/lib/MongoDB/OID.pm -@@ -96,7 +96,7 @@ C<_id> field will be added with a new C<MongoDB::OID> as its value. - - my $id = $collection->insert({'name' => 'Alice', age => 20}); - --C<$id> will be a C<MongoDB::OID> that can be used to retreive or update the -+C<$id> will be a C<MongoDB::OID> that can be used to retrieve or update the - saved document: - - $collection->update({_id => $id}, {'age' => {'$inc' => 1}}); diff --git a/debian/patches/fix-utf8-in-pod b/debian/patches/fix-utf8-in-pod deleted file mode 100644 index c8ca528..0000000 --- a/debian/patches/fix-utf8-in-pod +++ /dev/null @@ -1,14 +0,0 @@ -Description: Fix utf8 in pod document - To avoid a pod errors section in the man page. -Author: dod ---- a/lib/MongoDB/DataTypes.pod -+++ b/lib/MongoDB/DataTypes.pod -@@ -24,6 +24,8 @@ - - =encoding UTF-8 - -+=encoding utf8 -+ - =head1 NAME - - MongoDB::DataTypes - The data types used with MongoDB diff --git a/debian/patches/series b/debian/patches/series index e69de29..5299247 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +spelling.patch diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch new file mode 100644 index 0000000..cd95335 --- /dev/null +++ b/debian/patches/spelling.patch @@ -0,0 +1,17 @@ +Description: spelling mistake +Origin: vendor +Author: gregor herrmann <gre...@debian.org> +Last-Update: 2014-06-22 +Fowarded: no, should go to https://jira.mongodb.org/browse/PERL + +--- a/lib/MongoDB/Examples.pod ++++ b/lib/MongoDB/Examples.pod +@@ -342,7 +342,7 @@ + The C<$unwind> stage of the aggregation query "peels off" elements of the courses + array one-by-one and places them in their own documents. After this phase completes, + there is a separate document for each (course, student) pair. The C<$project> stage +-then throws out unecessary fields and keeps the ones we are interested in. It also ++then throws out unnecessary fields and keeps the ones we are interested in. It also + pulls the student ID field out of its subdocument and creates a top-level field + with the key C<student_id>. Last, we group by student ID, using C<$addToSet> in + order to add the unique courses for each student to the C<courses> array. diff --git a/debian/rules b/debian/rules index 7cb305a..92801a9 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,7 @@ MONGOD = localhost:$(PORT) dh $@ override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) mkdir -p $(BUILDHOME) # mongod is required during build only on i386 amd64 # "until netstat" command wait for mongod to be listening on PORT @@ -23,8 +24,8 @@ override_dh_auto_test: dh_auto_test # The server process might not have actually started [ ! -s $(PIDFILE) ] || /bin/kill `cat $(PIDFILE)` || true +endif override_dh_clean: - # shipped upstream - dh_clean -X t/lib/MongoDBTest.pm~ + dh_clean rm -rf $(BUILDHOME) diff --git a/debian/watch b/debian/watch index 718b7f6..0fd52f1 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,2 @@ version=3 -# URL to the package page followed by a regex to search https://metacpan.org/release/MongoDB .*/MongoDB-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmongodb-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