diff options
| author | P. J. McDermott <pj@pehjota.net> | 2018-05-16 00:25:26 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pj@pehjota.net> | 2018-05-16 17:07:51 (EDT) |
| commit | 247f0a946617c3697178d91c4716fa6e01a7c188 (patch) | |
| tree | de90d4ec475440e93b48af5a6a61ab9dd68fab27 | |
| parent | 63b57d30e3a15904573854480b1ed5d987eacede (diff) | |
| download | icecat-247f0a946617c3697178d91c4716fa6e01a7c188.zip icecat-247f0a946617c3697178d91c4716fa6e01a7c188.tar.gz icecat-247f0a946617c3697178d91c4716fa6e01a7c188.tar.bz2 | |
gnuzilla/build: Undo *FLAGS hacks, use "+" in package version
| -rwxr-xr-x | gnuzilla/build | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/gnuzilla/build b/gnuzilla/build index 45e8ae1..349abf0 100755 --- a/gnuzilla/build +++ b/gnuzilla/build @@ -50,20 +50,8 @@ sed -i '/^\thardening-wrapper,$/d;' \ "icecat-${upstream_version}/debian/control" \ "icecat-${upstream_version}/debian/control.in" -# Instead, let CDBS set CFLAGS, CXXFLAGS, and LDFLAGS to output of -# dpkg-buildflags. -#sed -i '/^CFLAGS[ \t]*:=.*$/d; /^CXXFLAGS[ \t]*:=.*$/d; -# /^LDFLAGS[ \t]*:=.*$/d;' \ -# "icecat-${upstream_version}/debian/build/rules.mk" -sed -i ' - s/^\(CFLAGS\)\([ \t]*:=\).*$/\1\2 $(shell dpkg-buildflags --get \1)/; - s/^\(CXXFLAGS\)\([ \t]*:=\).*$/\1\2 $(shell dpkg-buildflags --get \1)/; - s/^\(LDFLAGS\)\([ \t]*:=\).*$/\1\2 $(shell dpkg-buildflags --get \1)/; - ' \ - "icecat-${upstream_version}/debian/build/rules.mk" - # "3.0 (native)" source packages may not have a revision. -sed -i '1s/-gnu/~gnu/;' "icecat-${upstream_version}/debian/changelog" +sed -i '1s/-gnu/+gnu/;' "icecat-${upstream_version}/debian/changelog" # Since 2017-11-11, there are two search plugins matching "google*.xml": # google.xml and google-2018.xml. debian/install-distribution-searchplugins.py |