tags 607984 patch thanks Hello,
I've updated the libevent2 packaging for upstream release 2.0.10. Please find attached patches. Thanks. -- Timur
From 49f842358ddf23e37ff281db8e9499abbf7174e2 Mon Sep 17 00:00:00 2001 From: Timur Birsh <t...@linukz.org> Date: Mon, 10 Jan 2011 23:17:40 +0600 Subject: [PATCH 4/4] Use source format 3.0 (quilt) --- debian/source/format | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 debian/source/format diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- 1.7.2.3
From a225ccfb6a6b34e95745b1b2baec4cada5f67ee6 Mon Sep 17 00:00:00 2001 From: Timur Birsh <t...@linukz.org> Date: Mon, 10 Jan 2011 23:10:18 +0600 Subject: [PATCH 1/4] Bump debhelper's build dependency to 7.0.50~ (needed by debhelper's override mechanism) --- debian/control | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/debian/control b/debian/control index ced1554..a3f0314 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: libevent Section: libs Priority: optional Maintainer: Anibal Monsalve Salazar <ani...@debian.org> -Build-Depends: debhelper (>= 7), autotools-dev, libtool +Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libtool Standards-Version: 3.8.3 Homepage: http://www.monkey.org/~provos/libevent/ -- 1.7.2.3
From 51e32e6be822e768c24d9290ace23d5d06c9303e Mon Sep 17 00:00:00 2001 From: Timur Birsh <t...@linukz.org> Date: Mon, 10 Jan 2011 23:16:11 +0600 Subject: [PATCH 2/4] Use debhelper's override mechanism --- debian/libevent-core2.dirs | 1 - debian/libevent-core2.files | 1 - debian/libevent-core2.install | 1 + debian/libevent-dev.dirs | 2 - debian/libevent-dev.docs | 1 - debian/libevent-dev.examples | 1 + debian/libevent-dev.files | 3 -- debian/libevent-dev.install | 5 +++ debian/libevent-extra2.dirs | 1 - debian/libevent-extra2.files | 1 - debian/libevent-extra2.install | 1 + debian/libevent-pthreads0.dirs | 1 - debian/libevent-pthreads0.files | 1 - debian/libevent-pthreads0.install | 1 + debian/libevent2.dirs | 1 - debian/libevent2.files | 1 - debian/libevent2.install | 1 + debian/rules | 72 +++++-------------------------------- 18 files changed, 19 insertions(+), 77 deletions(-) delete mode 100644 debian/libevent-core2.dirs delete mode 100644 debian/libevent-core2.files create mode 100644 debian/libevent-core2.install delete mode 100644 debian/libevent-dev.dirs delete mode 100644 debian/libevent-dev.docs create mode 100644 debian/libevent-dev.examples delete mode 100644 debian/libevent-dev.files create mode 100644 debian/libevent-dev.install delete mode 100644 debian/libevent-extra2.dirs delete mode 100644 debian/libevent-extra2.files create mode 100644 debian/libevent-extra2.install delete mode 100644 debian/libevent-pthreads0.dirs delete mode 100644 debian/libevent-pthreads0.files create mode 100644 debian/libevent-pthreads0.install delete mode 100644 debian/libevent2.dirs delete mode 100644 debian/libevent2.files create mode 100644 debian/libevent2.install diff --git a/debian/libevent-core2.dirs b/debian/libevent-core2.dirs deleted file mode 100644 index 6845771..0000000 --- a/debian/libevent-core2.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/debian/libevent-core2.files b/debian/libevent-core2.files deleted file mode 100644 index 939ba9c..0000000 --- a/debian/libevent-core2.files +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libevent_core.so.* diff --git a/debian/libevent-core2.install b/debian/libevent-core2.install new file mode 100644 index 0000000..6dfbff5 --- /dev/null +++ b/debian/libevent-core2.install @@ -0,0 +1 @@ +usr/lib/libevent_core-2.0.so.* diff --git a/debian/libevent-dev.dirs b/debian/libevent-dev.dirs deleted file mode 100644 index 4418816..0000000 --- a/debian/libevent-dev.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib -usr/include diff --git a/debian/libevent-dev.docs b/debian/libevent-dev.docs deleted file mode 100644 index 9a3b5cf..0000000 --- a/debian/libevent-dev.docs +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/examples diff --git a/debian/libevent-dev.examples b/debian/libevent-dev.examples new file mode 100644 index 0000000..cfdeec6 --- /dev/null +++ b/debian/libevent-dev.examples @@ -0,0 +1 @@ +sample/*.c diff --git a/debian/libevent-dev.files b/debian/libevent-dev.files deleted file mode 100644 index d1bffed..0000000 --- a/debian/libevent-dev.files +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/* -usr/lib/lib*.a -usr/lib/lib*.so diff --git a/debian/libevent-dev.install b/debian/libevent-dev.install new file mode 100644 index 0000000..fb3dbaf --- /dev/null +++ b/debian/libevent-dev.install @@ -0,0 +1,5 @@ +usr/include/* +usr/lib/lib*.a +usr/lib/lib*.so +usr/lib/pkgconfig/libevent.pc +usr/lib/pkgconfig/libevent_pthreads.pc diff --git a/debian/libevent-extra2.dirs b/debian/libevent-extra2.dirs deleted file mode 100644 index 6845771..0000000 --- a/debian/libevent-extra2.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/debian/libevent-extra2.files b/debian/libevent-extra2.files deleted file mode 100644 index 0c519bd..0000000 --- a/debian/libevent-extra2.files +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libevent_extra.so.* diff --git a/debian/libevent-extra2.install b/debian/libevent-extra2.install new file mode 100644 index 0000000..2ab5f04 --- /dev/null +++ b/debian/libevent-extra2.install @@ -0,0 +1 @@ +usr/lib/libevent_extra-2.0.so.* diff --git a/debian/libevent-pthreads0.dirs b/debian/libevent-pthreads0.dirs deleted file mode 100644 index 6845771..0000000 --- a/debian/libevent-pthreads0.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/debian/libevent-pthreads0.files b/debian/libevent-pthreads0.files deleted file mode 100644 index 2fa5505..0000000 --- a/debian/libevent-pthreads0.files +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libevent_pthreads.so* diff --git a/debian/libevent-pthreads0.install b/debian/libevent-pthreads0.install new file mode 100644 index 0000000..9686060 --- /dev/null +++ b/debian/libevent-pthreads0.install @@ -0,0 +1 @@ +usr/lib/libevent_pthreads-2.0.so* diff --git a/debian/libevent2.dirs b/debian/libevent2.dirs deleted file mode 100644 index 6845771..0000000 --- a/debian/libevent2.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/debian/libevent2.files b/debian/libevent2.files deleted file mode 100644 index 9b80dd7..0000000 --- a/debian/libevent2.files +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libevent.so.* diff --git a/debian/libevent2.install b/debian/libevent2.install new file mode 100644 index 0000000..0f7777c --- /dev/null +++ b/debian/libevent2.install @@ -0,0 +1 @@ +usr/lib/libevent-2.0.so.* diff --git a/debian/rules b/debian/rules index 5ea6913..6d6dfa5 100755 --- a/debian/rules +++ b/debian/rules @@ -18,70 +18,16 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif -config.status: configure - dh_testdir - cp -f /usr/share/misc/config.sub /usr/share/misc/config.guess . - # Add here commands to configure the package. - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info +%: + dh --with autotools_dev $@ +override_dh_auto_configure: + dh_auto_configure -- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info -build: build-stamp -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - rm -f config.sub config.guess - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - # Add here commands to install the package into debian/tmp - $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr - - # Copy the example C files - mkdir -p $(CURDIR)/debian/tmp/examples/ - cp $(CURDIR)/sample/*.c $(CURDIR)/debian/tmp/examples/ - cp $(CURDIR)/debian/Makefile.sample $(CURDIR)/debian/tmp/examples/Makefile - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_movefiles - dh_installdocs +override_dh_installexamples: dh_installexamples - dh_installman - dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs -V - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb + # ugly hack to install Makefile.sample as Makefile + cp debian/Makefile.sample debian/libevent-dev/usr/share/doc/libevent-dev/examples/Makefile -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +override_dh_auto_test: + # do not run tests -- 1.7.2.3
From 537104b083adfcde3a17e0851ba39d6d7493d07c Mon Sep 17 00:00:00 2001 From: Timur Birsh <t...@linukz.org> Date: Mon, 10 Jan 2011 23:16:58 +0600 Subject: [PATCH 3/4] manpages is no longer distributed by upstream --- debian/libevent-dev.manpages | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) delete mode 100644 debian/libevent-dev.manpages diff --git a/debian/libevent-dev.manpages b/debian/libevent-dev.manpages deleted file mode 100644 index 9cfdad4..0000000 --- a/debian/libevent-dev.manpages +++ /dev/null @@ -1,2 +0,0 @@ -event.3 -evdns.3 -- 1.7.2.3