Subversion Repositories nettle

Compare Revisions

Ignore whitespace Rev 2 → Rev 3

/trunk/Makefile.in
File deleted
/trunk/debian/control
2,7 → 2,7
Section: libs
Priority: optional
Maintainer: Magnus Holmgren <magnus@kibibyte.se>
Build-Depends: debhelper (>= 4.0.0), libgmp3-dev, m4, autotools-dev
Build-Depends: debhelper (>= 4.0.0), libgmp3-dev, m4, autotools-dev, dpatch
Standards-Version: 3.7.2
 
Package: libnettle2
27,7 → 27,7
Package: libnettle-dev
Section: libdevel
Architecture: any
Depends: libnettle2 (= ${Source-Version}), libgmp3-dev
Depends: libnettle2 (= ${binary:Version}), libgmp3-dev
Description: low level cryptographic library (development files)
Nettle is a cryptographic library that is designed to fit easily in more or
less any context: In crypto toolkits for object-oriented languages (C++,
/trunk/debian/changelog
1,3 → 1,11
nettle (1.15-2) unstable; urgency=high
 
* Fix serious regression: The -lgmp added in 1.8-1 fell off in 1.15-1.
* Use dpatch to handle patches.
* Make package binNMUable.
 
-- Magnus Holmgren <magnus@kibibyte.se> Tue, 15 May 2007 12:35:41 +0200
 
nettle (1.15-1) unstable; urgency=low
 
* New maintainer (Closes: #411677).
/trunk/debian/patches/10_cleanup.dpatch
0,0 → 1,22
#! /bin/sh /usr/share/dpatch/dpatch-run
## 10_cleanup.dpatch by <magnus@proffe.kibibyte.se>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Clean up properly
 
@DPATCH@
 
--- nettle-1.15.orig/Makefile.in
+++ nettle-1.15/Makefile.in
@@ -359,9 +359,10 @@
clean-here:
-rm -f $(TARGETS) *.$(OBJEXT) *.p$(OBJEXT) *.s
+ -rm -rf .lib
distclean-here: clean-here
- -rm -f config.h stamp-h config.log config.status \
+ -rm -f config.h stamp-h config.log config.status machine.m4 \
config.make config.m4 Makefile nettle-stdint.h *.asm *.d
maintainer-clean-here:
/trunk/debian/patches/00list
0,0 → 1,3
10_cleanup
20_link_with_gmp
99_autotools_files
/trunk/debian/patches/20_link_with_gmp.dpatch
0,0 → 1,18
#! /bin/sh /usr/share/dpatch/dpatch-run
## 20_link_with_gmp.dpatch by <magnus@kibibyte.se>
##
## DP: Link libnettle.so.2 with -lgmp
 
@DPATCH@
diff -urNad nettle-1.15~/config.make.in nettle-1.15/config.make.in
--- nettle-1.15~/config.make.in 2006-11-28 16:30:24.000000000 +0100
+++ nettle-1.15/config.make.in 2007-05-15 12:53:54.000000000 +0200
@@ -28,7 +28,7 @@
SHLIBFILE = @SHLIBFILE@
SHLIBFORLINK = @SHLIBFORLINK@
SHLIBINSTALL = @SHLIBINSTALL@
-SHLIBLIBS = @SHLIBLIBS@
+SHLIBLIBS = @SHLIBLIBS@ -lgmp
SHLIBLINK = @SHLIBLINK@
SHLIBMAJOR = @SHLIBMAJOR@
SHLIBMINOR = @SHLIBMINOR@
/trunk/debian/patches/99_autotools_files.dpatch
0,0 → 1,28
#!/bin/sh
## 01_autotools_files.dpatch by Magnus Holmgren <magnus@kibibyte.se>
##
## DP: Copy in updated config.sub and config.guess from autotools-dev
 
set -e
 
dpatch_patch() {
for f in config.sub config.guess; do
if ! test -e $f.orig; then
mv $f $f.orig
cp --remove-destination /usr/share/misc/$f .
fi
done
}
 
dpatch_unpatch() {
for f in config.sub config.guess; do
if test -e $f.orig; then
mv -f $f.orig $f
fi
done
}
 
 
DPATCH_LIB_NO_DEFAULT=1
 
. /usr/share/dpatch/dpatch.lib.sh
/trunk/debian/rules
5,8 → 5,8
 
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
include /usr/share/dpatch/dpatch.make
 
 
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
33,14 → 33,8
#major=`ls src/.libs/lib*.so.* | \
# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
config.status: configure
config.status: patch configure
dh_testdir
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
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
60,7 → 54,8
 
touch build-stamp
 
clean:
clean: clean-patched unpatch
clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp
67,14 → 62,6
 
# Add here commands to clean up after the build process.
-$(MAKE) distclean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
rm -f config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
rm -f config.guess
endif
-rm machine.m4
-rm -r .lib
 
dh_clean