← Back to branch summary

~ubuntu-branches/ubuntu/maverick/evolution-data-server/maverick-proposed

« back to all changes in this revision

Viewing changes to libdb/perl/BerkeleyDB/patches/5.004

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-05-17 17:02:06 UTC
  • mfrom: (1.1.79 upstream) (1.6.12 experimental)
  • Revision ID: james.westby@ubuntu.com-20100517170206-4ufr52vwrhh26yh0
Tags: 2.30.1-1ubuntu1
https://launchpad.net/bugs/42199
https://launchpad.net/bugs/229669
https://launchpad.net/bugs/173703
https://launchpad.net/bugs/360344
https://launchpad.net/bugs/508494
* Merge from debian experimental. Remaining change:
  (LP: #42199, #229669, #173703, #360344, #508494)
  + debian/control:
    - add Vcs-Bzr tag
    - don't use libgnome
    - Use Breaks instead of Conflicts against evolution 2.25 and earlier.
  + debian/evolution-data-server.install,
    debian/patches/45_libcamel_providers_version.patch:
    - use the upstream versioning, not a Debian-specific one 
  + debian/libedata-book1.2-dev.install, debian/libebackend-1.2-dev.install,
    debian/libcamel1.2-dev.install, debian/libedataserverui1.2-dev.install:
    - install html documentation
  + debian/rules:
    - don't build documentation it's shipped with the tarball

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdb/perl/BerkeleyDB/patches/5.004
1
 
diff perl5.004.orig/Configure perl5.004/Configure
2
 
190a191
3
 
> perllibs=''
4
 
9904a9906,9913
5
 
> : Remove libraries needed only for extensions
6
 
> : The appropriate ext/Foo/Makefile.PL will add them back in, if
7
 
> : necessary.
8
 
> set X `echo " $libs " | 
9
 
>   sed -e 's@ -lndbm @ @' -e 's@ -lgdbm @ @' -e 's@ -ldbm @ @' -e 's@ -ldb @ @'` 
10
 
> shift
11
 
> perllibs="$*"
12
 
> 
13
 
10372a10382
14
 
> perllibs='$perllibs'
15
 
diff perl5.004.orig/Makefile.SH perl5.004/Makefile.SH
16
 
122c122
17
 
< libs = $libs $cryptlib
18
 
---
19
 
> libs = $perllibs $cryptlib
20
 
Common subdirectories: perl5.004.orig/Porting and perl5.004/Porting
21
 
Common subdirectories: perl5.004.orig/cygwin32 and perl5.004/cygwin32
22
 
Common subdirectories: perl5.004.orig/eg and perl5.004/eg
23
 
Common subdirectories: perl5.004.orig/emacs and perl5.004/emacs
24
 
Common subdirectories: perl5.004.orig/ext and perl5.004/ext
25
 
Common subdirectories: perl5.004.orig/h2pl and perl5.004/h2pl
26
 
Common subdirectories: perl5.004.orig/hints and perl5.004/hints
27
 
Common subdirectories: perl5.004.orig/lib and perl5.004/lib
28
 
diff perl5.004.orig/myconfig perl5.004/myconfig
29
 
38c38
30
 
<     libs=$libs
31
 
---
32
 
>     libs=$perllibs
33
 
Common subdirectories: perl5.004.orig/os2 and perl5.004/os2
34
 
diff perl5.004.orig/patchlevel.h perl5.004/patchlevel.h
35
 
40a41
36
 
>       ,"NODB-1.0 - remove -ldb from core perl binary."
37
 
Common subdirectories: perl5.004.orig/plan9 and perl5.004/plan9
38
 
Common subdirectories: perl5.004.orig/pod and perl5.004/pod
39
 
Common subdirectories: perl5.004.orig/qnx and perl5.004/qnx
40
 
Common subdirectories: perl5.004.orig/t and perl5.004/t
41
 
Common subdirectories: perl5.004.orig/utils and perl5.004/utils
42
 
Common subdirectories: perl5.004.orig/vms and perl5.004/vms
43
 
Common subdirectories: perl5.004.orig/win32 and perl5.004/win32
44
 
Common subdirectories: perl5.004.orig/x2p and perl5.004/x2p