← Back to branch summary

~ubuntu-branches/ubuntu/trusty/enigmail/trusty-security

« back to all changes in this revision

Viewing changes to debian/patches/port_to_latest_thunderbird.diff

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2011-08-12 12:25:06 UTC
  • mfrom: (0.12.4 upstream)
  • Revision ID: package-import@ubuntu.com-20110812122506-zko6c7zfexvyg71q
Tags: 2:1.2.1-0ubuntu1
* New upstream release
* Drop fix_install_rdf_xml_errors.diff - fixed upstream
* Refresh port_to_latest_thunderbird.diff
* Add a proper get-orig-source target which pulls the build system from
  lp:~mozillateam/mozilla-build-system/beta, now that we don't have the old
  build-system.tar.gz from xulrunner

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/port_to_latest_thunderbird.diff
3
3
@@ -16,7 +16,7 @@
4
4
       <Description>
5
5
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
6
 
         <em:minVersion>5.0b1</em:minVersion>
7
 
-        <em:maxVersion>5.0.*</em:maxVersion>
8
 
+        <em:maxVersion>6.0.*</em:maxVersion>
 
6
         <em:minVersion>5.0</em:minVersion>
 
7
-        <em:maxVersion>5.*</em:maxVersion>
 
8
+        <em:maxVersion>6.*</em:maxVersion>
9
9
       </Description>
10
10
     </em:targetApplication>
11
11
     <em:targetApplication>
12
 
--- a/config/config.mk
13
 
+++ b/config/config.mk
14
 
@@ -442,11 +442,10 @@ PURIFY = purify $(PURIFYOPTIONS)
15
 
 QUANTIFY = quantify $(QUANTIFYOPTIONS)
16
 
 ifdef CROSS_COMPILE
17
 
 XPIDL_COMPILE = $(LIBXUL_DIST)/host/bin/host_xpidl$(HOST_BIN_SUFFIX)
18
 
-XPIDL_LINK = $(LIBXUL_DIST)/host/bin/host_xpt_link$(HOST_BIN_SUFFIX)
19
 
 else
20
 
 XPIDL_COMPILE = $(LIBXUL_DIST)/bin/xpidl$(BIN_SUFFIX)
21
 
-XPIDL_LINK = $(LIBXUL_DIST)/bin/xpt_link$(BIN_SUFFIX)
22
 
 endif
23
 
+XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link
24
 
 
25
 
 # Java macros
26
 
 JAVA_GEN_DIR  = _javagen
27
 
--- a/config/rules.mk
28
 
+++ b/config/rules.mk
29
 
@@ -1570,7 +1570,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_CO
30
 
 
31
 
 # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
32
 
 ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
33
 
-$(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS)) $(GLOBAL_DEPS) $(XPIDL_LINK)
34
 
+$(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS)) $(GLOBAL_DEPS)
35
 
        $(XPIDL_LINK) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS))
36
 
 endif # XPIDL_MODULE.xpt != XPIDLSRCS
37