r15389 - in /trunk/libevent-perl: ./ c/ debian/ lib/ t/
rmayorga-guest at users.alioth.debian.org
rmayorga-guest at users.alioth.debian.org
Fri Feb 22 03:24:35 UTC 2008
Author: rmayorga-guest
Date: Fri Feb 22 03:24:33 2008
New Revision: 15389
URL: http://svn.debian.org/wsvn/?sc=1&rev=15389
Log:
* New Upstream version
* debian/control
+ Bump standards-version to 3.7.3 ( no changes needed )
+ Raise compat level to 6
+ Add Uploaders field and myself
+ Add ${misc:Depends} and {shlibs:Depends} to Depends field
* debian/rules - sync it with the last dh-make-perl template
* Don't install README
* remove debian/docs
* rewrite debian/copyright
* remove the patch introduced by the previos maintainer
- this patch was added to avoid some warnings
Removed:
trunk/libevent-perl/debian/docs
Modified:
trunk/libevent-perl/ChangeLog
trunk/libevent-perl/Event.xs
trunk/libevent-perl/MANIFEST
trunk/libevent-perl/MANIFEST.SKIP
trunk/libevent-perl/META.yml
trunk/libevent-perl/Makefile.PL
trunk/libevent-perl/c/ev.c
trunk/libevent-perl/c/group.c
trunk/libevent-perl/c/idle.c
trunk/libevent-perl/c/queue.c
trunk/libevent-perl/c/signal.c
trunk/libevent-perl/c/timeable.c
trunk/libevent-perl/c/timer.c
trunk/libevent-perl/c/typemap.c
trunk/libevent-perl/c/var.c
trunk/libevent-perl/debian/changelog
trunk/libevent-perl/debian/compat
trunk/libevent-perl/debian/control
trunk/libevent-perl/debian/copyright
trunk/libevent-perl/debian/rules
trunk/libevent-perl/lib/Event.pm
trunk/libevent-perl/t/io.t
trunk/libevent-perl/t/unconfigured.t
Modified: trunk/libevent-perl/ChangeLog
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/ChangeLog?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/ChangeLog (original)
+++ trunk/libevent-perl/ChangeLog Fri Feb 22 03:24:33 2008
@@ -1,3 +1,21 @@
+2007-05-21 <joshua at always.joy.eth.net>
+
+ * Event is now stored in GIT. You can grab a copy with "git clone
+ git://nirmalvihar.info/home/joshua/event.git". I will not be
+ updating this ChangeLog anymore because the full history plus
+ changelog will be stored in GIT.
+
+2006-10-11 <joshua at always.joy.eth.net>
+
+ * Add casts to quell warnings as suggested by JDHEDDEN at cpan.org.
+
+2006-10-10 <joshua at always.joy.eth.net>
+
+ * Release 1.07.
+
+ * Marc Lehmann <schmorp at schmorp.de> suggests using mg_ptr instead
+ of mg_obj. Sounds good to me.
+
2005-05-14 <joshua at always.joy.eth.net>
* Release 1.06.
Modified: trunk/libevent-perl/Event.xs
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/Event.xs?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/Event.xs (original)
+++ trunk/libevent-perl/Event.xs Fri Feb 22 03:24:33 2008
@@ -47,7 +47,7 @@
#define warn Event_warn
static void Event_warn(const char* pat, ...) {
- /* STRLEN n_a; */
+ STRLEN n_a;
dSP;
SV *msg;
va_list args;
@@ -70,7 +70,7 @@
#define croak Event_croak
static void Event_croak(const char* pat, ...) {
- /* STRLEN n_a; */
+ STRLEN n_a;
dSP;
SV *msg;
va_list args;
@@ -182,7 +182,7 @@
register HV *hv = newHV();
register HE *entry;
hv_iterinit(ohv); /* NOTE: this resets the iterator */
- while ((entry = hv_iternext(ohv))) {
+ while (entry = hv_iternext(ohv)) {
hv_store(hv, HeKEY(entry), HeKLEN(entry),
SvREFCNT_inc(HeVAL(entry)), HeHASH(entry));
}
@@ -395,7 +395,7 @@
SV **svp = hv_fetch(PL_modglobal, "Time::NVtime", 12, 0);
if (!svp || !*svp || !SvIOK(*svp))
XSRETURN_NO;
- api.NVtime = (double(*)()) SvIV(*svp);
+ api.NVtime = INT2PTR(double(*)(), SvIV(*svp));
XSRETURN_YES;
double
@@ -461,7 +461,6 @@
PREINIT:
pe_watcher *wa;
pe_event *ev;
- int cnt = 1;
PPCODE:
wa = (pe_watcher*) sv_2watcher(ST(0));
if (items == 1) {
Modified: trunk/libevent-perl/MANIFEST
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/MANIFEST?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/MANIFEST (original)
+++ trunk/libevent-perl/MANIFEST Fri Feb 22 03:24:33 2008
@@ -76,4 +76,4 @@
Tutorial.pdf
util/bench.pl
util/filehandle.txt
-META.yml Module meta-data (added by MakeMaker)
+META.yml
Modified: trunk/libevent-perl/MANIFEST.SKIP
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/MANIFEST.SKIP?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/MANIFEST.SKIP (original)
+++ trunk/libevent-perl/MANIFEST.SKIP Fri Feb 22 03:24:33 2008
@@ -2,3 +2,4 @@
Makefile(\.old)?$
\.rej$
^\.i.*$
+^\.git
Modified: trunk/libevent-perl/META.yml
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/META.yml?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/META.yml (original)
+++ trunk/libevent-perl/META.yml Fri Feb 22 03:24:33 2008
@@ -1,11 +1,11 @@
# http://module-build.sourceforge.net/META-spec.html
#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
name: Event
-version: 1.06
+version: 1.10
version_from: ./lib/Event.pm
installdirs: site
requires:
Test: 1
distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+generated_by: ExtUtils::MakeMaker version 6.30_01
Modified: trunk/libevent-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/Makefile.PL?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/Makefile.PL (original)
+++ trunk/libevent-perl/Makefile.PL Fri Feb 22 03:24:33 2008
@@ -1,18 +1,10 @@
# This -*- perl -*- script makes the Makefile
-require 5.005; #most likely
+require 5.006; # 5.005_005 fails
use ExtUtils::MakeMaker;
-# MakeMaker doesn't know about arch :(
-sub MY::libscan {
- my ($self, $path) = @_;
- my ($dirs,$file) = ($self->splitpath($path))[1,2];
-
- return '' if grep /^(?:\.arch-ids|{arch}|,,.*|\+\+.*)$/,
- $self->splitdir($dirs), $file;
- return $self->MM::libscan($path);
-}
+#push @Safe, OPTIMIZE => '-Wall' if 1;
# Parasoft's Insure++!
push @Safe, OPTIMIZE => '-g' if 0;
Modified: trunk/libevent-perl/c/ev.c
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/c/ev.c?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/c/ev.c (original)
+++ trunk/libevent-perl/c/ev.c Fri Feb 22 03:24:33 2008
@@ -233,7 +233,6 @@
static void pe_check_recovery() {
/* NO ASSERTIONS HERE! EVAL CONTEXT IS VERY MESSY */
- /* pe_watcher *ev; */
int alert;
struct pe_cbframe *fp;
if (CurCBFrame < 0)
Modified: trunk/libevent-perl/c/group.c
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/c/group.c?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/c/group.c (original)
+++ trunk/libevent-perl/c/group.c Fri Feb 22 03:24:33 2008
@@ -48,7 +48,7 @@
{ pe_timeable_stop(&((pe_group*)ev)->tm); }
static void pe_group_alarm(pe_watcher *wa, pe_timeable *tm) {
- /* STRLEN n_a; */
+ STRLEN n_a;
pe_group *gp = (pe_group*) wa;
double timeout;
double remaining;
Modified: trunk/libevent-perl/c/idle.c
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/c/idle.c?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/c/idle.c (original)
+++ trunk/libevent-perl/c/idle.c Fri Feb 22 03:24:33 2008
@@ -1,7 +1,7 @@
static struct pe_watcher_vtbl pe_idle_vtbl;
static pe_ring Idle;
-/*#define D_IDLE(x) x */
+/*#define D_IDLE(x) x /**/
#define D_IDLE(x) /**/
static pe_watcher *pe_idle_allocate(HV *stash, SV *temple) {
Modified: trunk/libevent-perl/c/queue.c
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/c/queue.c?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/c/queue.c (original)
+++ trunk/libevent-perl/c/queue.c Fri Feb 22 03:24:33 2008
@@ -2,7 +2,6 @@
static int StarvePrio = PE_QUEUES - 2;
static void boot_queue() {
- /* int xx; */
HV *stash = gv_stashpv("Event", 1);
PE_RING_INIT(&NQueue, 0);
newCONSTSUB(stash, "QUEUES", newSViv(PE_QUEUES));
@@ -73,13 +72,13 @@
{
/* queue in reverse direction? XXX */
- /* warn("-- adding 0x%x/%d\n", ev, prio); db_show_queue(); */
+ /* warn("-- adding 0x%x/%d\n", ev, prio); db_show_queue();/**/
pe_ring *rg;
rg = NQueue.next;
while (rg->self && ((pe_event*)rg->self)->prio <= ev->prio)
rg = rg->next;
PE_RING_ADD_BEFORE(&ev->que, rg);
- /* warn("=\n"); db_show_queue(); */
+ /* warn("=\n"); db_show_queue();/**/
++ActiveWatchers;
}
}
@@ -150,7 +149,7 @@
static int one_event(double tm) { /**INVOKE**/
/*if (SvIVX(DebugLevel) >= 4)
- warn("Event: ActiveWatchers=%d\n", ActiveWatchers); */
+ warn("Event: ActiveWatchers=%d\n", ActiveWatchers); /**/
pe_signal_asynccheck();
if (!PE_RING_EMPTY(&AsyncCheck)) pe_map_check(&AsyncCheck);
Modified: trunk/libevent-perl/c/signal.c
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/c/signal.c?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/c/signal.c (original)
+++ trunk/libevent-perl/c/signal.c Fri Feb 22 03:24:33 2008
@@ -66,7 +66,7 @@
if (sig == 0)
return "without signal";
if (PE_RING_EMPTY(&Sigring[sig]))
- rsignal(sig, process_sighandler);
+ rsignal(sig, (Sighandler_t)process_sighandler);
PE_RING_UNSHIFT(&ev->sring, &Sigring[sig]);
return 0;
}
@@ -76,7 +76,7 @@
int sig = ev->signal;
PE_RING_DETACH(&ev->sring);
if (PE_RING_EMPTY(&Sigring[sig])) {
- rsignal(sig, SIG_DFL);
+ rsignal(sig, (Sighandler_t)SIG_DFL);
Sigstat[0].hits[sig] = 0;
Sigstat[1].hits[sig] = 0;
}
@@ -88,7 +88,7 @@
STRLEN n_a;
int active = WaPOLLING(ev);
int sig = whichsig(SvPV(nval, n_a));
- /*warn("whichsig(%s) = %d", SvPV(nval,na), sig); */
+ /*warn("whichsig(%s) = %d", SvPV(nval,na), sig); /**/
if (sig == 0)
croak("Unrecognized signal '%s'", SvPV(nval, n_a));
if (!PE_SIGVALID(sig))
Modified: trunk/libevent-perl/c/timeable.c
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/c/timeable.c?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/c/timeable.c (original)
+++ trunk/libevent-perl/c/timeable.c Fri Feb 22 03:24:33 2008
@@ -1,6 +1,6 @@
static pe_timeable Timeables;
-/*#define D_TIMEABLE(x) x */
+/*#define D_TIMEABLE(x) x /**/
#define D_TIMEABLE(x) /**/
/* BROQ
@@ -18,7 +18,7 @@
static void pe_timeables_check() {
pe_timeable *tm = (pe_timeable*) Timeables.ring.next;
double now = NVtime() + IntervalEpsilon;
- /* warn("timeables at %.2f\n", now); db_show_timeables(); */
+ /* warn("timeables at %.2f\n", now); db_show_timeables();/**/
while (tm->ring.self && now >= tm->at) {
pe_watcher *ev = (pe_watcher*) tm->ring.self;
pe_timeable *next = (pe_timeable*) tm->ring.next;
@@ -60,9 +60,9 @@
while (rg->ring.self && rg->at < tm->at) {
rg = (pe_timeable*) rg->ring.next;
}
- /*warn("-- adding 0x%x:\n", ev); db_show_timeables(); */
+ /*warn("-- adding 0x%x:\n", ev); db_show_timeables();/**/
PE_RING_ADD_BEFORE(&tm->ring, &rg->ring);
- /*warn("T:\n"); db_show_timeables(); */
+ /*warn("T:\n"); db_show_timeables();/**/
D_TIMEABLE({
if (WaDEBUGx(ev) >= 4) {
warn("Event: timeable start '%s'\n", SvPV(ev->desc, n_a));
Modified: trunk/libevent-perl/c/timer.c
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/c/timer.c?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/c/timer.c (original)
+++ trunk/libevent-perl/c/timer.c Fri Feb 22 03:24:33 2008
@@ -20,7 +20,7 @@
}
static char *pe_timer_start(pe_watcher *ev, int repeat) {
- /* STRLEN n_a; */
+ STRLEN n_a;
pe_timer *tm = (pe_timer*) ev;
if (!ev->callback)
return "without callback";
Modified: trunk/libevent-perl/c/typemap.c
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/c/typemap.c?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/c/typemap.c (original)
+++ trunk/libevent-perl/c/typemap.c Fri Feb 22 03:24:33 2008
@@ -25,7 +25,7 @@
New(0, mg, 1, MAGIC);
Zero(mg, 1, MAGIC);
mg->mg_type = '~';
- mg->mg_obj = (SV*) ptr; /* NOT refcnt'd */
+ mg->mg_ptr = (char*) ptr; /* NOT refcnt'd */
mg->mg_private = mgcode;
*mgp = mg;
@@ -47,7 +47,7 @@
if (mg->mg_private != mgcode) {
croak("Can't find event magic (SV=0x%x)", sv);
}
- return (void*) mg->mg_obj;
+ return (void*) mg->mg_ptr;
}
croak("sv_2thing: can't decode SV=0x%x", origsv);
return 0;
@@ -106,7 +106,7 @@
SV *rv = newSV(0);
SV *sv = newSVrv(rv,0);
sv_bless(rv, ev->vtbl->stash);
- sv_setiv(sv, (IV)ev);
+ sv_setiv(sv, PTR2IV(ev));
ev->mysv = rv;
if (WaDEBUGx(ev->up) >= 4) {
@@ -123,7 +123,7 @@
assert(sv);
assert(SvROK(sv));
sv = SvRV(sv);
- ptr = (void*) SvIV(sv);
+ ptr = INT2PTR(void *, SvIV(sv));
assert(ptr);
return ptr;
}
@@ -165,7 +165,6 @@
}
SV* events_mask_2sv(int mask) {
- /* STRLEN len; */
SV *ret = newSV(0);
SvUPGRADE(ret, SVt_PVIV);
sv_setpvn(ret, "", 0);
Modified: trunk/libevent-perl/c/var.c
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/c/var.c?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/c/var.c (original)
+++ trunk/libevent-perl/c/var.c Fri Feb 22 03:24:33 2008
@@ -48,9 +48,9 @@
}
static I32 tracevar_r(pTHX_ IV ix, SV *sv)
-{ pe_tracevar((pe_watcher *)ix, sv, PE_R); return 0; /*ignored*/ }
+{ pe_tracevar(INT2PTR(pe_watcher *, ix), sv, PE_R); return 0; /*ignored*/ }
static I32 tracevar_w(pTHX_ IV ix, SV *sv)
-{ pe_tracevar((pe_watcher *)ix, sv, PE_W); return 0; /*ignored*/ }
+{ pe_tracevar(INT2PTR(pe_watcher *, ix), sv, PE_W); return 0; /*ignored*/ }
static char *pe_var_start(pe_watcher *_ev, int repeat) {
STRLEN n_a;
@@ -86,7 +86,7 @@
EvNew(8, ufp, 1, struct ufuncs);
ufp->uf_val = ev->events & PE_R? tracevar_r : 0;
ufp->uf_set = ev->events & PE_W? tracevar_w : 0;
- ufp->uf_index = (IV) ev;
+ ufp->uf_index = PTR2IV(ev);
mg->mg_ptr = (char *) ufp;
mg->mg_obj = (SV*) ev;
@@ -99,7 +99,6 @@
static void pe_var_stop(pe_watcher *_ev) {
MAGIC **mgp;
MAGIC *mg;
- MAGIC *mgtmp;
pe_var *ev = (pe_var*) _ev;
SV *sv = SvRV(ev->variable);
Modified: trunk/libevent-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/debian/changelog?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/debian/changelog (original)
+++ trunk/libevent-perl/debian/changelog Fri Feb 22 03:24:33 2008
@@ -1,5 +1,5 @@
-libevent-perl (1.06-2) UNRELEASED; urgency=low
-
+libevent-perl (1.10-1) unstable; urgency=low
+
[ MartÃn Ferrari ]
* Starting taking over by DPG. See
http://lists.debian.org/debian-perl/2008/02/msg00053.html.
@@ -11,8 +11,22 @@
Maintainer set to Debian Perl Group <pkg-perl-
maintainers at lists.alioth.debian.org> (was: Steve Kowalik
<stevenk at debian.org>).
+
+ [ Rene Mayorga ]
+ * New Upstream version
+ * debian/control
+ + Bump standards-version to 3.7.3 ( no changes needed )
+ + Raise compat level to 6
+ + Add Uploaders field and myself
+ + Add ${misc:Depends} and {shlibs:Depends} to Depends field
+ * debian/rules - sync it with the last dh-make-perl template
+ * Don't install README
+ * remove debian/docs
+ * rewrite debian/copyright
+ * remove the patch introduced by the previos maintainer
+ - this patch was added to avoid some warnings
- -- gregor herrmann <gregor+debian at comodo.priv.at> Wed, 13 Feb 2008 21:51:31 +0100
+ -- Rene Mayorga <rmayorga at debian.org.sv> Thu, 21 Feb 2008 20:21:10 -0600
libevent-perl (1.06-1) unstable; urgency=low
Modified: trunk/libevent-perl/debian/compat
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/debian/compat?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/debian/compat (original)
+++ trunk/libevent-perl/debian/compat Fri Feb 22 03:24:33 2008
@@ -1,1 +1,1 @@
-4
+6
Modified: trunk/libevent-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/debian/control?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/debian/control (original)
+++ trunk/libevent-perl/debian/control Fri Feb 22 03:24:33 2008
@@ -2,15 +2,16 @@
Section: perl
Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Standards-Version: 3.6.1
+Uploaders: Rene Mayorga <rmayorga at debian.org.sv>
+Standards-Version: 3.7.3
Homepage: http://search.cpan.org/dist/Event/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libevent-perl/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libevent-perl/
-Build-Depends: debhelper (>= 4.0.0), perl (>= 5.6.1-16)
+Build-Depends: debhelper (>= 6), perl (>= 5.6.1-16)
Package: libevent-perl
Architecture: any
-Depends: ${perl:Depends}
+Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
Recommends: libtime-hires-perl
Description: Generic Perl event loop
Provides a simple and optimized event loop for a rather broad number of
Modified: trunk/libevent-perl/debian/copyright
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/debian/copyright?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/debian/copyright (original)
+++ trunk/libevent-perl/debian/copyright Fri Feb 22 03:24:33 2008
@@ -1,12 +1,24 @@
-The sources of this package can be obtained from:
- http://search.cpan.org/author/JPRIT/Event/
+This package was downloaded from: http://search.cpan.org/dist/Event/
-Copyright (c) 1998-2002, Joshua Nathaniel Pritikin <vishnu at pobox.com>
+Files: debian/*
+Copyright: © 2002 Steve Kowalik <stevenk at debian.org>
+License: GPL-1+
+ The Debian packaging information is under the GPL, version 1 or later
-This program is free software; you can redistribute it and/or
-modify it under the terms of Perl itself. (that is, either the
-Artistic License or GPL as you prefer).
+Files: c/pport.h
+Copyright: © 1999, Kenneth Albanowski.
+License: GPL-1+ | Artistic
+ This code may be used and distributed under the same license as any version
+ of Perl.
-The GPL and Artistic licenses can be found under
-/usr/share/common-licenses/{GPL,Artistic} on Debian systems.
+Files: *
+Copyright: © 1998, 1999, 2000, 2001, 2002, 2003, 2004
+ Joshua Nathaniel Pritikin
+License: GPL-1+ | Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the same terms as Perl itself.
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL' and the
+complete text of the Artistic License can be found in
+`/usr/share/common-licenses/Artistic'.
Modified: trunk/libevent-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/debian/rules?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/debian/rules (original)
+++ trunk/libevent-perl/debian/rules Fri Feb 22 03:24:33 2008
@@ -1,67 +1,79 @@
#!/usr/bin/make -f
+# This debian/rules file is provided as a template for normal perl
+# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
+# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
+# be used freely wherever it is useful.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# If set to a true value then MakeMaker's prompt function will
+# always return the default without waiting for user input.
+export PERL_MM_USE_DEFAULT=1
+
+PACKAGE=$(shell dh_listpackages)
ifndef PERL
PERL = /usr/bin/perl
endif
+TMP =$(CURDIR)/debian/$(PACKAGE)
+
+# Allow disabling build optimation by setting noopt in
+# $DEB_BUILD_OPTIONS
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
build: build-stamp
build-stamp:
dh_testdir
-
- # Add here commands to compile the package.
$(PERL) Makefile.PL INSTALLDIRS=vendor
- $(MAKE) OPTIMIZE="-O2 -g -Wall"
-
- touch build-stamp
-
-test: test-stamp
-test-stamp:
+ $(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
$(MAKE) test
- touch test-stamp
+ touch $@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp test-stamp
+ dh_clean build-stamp install-stamp
+ [ ! -f Makefile ] || $(MAKE) realclean
- # Add here commands to clean up after the build process.
- -$(MAKE) clean
- -$(MAKE) distclean
-
- rm -f Makefile.old
-
- dh_clean
-
-install: build test
+install: install-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/<packagename>
- $(MAKE) PREFIX=`pwd`/debian/`dh_listpackages`/usr install
+ $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+ [ ! -d $(TMP)/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/share/perl5
+ touch $@
# Build architecture-independent files here.
binary-indep: build install
-# We have nothing to do by default.
+# We have nothing to do here for an architecture-dependent package
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
- dh_installdocs
- dh_installman
- dh_installinfo
- dh_installchangelogs
- dh_link
+ dh_installexamples
+ dh_installdocs Tutorial.pdf
+ dh_installchangelogs ChangeLog
+ dh_shlibdeps
dh_strip
+ dh_perl
dh_compress
dh_fixperms
dh_installdeb
- dh_perl
dh_gencontrol
dh_md5sums
dh_builddeb
+source diff:
+ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary
Modified: trunk/libevent-perl/lib/Event.pm
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/lib/Event.pm?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/lib/Event.pm (original)
+++ trunk/libevent-perl/lib/Event.pm Fri Feb 22 03:24:33 2008
@@ -8,13 +8,13 @@
}
package Event;
-require 5.6.0; #maybe
+require 5.006; #maybe
use base 'Exporter';
use Carp;
eval { require Carp::Heavy; }; # work around perl_call_pv bug XXX
use vars qw($VERSION @EXPORT_OK
$API $DebugLevel $Eval $DIED $Now);
-$VERSION = '1.06';
+$VERSION = '1.10';
# If we inherit DynaLoader then we inherit AutoLoader; Bletch!
require DynaLoader;
Modified: trunk/libevent-perl/t/io.t
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/t/io.t?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/t/io.t (original)
+++ trunk/libevent-perl/t/io.t Fri Feb 22 03:24:33 2008
@@ -1,5 +1,6 @@
# -*-perl-*- i/o
+use Config;
BEGIN {
if ($^O eq 'MSWin32') {
print "1..0\n";
@@ -84,6 +85,6 @@
loop();
-ok $noticed_bogus_fd, 1;
-ok !defined $bogus->fd;
+skip $Config{osname} eq 'darwin', $noticed_bogus_fd, 1;
+skip $Config{osname} eq 'darwin', !defined $bogus->fd;
ok $bogus_timeout > 0;
Modified: trunk/libevent-perl/t/unconfigured.t
URL: http://svn.debian.org/wsvn/trunk/libevent-perl/t/unconfigured.t?rev=15389&op=diff
==============================================================================
--- trunk/libevent-perl/t/unconfigured.t (original)
+++ trunk/libevent-perl/t/unconfigured.t Fri Feb 22 03:24:33 2008
@@ -23,5 +23,5 @@
eval { Event->var(@p, poll => 0, var => \$var) };
ok $@, '/without poll events/';
-eval { Event->var(@p, var => \$1) };
+eval { Event->var(@p, var => \$$) };
ok $@, '/read\-only/';
More information about the Pkg-perl-cvs-commits
mailing list