WebSVN - nettle - Path Comparison - /trunk/ Rev 46 and /trunk/ Rev 47

Ignore whitespace Rev 46 → Rev 47

/trunk/debian/libnettle-dev.doc-base
File deleted

/trunk/debian/libnettle-dev.examples
File deleted

/trunk/debian/libnettle-dev.docs
File deleted

/trunk/debian/libnettle-dev.info
File deleted

/trunk/debian/libnettle2.docs
File deleted

/trunk/debian/nettle-bin.links
0,0 → 1,0
usr/share/doc/libnettle3 usr/share/doc/nettle-bin

 /trunk/debian/control
 ,10 → 8,10
 Vcs-Browser: http://svn.kibibyte.se/nettle
 Homepage: http://www.lysator.liu.se/~nisse/nettle/
-Package: libnettle2
+Package: libnettle3
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: low level cryptographic library
+Description: low level cryptographic library (symmetric and one-way cryptos)
  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++,
  Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel
 ,10 → 24,31
  cryptographic algorithms for the application to use in any environment and
  in any way it needs.
-Package: libnettle-dev
+Package: libhogweed1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: low level cryptographic library (public-key cryptos)
+ 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++,
+ Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel
+ space.
+ .
+ It tries to solve a problem of providing a common set of cryptographic
+ algorithms for higher-level applications by implementing a
+ context-independent set of cryptographic algorithms. In that light, Nettle
+ doesn't do any memory allocation or I/O, it simply provides the
+ cryptographic algorithms for the application to use in any environment and
+ in any way it needs.
+ .
+  Homepage: http://www.lysator.liu.se/~nisse/nettle/
+Package: nettle-dev
 Section: libdevel
 Architecture: any
-Depends: libnettle2 (= ${binary:Version}), libgmp3-dev
+Depends: libnettle3 (= ${binary:Version}), libhogweed1 (= ${binary:Version}), libgmp3-dev
+Replaces: libnettle-dev (<< 1.16~cvs20070603)
+Conflicts: libnettle-dev (<< 1.16~cvs20070603)
 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++,
 ,11 → 64,26
  .
  This package contains the development files (C headers and static libraries)
+Package: libnettle-dev
+Section: libdevel
+Architecture: all
+Depends: nettle-dev
+Description: dummy package for transition to nettle-dev
+ 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++,
+ Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel
+ space.
+ .
+ Since nettle now is split in two libraries, libnettle and libhogweed,
+ the -dev package is called nettle-dev. This dummy package simply
+ depends on that and can safely be uninstalled.
 Package: nettle-bin
 Section: misc
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libnettle1, lsh-utils (<< 2.0.4-dfsg-1)
+Suggests: lsh-utils-doc | lsh-doc
 Description: low level cryptographic library (binary tools)
  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/nettle-dev.doc-base
 ,0 → 1,20
+Document: libnettle-dev
+Title: Debian Nettle Manual
+Author: Niels Möller
+Abstract: This document describes the nettle low-level
+ cryptographic library. You can use the library directly
+ from your C programs, or (recommended) write or use an
+ object-oriented wrapper for your favorite language or
+ application.
+Section: Apps/Programming
+Format: HTML
+Files: /usr/share/doc/nettle-dev/nettle.html
+Index: /usr/share/doc/nettle-dev/nettle.html
+Format: PDF
+Files: /usr/share/doc/nettle-dev/nettle.pdf
+Format: Info
+Files: /usr/share/info/nettle.info.gz
+Index: /usr/share/info/nettle.info.gz

