Hi William,
I've cleaned up the packaging for libaio, attached is a patch which
fixes as well the two bug reports filed against it.
I'll be uploading an NMU in few days for this long standing RC
bug, given the 0-day NMU policy in place.
thanks,
guillem
diff -u libaio-0.3.104/debian/compat libaio-0.3.104/debian/compat
--- libaio-0.3.104/debian/compat
+++ libaio-0.3.104/debian/compat
@@ -1 +1 @@
-3
+5
reverted:
--- libaio-0.3.104/debian/libaio-0.3.104.postinst.debhelper
+++ libaio-0.3.104.orig/debian/libaio-0.3.104.postinst.debhelper
@@ -1,5 +0,0 @@
-# Automatically added by dh_makeshlibs
-if [ "$1" = "configure" ]; then
- ldconfig
-fi
-# End automatically added section
reverted:
--- libaio-0.3.104/debian/dirs
+++ libaio-0.3.104.orig/debian/dirs
@@ -1,3 +0,0 @@
-usr/lib
-usr/include
-usr/share/lintian/overrides
reverted:
--- libaio-0.3.104/debian/libaio-0.3.104.postrm.debhelper
+++ libaio-0.3.104.orig/debian/libaio-0.3.104.postrm.debhelper
@@ -1,5 +0,0 @@
-# Automatically added by dh_makeshlibs
-if [ "$1" = "remove" ]; then
- ldconfig
-fi
-# End automatically added section
diff -u libaio-0.3.104/debian/libaio1.dirs libaio-0.3.104/debian/libaio1.dirs
--- libaio-0.3.104/debian/libaio1.dirs
+++ libaio-0.3.104/debian/libaio1.dirs
@@ -1 +1 @@
-usr/lib
+usr/share/lintian/overrides
diff -u libaio-0.3.104/debian/rules libaio-0.3.104/debian/rules
--- libaio-0.3.104/debian/rules
+++ libaio-0.3.104/debian/rules
@@ -9,9 +9,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
-
-
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -20,55 +17,31 @@
CFLAGS += -O2
endif
-# shared library versions, option 1
-version=2.0.5
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-configure: configure-stamp
-configure-stamp:
- patch -p1 < debian/debianize.patch
- dh_testdir
- # Add here commands to configure the package.
+lib=libaio1
+libdev=libaio-dev
- touch configure-stamp
-
-
-build: build-stamp
-build-stamp: configure-stamp
+build:
dh_testdir
-
- # Add here commands to compile the package.
+
$(MAKE)
- touch build-stamp
-
clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
+
-$(MAKE) clean
-
- dh_clean
+
+ dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_clean -k
dh_installdirs
-
- # Add here commands to install the package into debian/tmp
- $(MAKE) install prefix=$(CURDIR)/debian/libaio/usr \
- DESTDIR=$(CURDIR)/debian/libaio/usr
- install -D -m 644 debian/lintian.override \
- $(CURDIR)/debian/libaio/usr/share/lintian/overrides/libaio
-
+
+ $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
+ install -D -m 644 debian/$(lib).lintian \
+ $(CURDIR)/debian/$(lib)/usr/share/lintian/overrides/$(lib)
# Build architecture-independent files here.
binary-indep: build install
@@ -81,29 +54,20 @@
+ dh_install --sourcedir=$(CURDIR)/debian/tmp
dh_installchangelogs ChangeLog
dh_installdocs
dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
dh_installman
dh_link
dh_strip
dh_compress
dh_fixperms
-# dh_perl
-# dh_python
dh_makeshlibs
- dh_shlibdeps -L libaio -l debian/libaio/usr/lib/
+ dh_shlibdeps
dh_installdeb
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+
+.PHONY: build clean binary-indep binary-arch binary install
+
reverted:
--- libaio-0.3.104/debian/debianize.patch
+++ libaio-0.3.104.orig/debian/debianize.patch
@@ -1,15 +0,0 @@
---- ./src/Makefile.orig 2005-04-22 15:24:29.000000000 -0700
-+++ ./src/Makefile 2005-04-22 15:25:02.000000000 -0700
-@@ -52,10 +52,10 @@
-
- install: $(all_targets)
- install -D -m 644 libaio.h $(includedir)/libaio.h
-- install -D -m 644 libaio.a $(libdir)/libaio.a
- install -D -m 755 $(libname) $(libdir)/$(libname)
- ln -sf $(libname) $(libdir)/$(soname)
-- ln -sf $(libname) $(libdir)/libaio.so
-+# install -D -m 644 libaio.a $(libdir)/libaio.a
-+# ln -sf $(libname) $(libdir)/libaio.so
-
- $(libaio_objs): libaio.h
-
diff -u libaio-0.3.104/debian/copyright libaio-0.3.104/debian/copyright
--- libaio-0.3.104/debian/copyright
+++ libaio-0.3.104/debian/copyright
@@ -4,7 +4,27 @@
-It was downloaded from
ftp://195.220.108.108/linux/fedora/core/development/SRPMS/libaio-0.3.104-2.src.rpm
+It was downloaded from:
-Copyright Holder: Benjamin LaHaise
+
<http://redhat.download.fedoraproject.org/pub/fedora/linux/core/development/source/SRPMS/>
+
+Copyright Holder:
+
+ Copyright (C) 2002-2003 Benjamin LaHaise <[EMAIL PROTECTED]>
+ Copyright (C) 2003-2004 Jeff Moyer <[EMAIL PROTECTED]>
License:
-/usr/share/common-licenses/LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
diff -u libaio-0.3.104/debian/changelog libaio-0.3.104/debian/changelog
--- libaio-0.3.104/debian/changelog
+++ libaio-0.3.104/debian/changelog
@@ -1,3 +1,39 @@
+libaio (0.3.104-1.1) unstable; urgency=low
+
+ * Non-Maintainer Upload.
+ * Provide a new binary package libaio-dev, with the static library
+ the .so symlink and the manpages. (Closes: #318795)
+ * Add debian/libaio-dev.install.
+ * Add debian/libaio-dev.manpages.
+ * Rename the binary package libaio to libaio1 to match the soname, no
+ transition package as no one depends on it.
+ * Rename debian/lintian.override to debian/libaio1.lintian.
+ * Remove shlib-missing-in-control-file lintian override as we provide
+ now the shlibs file.
+ * Remove temporal debhelper leftover files:
+ - debian/libaio-0.3.104.postinst.debhelper
+ - debian/libaio-0.3.104.postrm.debhelper
+ * Add amd64 to the Architecture fields. (Closes: #335352)
+ * Switch to debhelper compat level 5.
+ * Now using Standards-Version 3.7.2.
+ * Change Priority from optional to extra.
+ * Remove unneeded debian/dirs file.
+ * Remove debian/debianize.patch, we actually want the .so symlink
+ and the .a library when doing "make install".
+ * Only put "usr/share/lintian/override" in libaio1.dirs.
+ * Clean up debian/rules:
+ - Do not use stamp files.
+ - Remove unused comments.
+ - Remove unused configure target.
+ - Do not pass DESTDIR to make as it is not using it.
+ * Complete debian/copyright:
+ - Add copyright holder information.
+ - Add the LGPL license snippet.
+ - Specify a download url which actually works.
+ * Add a watch file.
+
+ -- Guillem Jover <[EMAIL PROTECTED]> Wed, 23 Aug 2006 04:59:27 +0300
+
libaio (0.3.104-1) unstable; urgency=low
* Initial Release.
reverted:
--- libaio-0.3.104/debian/lintian.override
+++ libaio-0.3.104.orig/debian/lintian.override
@@ -1,2 +0,0 @@
-libaio: shared-lib-without-dependency-information ./usr/lib/libaio.so.1.0.1
-libaio: shlib-missing-in-control-file libaio usr/lib/libaio.so.1.0.1
diff -u libaio-0.3.104/debian/control libaio-0.3.104/debian/control
--- libaio-0.3.104/debian/control
+++ libaio-0.3.104/debian/control
@@ -2,14 +2,22 @@
-Priority: optional
Maintainer: William Lee Irwin III <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0)
-Standards-Version: 3.6.1
+Priority: extra
Section: libs
+Build-Depends: debhelper (>= 5)
+Standards-Version: 3.7.2
-Package: libaio
-Section: libs
-Architecture: i386 ia64 s390 alpha powerpc
-Depends:
-Description: kernel aio access library
+Package: libaio1
+Architecture: i386 amd64 ia64 s390 alpha powerpc
+Description: kernel aio access library - shared library
+ This library enables userspace to use kernel asynchronous I/O system
+ calls, important for the performance of databases and other advanced
+ applications.
+
+Package: libaio-dev
+Section: libdevel
+Architecture: i386 amd64 ia64 s390 alpha powerpc
+Depends: libaio1 (= ${Source-Version})
+Description: kernel aio access library - development files
This library enables userspace to use kernel asynchronous I/O system
calls, important for the performance of databases and other advanced
applications.
+
only in patch2:
unchanged:
--- libaio-0.3.104.orig/debian/libaio-dev.manpages
+++ libaio-0.3.104/debian/libaio-dev.manpages
@@ -0,0 +1,9 @@
+man/io.3
+man/io_fsync.3
+man/io_prep_*.3
+man/io_queue_*.3
+man/io_set_*.3
+man/aio.3
+man/aio_init.3
+man/aio*64.3
+man/lio*.3
only in patch2:
unchanged:
--- libaio-0.3.104.orig/debian/watch
+++ libaio-0.3.104/debian/watch
@@ -0,0 +1,3 @@
+# Site Directory Pattern Version Script
+version=3
+http://redhat.download.fedoraproject.org/pub/fedora/linux/core/development/source/SRPMS/
libaio-([\d\.]+)-[\d\.]+\.src.rpm debian uupdate
only in patch2:
unchanged:
--- libaio-0.3.104.orig/debian/libaio-dev.install
+++ libaio-0.3.104/debian/libaio-dev.install
@@ -0,0 +1,3 @@
+usr/include
+usr/lib/lib*.so
+usr/lib/lib*.a
only in patch2:
unchanged:
--- libaio-0.3.104.orig/debian/libaio1.lintian
+++ libaio-0.3.104/debian/libaio1.lintian
@@ -0,0 +1 @@
+libaio1: shared-lib-without-dependency-information ./usr/lib/libaio.so.1.0.1
