~andersk/ubuntu/oneiric/openssl/spurious-reboot

« back to all changes in this revision

Viewing changes to debian/patches/man-section.patch

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-05-01 23:51:53 UTC
  • mfrom: (11.1.20 sid)
  • Revision ID: james.westby@ubuntu.com-20110501235153-bjcxitndquaezb68
Tags: 1.0.0d-2ubuntu1
* Resynchronise with Debian (LP: #675566).  Remaining changes:
  - debian/libssl1.0.0.postinst:
    + Display a system restart required notification bubble on libssl1.0.0
      upgrade.
    + Use a different priority for libssl1.0.0/restart-services depending
      on whether a desktop, or server dist-upgrade is being performed.
  - debian/{libssl1.0.0-udeb.dirs, control, rules}: Create
    libssl1.0.0-udeb, for the benefit of wget-udeb (no wget-udeb package
    in Debian).
  - debian/{libcrypto1.0.0-udeb.dirs, libssl1.0.0.dirs, libssl1.0.0.files,
    rules}: Move runtime libraries to /lib, for the benefit of
    wpasupplicant.
  - debian/patches/aesni.patch: Backport Intel AES-NI support, now from
    http://rt.openssl.org/Ticket/Display.html?id=2065 rather than the
    0.9.8 variant.
  - debian/patches/Bsymbolic-functions.patch: Link using
    -Bsymbolic-functions.
  - debian/patches/perlpath-quilt.patch: Don't change perl #! paths under
    .pc.
  - debian/rules:
    + Don't run 'make test' when cross-building.
    + Use host compiler when cross-building.  Patch from Neil Williams.
    + Don't build for processors no longer supported: i486, i586 (on
      i386), v8 (on sparc).
    + Fix Makefile to properly clean up libs/ dirs in clean target.
    + Replace duplicate files in the doc directory with symlinks.
* Update architectures affected by Bsymbolic-functions.patch.
* Drop debian/patches/no-sslv2.patch; Debian now adds the 'no-ssl2'
  configure option, which compiles out SSLv2 support entirely, so this is
  no longer needed.
* Drop openssl-doc in favour of the libssl-doc package introduced by
  Debian.  Add Conflicts/Replaces until the next LTS release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Index: openssl-0.9.8k/Makefile.org
 
1
Index: openssl-1.0.0c/Makefile.org
2
2
===================================================================
3
 
--- openssl-0.9.8k.orig/Makefile.org    2009-07-19 11:34:06.000000000 +0200
4
 
+++ openssl-0.9.8k/Makefile.org 2009-07-19 11:37:21.000000000 +0200
5
 
@@ -155,7 +155,8 @@
 
3
--- openssl-1.0.0c.orig/Makefile.org    2010-12-12 16:11:37.000000000 +0100
 
4
+++ openssl-1.0.0c/Makefile.org 2010-12-12 16:13:28.000000000 +0100
 
5
@@ -134,7 +134,8 @@
6
6
 MANDIR=/usr/share/man
7
7
 MAN1=1
8
8
 MAN3=3
9
9
-MANSUFFIX=
10
10
+MANSUFFIX=ssl
11
11
+MANSECTION=SSL
 
12
 HTMLSUFFIX=html
 
13
 HTMLDIR=$(OPENSSLDIR)/html
12
14
 SHELL=/bin/sh
13
 
 
14
 
 TOP=    .
15
 
@@ -694,7 +695,7 @@
 
15
@@ -606,7 +607,7 @@
16
16
                echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
17
17
                (cd `$(PERL) util/dirname.pl $$i`; \
18
18
                sh -c "$$pod2man \
21
21
                        --release=$(VERSION) `basename $$i`") \
22
22
                        >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
23
23
                $(PERL) util/extract-names.pl < $$i | \
24
 
@@ -711,7 +712,7 @@
 
24
@@ -623,7 +624,7 @@
25
25
                echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
26
26
                (cd `$(PERL) util/dirname.pl $$i`; \
27
27
                sh -c "$$pod2man \