OoO En cette soirée bien amorcée du dimanche 10 août 2008, vers 22:20, RISKO Gergely <[EMAIL PROTECTED]> disait :
>> The patch is trivial, why not apply it? Moreover, this file should be >> part of libmcrypt-dev as well as /usr/lib/libmcrypt.la (and in fact >> libmcrypt.a should be shipped instead). >> >> Riko, would you like some help for packaging? If you are not interested >> or have not enough time to care of this package, please orphan it. > Please do an NMU or supply a patch and I will do an upload. Hi Gergely! Sorry for misnaming you in my previous mail. Here is a proposed debdiff:
--- libmcrypt-2.5.7/debian/control
+++ libmcrypt-2.5.7/debian/control
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: RISKO Gergely <[EMAIL PROTECTED]>
-Build-Depends: libltdl3-dev, debhelper
+Build-Depends: libltdl3-dev, debhelper (>= 5), autotools-dev, quilt
Standards-Version: 3.6.1.1
Package: libmcrypt4
@@ -27,8 +27,8 @@
Package: libmcrypt-dev
Section: libdevel
Architecture: any
-Depends: libmcrypt4 (= ${Source-Version}), libltdl3-dev
-Replaces: libmcrypt4 (<< 2.5.7-2)
+Depends: libmcrypt4 (= ${binary:Version}), libltdl3-dev
+Replaces: libmcrypt4 (<< 2.5.7-5)
Description: De-/Encryption Library development files
libmcrypt is the library which implements all the algorithms and
modes found in mcrypt.
--- libmcrypt-2.5.7/debian/rules
+++ libmcrypt-2.5.7/debian/rules
@@ -5,35 +5,30 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
-export DH_COMPAT=1
+include /usr/share/quilt/quilt.make
build: build-stamp
-build-stamp:
+build-stamp: patch
dh_testdir
# Add here commands to compile the package.
+ cp -f /usr/share/misc/config.sub config.sub
+ cp -f /usr/share/misc/config.guess config.guess
./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
$(MAKE)
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp libltdl/config.log libltdl/config.status
+ rm -f stamp-h.in build-stamp config.guess config.sub
- -$(MAKE) clean
- -$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
- rm -f config.log config.status
+ [ ! -f Makefile ] || $(MAKE) clean
+ [ ! -f Makefile ] || (echo "distclean:" > libltdl/Makefile ; $(MAKE) distclean ; rm libltdl/Makefile)
+ rm -f config.log config.status
- dh_clean conftest conftest.o
+ dh_clean
install: build
dh_testdir
@@ -44,31 +39,21 @@
# Add here commands to install the package into debian/tmp.
$(MAKE) mandir=`pwd`/debian/tmp/usr/share/man prefix=`pwd`/debian/tmp/usr install
- dh_movefiles -plibmcrypt-dev usr/lib/*\.a usr/lib/libmcrypt/*\.a usr/lib/*.so usr/include usr/bin/libmcrypt-config
- rm -rf debian/tmp/usr/include
-
# 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_testversion
dh_testdir
dh_testroot
-# dh_installdebconf
dh_installdocs
dh_installexamples
dh_installmenu
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
+ dh_install
dh_installcron
dh_installmanpages -plibmcrypt-dev
- cd debian/libmcrypt-dev/usr/share/man/man3; mv mcrypt.3 libmcrypt.3 ; ln -s libmcrypt.3 mcrypt.3
- rm -R debian/tmp/usr/share/man
-# dh_undocumented
+ cd debian/libmcrypt-dev/usr/share/man/man3 && mv mcrypt.3 libmcrypt.3 && ln -s libmcrypt.3 mcrypt.3
dh_installchangelogs ChangeLog
dh_link
dh_strip
@@ -76,7 +61,6 @@
dh_fixperms
dh_makeshlibs -X usr/lib/libmcrypt/
dh_installdeb
-# dh_perl
dh_shlibdeps
dh_gencontrol
dh_md5sums
--- libmcrypt-2.5.7/debian/changelog
+++ libmcrypt-2.5.7/debian/changelog
@@ -1,3 +1,22 @@
+libmcrypt (2.5.7-6) unstable; urgency=low
+
+ * Update debian/compat to 5. Remove DH_COMPAT from top of
+ debian/rules. Update debhelper dependency to >= 5.
+ * Use dh_install to dispatch files to libmcrypt4 and libmcrypt-dev. Move
+ some files from libmcrypt4 to libmcrypt-dev. Update Replaces to allow
+ smooth updates.
+ * Don't use minus sign in front of cleaning rules in debian/rules but
+ add some hack to avoid bug in distclean target for libltdl.
+ * Move replacement of config.guess and config.sub to configure target in
+ debian/rules. Clean them in clean target. Depends on autotools-dev to
+ not use conditionals.
+ * Cleanup diff.gz.
+ * Build-Depends on autotools-dev to ensure up-to-date config.{guess,sub}
+ * Fix libmcrypt.m4, thanks to Alban Browaeys (Closes: #305288)
+ * Switch to binary:Version in debian/control
+
+ -- RISKO Gergely <[EMAIL PROTECTED]> Mon, 11 Aug 2008 07:57:59 +0200
+
libmcrypt (2.5.7-5) unstable; urgency=low
* updated the description about the new algorithms
--- libmcrypt-2.5.7.orig/debian/libmcrypt4.install
+++ libmcrypt-2.5.7/debian/libmcrypt4.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*.so.*
--- libmcrypt-2.5.7.orig/debian/compat
+++ libmcrypt-2.5.7/debian/compat
@@ -0,0 +1 @@
+5
--- libmcrypt-2.5.7.orig/debian/libmcrypt-dev.install
+++ libmcrypt-2.5.7/debian/libmcrypt-dev.install
@@ -0,0 +1,6 @@
+debian/tmp/usr/lib/*.la
+debian/tmp/usr/lib/*.so
+debian/tmp/usr/include/*.h
+debian/tmp/usr/share/aclocal/*.m4
+debian/tmp/usr/bin/*-config
+debian/tmp/usr/share/man/man3/*
--- libmcrypt-2.5.7.orig/debian/patches/series
+++ libmcrypt-2.5.7/debian/patches/series
@@ -0,0 +1 @@
+01fix-libmcrypt-m4.patch
--- libmcrypt-2.5.7.orig/debian/patches/01fix-libmcrypt-m4.patch
+++ libmcrypt-2.5.7/debian/patches/01fix-libmcrypt-m4.patch
@@ -0,0 +1,12 @@
+diff -uNr /usr/share/debianaclocal/libmcrypt.m4 /usr/share/aclocal/libmcrypt.m4
+--- a/lib/libmcrypt.m4 2005-04-19 01:22:43.000000000 +0200
++++ b/lib/libmcrypt.m4 2005-04-19 01:28:04.000000000 +0200
+@@ -14,7 +14,7 @@
+ dnl AM_PATH_LIBMCRYPT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+ dnl Test for libmcrypt, and define LIBMCRYPT_CFLAGS and LIBMCRYPT_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_LIBMCRYPT,
++AC_DEFUN([AM_PATH_LIBMCRYPT],
+ [dnl
+ dnl Get the cflags and libraries from the libmcrypt-config script
+ dnl
Most of the changes were made to accomodate the use of .install files. I have also tried to cleanup the diff.gz for changes not related to debian/ directory. I suppose you modifies Makefile.am and ran aclocal/automake/autoconf to fix a problem with distclean in libltdl directory. I propose here some other ugly hack. I have left .la files instead of replacing by a .a file since no static library is built. I think this file is useless but in doubt, I just leave it to avoid to break some dependant package. Since cleaning the diff.gz involves remove files in both upstream and debian/ directory, this cannot be represented in a patch. I attach you the diff.gz that should be applied on top of the orig.tar.gz. Here is the output of diffstat for this diff: changelog | 146 +++++++++++++++++++++++++++++++++++++++ compat | 1 control | 45 ++++++++++++ copyright | 45 ++++++++++++ docs | 4 + libmcrypt-config.1 | 53 ++++++++++++++ libmcrypt-dev.examples | 1 libmcrypt-dev.install | 6 + libmcrypt4.install | 1 patches/01fix-libmcrypt-m4.patch | 12 +++ patches/series | 1 postinst | 7 + rules | 70 ++++++++++++++++++ 13 files changed, 392 insertions(+) Feel free to review. Thanks.
libmcrypt_2.5.7-6.diff.gz
Description: Binary data
-- BOFH excuse #421: Domain controler not responding
pgpeVVWtcAXqM.pgp
Description: PGP signature
