← Back to branch summary

~jbicha/ubuntu/oneiric/gjs/1.29.18

« back to all changes in this revision

Viewing changes to debian/patches/03_libmozjs_private.patch

  • Committer: Bazaar Package Importer
  • Author(s): Micah Gersten
  • Date: 2010-08-12 00:22:06 UTC
  • mfrom: (1.3.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100812002206-zc5bfuqte3of6j2t
Tags: 0.7.1-1ubuntu1
https://launchpad.net/bugs/616598
* Merge from debian unstable. (LP: #616598)  Remaining changes:
  + debian/control: 
    - Add Ubuntu VCS info
    - Drop libmozjs Build-Depends; Ubuntu does not have this library.
    - Drop chrpath Build-Depends; we need to keep the RPATH because libmozjs
      is not a system library in Ubuntu.
    - Add xulrunner{,-dev}:Depends to binary packages
    - Bump xulrunner-dev build depends to 1.9.2
    - Build-depend on unversioned automake
  + debian/rules:
    - Generate strict dependencies on xulrunner.
    - Apply patch to fix libtool's handling of --as-needed
    - Add -Wl,--as-needed to LDFLAGS
  + debian/libgjs0a.lintian-overrides:
    - Override the entire rpath tag, not just for the specific libraries.
      The full lintian warning will change with each xulrunner version.
  + debian/ltmain-add-as-needed.patch
    - Fix libtool's ordering of --as-needed argument.
  + add debian/patches/01_disable_memcheck.patch
    - Don't make leaks fatal, see b.g.o #616193
  + add debian/patches/02_gobject_introspection.patch:
    - Use gobject-introspection 0.9
* Add debian/patches/03_libmozjs_private.patch (originally in 0.5-1ubuntu1)
  - Move @JS_PACKAGE@ libmozjs to Requires.private to prevent applications
    unnecessarily linking with libmozjs

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03_libmozjs_private.patch
 
1
Description: Upstream changes introduced in version 0.5-1ubuntu1
 
2
 This patch has been created by dpkg-source during the package build.
 
3
 Here's the last changelog entry, hopefully it gives details on why
 
4
 those changes were made:
 
5
 .
 
6
    + gjs-1.0.pc.in
 
7
      - Move @JS_PACKAGE@ libmozjs to Requires.private to prevent applications
 
8
        unnecessarily linking with libmozjs
 
9
 .
 
10
 The person named in the Author field signed this changelog entry.
 
11
Author: Christopher James Halse Rogers <raof@ubuntu.com>
 
12
Bug-Ubuntu: 
 
13
 
 
14
---
 
15
The information above should follow the Patch Tagging Guidelines, please
 
16
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
 
17
are templates for supplementary fields that you might want to add:
 
18
 
 
19
Origin: Ubuntu, <url of original patch>
 
20
Bug: <url in upstream bugtracker>
 
21
Bug-Debian: http://bugs.debian.org/<bugnumber>
 
22
Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=607627
 
23
Reviewed-By: <name and email of someone who approved the patch>
 
24
Last-Update: 
 
25
 
 
26
--- gjs-0.7.1.orig/gjs-1.0.pc.in
 
27
+++ gjs-0.7.1/gjs-1.0.pc.in
 
28
@@ -12,7 +12,8 @@ jsnativedir=@gjsnativedir@
 
29
 mozjslibdir=@FIREFOX_JS_LIBDIR@
 
30
 
 
31
 Cflags: -I${includedir}/gjs-1.0 @JS_EXTRA_CFLAGS@
 
32
-Requires: gobject-introspection-1.0 @JS_PACKAGE@
 
33
+Requires: gobject-introspection-1.0
 
34
+Requires.private: @JS_PACKAGE@
 
35
 Libs: -L${libdir} -lgjs
 
36
 
 
37
 Name: gjs-1.0