/trunk/debian/nettle-dev.examples
0,0 → 1,2
sha-example.c
examples/*.[ch]

/trunk/debian/patches/10_cleanup.dpatch
File deleted

/trunk/debian/patches/99_autotools_files.dpatch
File deleted

 /trunk/debian/patches/01_config.dpatch
 ,0 → 1,28
+#! /bin/sh -e
+## config.dpatch
+## Ralf Treinen <treinen@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: replace all config.{guess,sub} by the vesion installed in
+## DP: /usr/share/misc
+dpatch_patch ()
+{
+        find . -name config.guess -o -name config.sub \
+                | tar cf debian/patched/config.guess+sub.tar -T -
+        find . -name config.guess \
+                -exec ln -sf /usr/share/misc/config.guess '{}' \;
+        find . -name config.sub \
+                -exec ln -sf /usr/share/misc/config.sub '{}' \;
+}
+dpatch_unpatch ()
+{
+        tar xf debian/patched/config.guess+sub.tar
+}
+DPATCH_LIB_NO_DEFAULT=1
+. /usr/share/dpatch/dpatch.lib.sh
+# arch-tag: 8a610a57-687b-4395-8ff2-79265c0a4eb3

 /trunk/debian/patches/30_sparc_aes_include.dpatch
 ,0 → 1,57
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_sparc_aes_include.dpatch by Niels Möller <nisse@lysator.liu.se> and Magnus Holmgren <magnus@kibibyte.se>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Correct path to aes.m4 for sparc.
+@DPATCH@
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- nettle/sparc32/aes-decrypt-internal.asm     2007/04/05 14:20:36     1.1
++++ nettle/sparc32/aes-decrypt-internal.asm     2007/09/08 08:48:41     1.2
+@@ -18,7 +18,7 @@
+ C the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ C MA 02111-1307, USA.
+-include_src(<sparc/aes.m4>)
++include_src(<sparc32/aes.m4>)
+ C      Arguments
+ define(<CTX>,  <%i0>)
+diff -u -r1.1 -r1.2
+--- nettle/sparc32/aes-encrypt-internal.asm     2007/04/05 14:20:36     1.1
++++ nettle/sparc32/aes-encrypt-internal.asm     2007/09/08 08:48:41     1.2
+@@ -18,7 +18,7 @@
+ C the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ C MA 02111-1307, USA.
+-include_src(<sparc/aes.m4>)
++include_src(<sparc32/aes.m4>)
+ C      Arguments
+ define(<CTX>,  <%i0>)
+diff -u -r1.1 -r1.2
+--- nettle/sparc64/aes-decrypt-internal.asm     2007/04/05 14:20:37     1.1
++++ nettle/sparc64/aes-decrypt-internal.asm     2007/09/08 08:48:41     1.2
+@@ -24,7 +24,7 @@
+ C Use the same AES macros as on sparc32.
+-include_src(sparc/aes.m4)
++include_src(sparc32/aes.m4)
+ C      Arguments
+ define(<CTX>,  <%i0>)
+diff -u -r1.1 -r1.2
+--- nettle/sparc64/aes-encrypt-internal.asm     2007/04/05 14:20:37     1.1
++++ nettle/sparc64/aes-encrypt-internal.asm     2007/09/08 08:48:41     1.2
+@@ -24,7 +24,7 @@
+ C Use the same AES macros as on sparc32.
+-include_src(sparc/aes.m4)
++include_src(sparc32/aes.m4)
+ C      Arguments
+ define(<CTX>,  <%i0>)

/trunk/debian/patches/00list
1,3 → 1,3
10_cleanup
01_config
20_link_with_gmp
99_autotools_files
30_sparc_aes_include

 /trunk/debian/patches/20_link_with_gmp.dpatch
 ,18 → 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
+## DP: Link libhogweed.so.1 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@
+@@ -39,7 +39,7 @@
+ LIBHOGWEED_SONAME = @LIBHOGWEED_SONAME@
+ LIBHOGWEED_FILE = @LIBHOGWEED_FILE@
+ LIBHOGWEED_FORLINK = @LIBHOGWEED_FORLINK@
+-LIBHOGWEED_LIBS = @LIBHOGWEED_LIBS@
++LIBHOGWEED_LIBS = @LIBHOGWEED_LIBS@ -lgmp -L. -lnettle
+ LIBHOGWEED_LINK = @LIBHOGWEED_LINK@
+ AR = ar

 /trunk/debian/changelog
 ,3 → 1,25
+nettle (1.16~cvs20070603-2) experimental; urgency=low
+  * 30_sparc_aes_include.dpatch: Patch from upstream CVS, fixes FTBFS on
+    sparc (Closes: #441265).
+  * debian/rules: Check for Makefile instead of ignoring all `make
+    distclean' errors.
+ -- Magnus Holmgren <magnus@kibibyte.se>  Sat, 08 Sep 2007 19:58:29 +0200
+nettle (1.16~cvs20070603-1) experimental; urgency=low
+  * Upstream CVS snapshot splitting off public-key algorithms as
+    libhogweed1.
+    - Drop 10_cleanup.dpatch; incorporated upstream.
+    - Rename libnettle-dev as nettle-dev.
+  * No longer install sexp-conv as an alternative; conflict with lsh-utils
+    (<< 2.0.3-2, which is anticipated to stop shipping an identical
+    sexp-conv and depend on nettle-bin instead).
+  * Link with --as-needed to avoid unnecessary NEEDED tags.
+ -- Magnus Holmgren <magnus@kibibyte.se>  Mon, 11 Jun 2007 17:36:08 +0200
 nettle (1.15-6) unstable; urgency=low
   * No longer install sexp-conv as an alternative; conflict with lsh-utils

 /trunk/debian/rules
 ,6 → 14,7
 CFLAGS = -Wall -g
+LDFLAGS = -Wl,--as-needed
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
         CFLAGS += -O0
 ,13 → 28,14
 config.status: ${DPATCH_STAMPFN} configure
         dh_testdir
         # Add here commands to configure the package.
-        CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
-                                       --build=$(DEB_BUILD_GNU_TYPE) \
-                                                   --prefix=/usr \
-                                       --mandir=\$${prefix}/share/man \
-                                       --infodir=\$${prefix}/share/info \
-                                       --enable-shared \
-                                       --disable-dependency-tracking
+        ./configure --host=$(DEB_HOST_GNU_TYPE) \
+                    --build=$(DEB_BUILD_GNU_TYPE) \
+                    --prefix=/usr \
+                    --mandir=\$${prefix}/share/man \
+                    --infodir=\$${prefix}/share/info \
+                    --enable-shared \
+                    --disable-dependency-tracking \
+                    CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 build: build-stamp
 ,28 → 72,38
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
+        dh_testdir
+        dh_testroot
+        dh_installchangelogs -i ChangeLog
+        dh_installdocs -i
+        dh_compress -i
+        dh_fixperms -i
+        dh_installdeb -i
+        dh_shlibdeps -i
+        dh_gencontrol -i
+        dh_md5sums -i
+        dh_builddeb -i
 # Build architecture-dependent files here.
 binary-arch: build install
         dh_testdir
         dh_testroot
-        dh_install --sourcedir=debian/tmp
-        dh_installchangelogs ChangeLog
-        dh_installdocs
-        dh_installexamples
-        dh_installinfo
-        dh_installman
-        dh_link
-        dh_strip
+        dh_install -a --sourcedir=debian/tmp
+        dh_link -a
+        dh_installchangelogs -a ChangeLog
+        dh_installdocs -a
+        dh_installexamples -a
+        dh_installinfo -a
+        dh_installman -a
+        dh_strip -a
         dh_compress -X.pdf
-        dh_fixperms
-        dh_makeshlibs -V 'libnettle2 (>= 1.15)'
-        dh_installdeb
-        dh_shlibdeps
-        dh_gencontrol
-        dh_md5sums
-        dh_builddeb
+        dh_fixperms -a
+        dh_makeshlibs #-V 'libnettle2 (>= 1.15)'
+        dh_installdeb -a
+        dh_shlibdeps -a
+        dh_gencontrol -a
+        dh_md5sums -a
+        dh_builddeb -a
 binary: binary-indep binary-arch
 .PHONY: build clean clean-patched binary-indep binary-arch binary install

Subversion Repositories nettle

Compare Revisions

Ignore whitespace Rev 46 → Rev 47

/trunk/debian/libnettle3.docs
0,0 → 1,2
NEWS
README

/trunk/debian/nettle-dev.docs
0,0 → 1,6
README
NEWS
descore.README
TODO
nettle.html
nettle.pdf

/trunk/debian/nettle-dev.install
0,0 → 1,5
usr/include/*
usr/lib/lib*.a
usr/lib/lib*.so
usr/lib/pkgconfig/*
usr/lib/*.la