diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 17:04:47 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 17:06:37 -0500 |
| commit | 7ffb3a2380d08711d92b9d1735117a07839b4844 (patch) | |
| tree | a3e522964a38a8c2fed7ad7b9bcc22ffd739f30a /libre/icecat/firefox-install-dir.patch | |
| parent | c3f41f14797cb2f0340a60237f5daeb3a1fcdc05 (diff) | |
libre/icecat: sync files with versions from firefox and upstream
* firefox-install-dir.patch: use version from firefox package
* icecat.desktop: merge with version from firefox package
* mozconfig: merge with versions from icecat upstream and firefox package
Diffstat (limited to 'libre/icecat/firefox-install-dir.patch')
| -rw-r--r-- | libre/icecat/firefox-install-dir.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libre/icecat/firefox-install-dir.patch b/libre/icecat/firefox-install-dir.patch index 7a72b9c9d..9c115f0eb 100644 --- a/libre/icecat/firefox-install-dir.patch +++ b/libre/icecat/firefox-install-dir.patch @@ -1,6 +1,6 @@ -diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk ---- a/config/baseconfig.mk -+++ b/config/baseconfig.mk +diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk +--- mozilla-release.orig/config/baseconfig.mk 2012-10-09 07:34:41.762092280 +0000 ++++ mozilla-release/config/baseconfig.mk 2012-10-09 07:40:53.052771576 +0000 @@ -1,9 +1,9 @@ INCLUDED_AUTOCONF_MK = 1 @@ -15,9 +15,9 @@ diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk DIST = $(DEPTH)/dist # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't -diff -Nur a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk ---- a/js/src/config/baseconfig.mk -+++ b/js/src/config/baseconfig.mk +diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk +--- mozilla-release.orig/js/src/config/baseconfig.mk 2012-10-09 07:34:58.411973276 +0000 ++++ mozilla-release/js/src/config/baseconfig.mk 2012-10-09 07:39:55.143186168 +0000 @@ -1,7 +1,7 @@ INCLUDED_AUTOCONF_MK = 1 |