diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 18:06:34 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 18:06:34 -0500 |
commit | 330c0a9ff2e05b86f69f0209b3265cb003e0c98d (patch) | |
tree | 34cccc67370ca8d178c21556bc6c6a894bef1f84 /libre/iceweasel-libre/iceweasel-install-dir.patch | |
parent | 3a5380856fae97f3358dc00522656c9f1fc26187 (diff) | |
parent | dc26483bfd644bb2ad6dd25e3bb5ca9e2bbe1099 (diff) | |
download | abslibre-330c0a9ff2e05b86f69f0209b3265cb003e0c98d.tar.gz abslibre-330c0a9ff2e05b86f69f0209b3265cb003e0c98d.tar.bz2 abslibre-330c0a9ff2e05b86f69f0209b3265cb003e0c98d.zip |
Merge branch 'wip-merge'
Conflicts:
libre/dpkg/PKGBUILD
libre/iceweasel-i18n/PKGBUILD
libre/iceweasel-libre/PKGBUILD
Diffstat (limited to 'libre/iceweasel-libre/iceweasel-install-dir.patch')
-rw-r--r-- | libre/iceweasel-libre/iceweasel-install-dir.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libre/iceweasel-libre/iceweasel-install-dir.patch b/libre/iceweasel-libre/iceweasel-install-dir.patch index a44aef496..0524c8e5e 100644 --- a/libre/iceweasel-libre/iceweasel-install-dir.patch +++ b/libre/iceweasel-libre/iceweasel-install-dir.patch @@ -1,6 +1,6 @@ -diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/baseconfig.mk ---- iceweasel-16.0.1.orig/config/baseconfig.mk 2012-10-10 19:42:45.000000000 -0200 -+++ iceweasel-16.0.1/config/baseconfig.mk 2012-10-12 05:40:32.346949927 -0200 +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,10 +1,10 @@ INCLUDED_AUTOCONF_MK = 1 @@ -16,9 +16,9 @@ diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/bas DIST = $(DEPTH)/dist # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't -diff -Nur iceweasel-16.0.1.orig/js/src/config/baseconfig.mk iceweasel-16.0.1/js/src/config/baseconfig.mk ---- iceweasel-16.0.1.orig/js/src/config/baseconfig.mk 2012-10-10 19:43:05.000000000 -0200 -+++ iceweasel-16.0.1/js/src/config/baseconfig.mk 2012-10-12 05:08:23.064066227 -0200 +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 |