With this patch, the code fits better on a narrow screen. Here is a suitable ChangeLog entry:
2010-02-17 Thien-Thi Nguyen <[email protected]> Improve readability of remove.nonfree. * remove.nonfree (bbu): New var. Throughout, use it to mean "browser/branding/unofficial". Also, add backslash-newlines to fill the perl command. Index: remove.nonfree =================================================================== --- remove.nonfree (revisione 99) +++ remove.nonfree (copia locale) @@ -188,32 +188,38 @@ patch -p0 < locales-strings.patch patch -p0 < nullplugin.patch -rm -v browser/branding/unofficial/watermark.png -rm -v browser/branding/unofficial/Watermrk.bmp -rm -v browser/branding/unofficial/wizHeader.bmp -rm -v browser/branding/unofficial/wizHeaderRTL.bmp -rm -v browser/branding/unofficial/wizWatermark.bmp -rm -v browser/branding/unofficial/firefox.ico -rm -v browser/branding/unofficial/Header.bmp -rm -v browser/branding/unofficial/header.png +bbu='browser/branding/unofficial' -cp -v browser/branding/unofficial/locales/en-US/aboutDialog.dtd browser/locales/en-US/chrome/browser/ -cp -v browser/branding/unofficial/locales/en-US/credits.dtd browser/locales/en-US/chrome/browser/ -cp -v browser/branding/unofficial/content/credits.xhtml browser/base/content/ +rm -v $bbu/watermark.png +rm -v $bbu/Watermrk.bmp +rm -v $bbu/wizHeader.bmp +rm -v $bbu/wizHeaderRTL.bmp +rm -v $bbu/wizWatermark.bmp +rm -v $bbu/firefox.ico +rm -v $bbu/Header.bmp +rm -v $bbu/header.png +cp -v $bbu/locales/en-US/aboutDialog.dtd browser/locales/en-US/chrome/browser/ +cp -v $bbu/locales/en-US/credits.dtd browser/locales/en-US/chrome/browser/ +cp -v $bbu/content/credits.xhtml browser/base/content/ -convert browser/branding/unofficial/content/default.png -resize 16x16 browser/branding/unofficial/default16.png -convert browser/branding/unofficial/content/default.png -resize 32x32 browser/branding/unofficial/default32.png -convert browser/branding/unofficial/content/default.png -resize 48x48 browser/branding/unofficial/default48.png -convert browser/branding/unofficial/content/default.png -resize 16x16 browser/branding/unofficial/mozicon16.xpm -convert browser/branding/unofficial/content/default.png -resize 48x48 browser/branding/unofficial/mozicon50.xpm -convert browser/branding/unofficial/content/default.png -resize 128x128 browser/branding/unofficial/mozicon128.png +convert $bbu/content/default.png -resize 16x16 $bbu/default16.png +convert $bbu/content/default.png -resize 32x32 $bbu/default32.png +convert $bbu/content/default.png -resize 48x48 $bbu/default48.png -convert browser/branding/unofficial/content/default.png -resize 48x48 browser/branding/unofficial/content/icon48.png -convert browser/branding/unofficial/content/default.png -resize 64x64 browser/branding/unofficial/content/icon64.png +convert $bbu/content/default.png -resize 16x16 $bbu/mozicon16.xpm +convert $bbu/content/default.png -resize 48x48 $bbu/mozicon50.xpm +convert $bbu/content/default.png -resize 128x128 $bbu/mozicon128.png -cp ./browser/branding/unofficial/run-icecat.sh ./build/unix/ -perl -pi -e"s/run-mozilla\.sh/run-icecat.sh/g" build/unix/Makefile.in browser/installer/package-manifest.in \ - browser/installer/removed-files.in embedding/config/basebrowser-* toolkit/mozapps/installer/packager.mk \ +convert $bbu/content/default.png -resize 48x48 $bbu/content/icon48.png +convert $bbu/content/default.png -resize 64x64 $bbu/content/icon64.png + +cp $bbu/run-icecat.sh ./build/unix/ +perl -pi -e"s/run-mozilla\.sh/run-icecat.sh/g" \ + build/unix/Makefile.in \ + browser/installer/package-manifest.in \ + browser/installer/removed-files.in \ + embedding/config/basebrowser-* \ + toolkit/mozapps/installer/packager.mk \ js/src/config/config.mk config/config.mk -- http://gnuzilla.gnu.org
