~ubuntu-branches/ubuntu/karmic/nss/karmic-updates

« back to all changes in this revision

Viewing changes to debian/patches/38_mips64_build.patch

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack, Fabien Tassin, Alexander Sack
  • Date: 2009-01-11 15:06:17 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090111150617-iz4lw05qgy2odorl
Tags: 3.12.2~rc1-0ubuntu1
* New upstream snapshot: 3.12.2 RC1

[ Fabien Tassin <fta@ubuntu.com> ]
* Remove patch applied upstream:
  - drop debian/patches/80_security_tools.patch
  - update debian/patches/series
* Update diverged patches:
  - update debian/patches/38_kbsd.patch
  - update debian/patches/38_mips64_build.patch
* Add new symbols to symbols file
  - update debian/libnss3-1d.symbols

[ Alexander Sack <asac@ubuntu.com> ]
* disable soname patch to become binary compatible with upstream
  - update debian/patches/series
* flip links: libnss3.so <- libnss3.so.1d (before: libnss3.so ->
  libnss3.so.1d); same link flipping was done for all other previously
  soname patched libs: libnssutil3.so, libsmime3.so.1d, libssl3.so.1d
  - update debian/libnss3-1d.links
  - update debian/libnss3-1d.symbols
* properly transition links in preinst and postrm; also cover abort-
  cases in the other maintainer scripts
  - add debian/libnss3-1d.postinst
  - add debian/libnss3-1d.postrm
  - add debian/libnss3-1d.preinst
  - add debian/libnss3-1d.prerm
* remove hack from debian/rules that debian uses to recreate
  libsoftokn3.so with a versioned SONAME
  - update debian/rules
* install the unversioned .so binaries
  - update debian/rules
* only install the 4 main libraries into /usr/lib; all the others
  go to pkglibdir
  - update debian/rules
* higher bar for libnspr4 Build-Depend to >= 4.7.3~, which is
  the version where the soname droppage is going to happen
  - update debian/control
* explitily pass libraries to be used for dpkg-gensymbols run of
  dh_makeshlibs
  - update debian/rules
* fix lintian complain about no-shlibs-control-file
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
 mozilla/security/coreconf/Linux.mk |    4 ++++
3
3
 1 file changed, 4 insertions(+)
4
4
 
5
 
Index: nss-trunk-3.12.0~alpha1b/mozilla/security/coreconf/Linux.mk
 
5
Index: nss-3.12.1~rc1/mozilla/security/coreconf/Linux.mk
6
6
===================================================================
7
 
--- nss-trunk-3.12.0~alpha1b.orig/mozilla/security/coreconf/Linux.mk    2007-08-17 18:29:04.000000000 +0000
8
 
+++ nss-trunk-3.12.0~alpha1b/mozilla/security/coreconf/Linux.mk 2007-08-17 18:29:33.000000000 +0000
 
7
--- nss-3.12.1~rc1.orig/mozilla/security/coreconf/Linux.mk
 
8
+++ nss-3.12.1~rc1/mozilla/security/coreconf/Linux.mk
9
9
@@ -85,27 +85,31 @@
10
10
        CPU_ARCH        = arm
11
11
 else
16
16
        CPU_ARCH        = hppa
17
17
 else
18
18
+ifeq ($(OS_TEST),mips64)
19
 
+       CPU_ARCH        = mips
 
19
+       CPU_ARCH        = mips
20
20
+else
21
21
 ifeq (,$(filter-out i686 i586 i486 i386,$(OS_TEST)))
22
22
        OS_REL_CFLAGS   += -Di386