← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/lightning-extension/oneiric-proposed

« back to all changes in this revision

Viewing changes to debian/patches/02_fix_system_libxul_build.patch

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2011-12-29 12:14:14 UTC
  • mfrom: (1.1.12)
  • Revision ID: package-import@ubuntu.com-20111229121414-q6pyb0vyeprgpl4e
Tags: 1.1+build1-0ubuntu0.11.10.1
https://launchpad.net/bugs/909599
* New upstream stable release (CALENDAR_1_1_BUILD1) (LP: #909599)

* Refresh debian/patches/02_fix_system_libxul_build.patch
* Add debian/patches/03_maxversion_override.patch to ensure compatibility
  with Thunderbird 9 point releases
* Add the new python IDL parser to the tarball
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_fix_system_libxul_build.patch
1
 
--- a/config/config.mk
2
 
+++ b/config/config.mk
3
 
@@ -369,7 +369,7 @@ XPIDL_COMPILE       = $(CYGWIN_WRAPPER) $(LIB
4
 
 else
5
 
 XPIDL_COMPILE  = $(CYGWIN_WRAPPER) $(LIBXUL_DIST)/bin/xpidl$(BIN_SUFFIX)
6
 
 endif
 
1
Index: lightning-extension-1.1~b1+build2/config/config.mk
 
2
===================================================================
 
3
--- lightning-extension-1.1~b1+build2.orig/config/config.mk     2011-12-02 12:51:14.000000000 +0000
 
4
+++ lightning-extension-1.1~b1+build2/config/config.mk  2011-12-02 13:19:06.356400923 +0000
 
5
@@ -358,7 +358,7 @@
 
6
 CCC            = $(CXX)
 
7
 PURIFY         = purify $(PURIFYOPTIONS)
 
8
 QUANTIFY       = quantify $(QUANTIFYOPTIONS)
7
9
-XPIDL_LINK = $(PYTHON) $(SDK_BIN_DIR)/xpt.py link
8
10
+XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link
9
11