Changeset ebbc911


Ignore:
Timestamp:
04/23/14 13:34:05 (13 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, enter/10, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
ba1f6df, eaea8ff
Parents:
8dc5f71 (diff), b1bcd3c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge pull request #32 from rbgarga/fix_create_backup

Define PBI_STAGEDIRMNT here too since it's used by mk_archive_file

Files:
4 added
4 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pbi-manager/pbi-manager

    r3ed5b3a rb1bcd3c  
    36953695        # Start by making a fresh archive of the installed PBI 
    36963696        PBI_STAGEDIR="$PBI_ORIGPROGDIRPATH" 
     3697        PBI_STAGEDIRMNT="$PBI_ORIGPROGDIRPATH" 
    36973698        mk_archive_file 
    36983699 
  • pbi-modules/www/chromium/pbi.conf

    r8374584 rc968684  
    1515 
    1616# -- Additional package to install along with ORIGIN 
    17 PBI_OTHERPKGS="" 
     17PBI_OTHERPKGS="www/linux-f10-flashplugin11 www/nspluginwrapper" 
    1818 
    1919# -- Optional related packages to show user 
    20 PBI_PLUGINS="" 
    21  
    22  
     20PBI_PLUGINS="java/icedtea-web" 
    2321 
    2422# -- Space delimited list of URLs to screenshots 
  • pbi-modules/www/firefox/pbi.conf

    r667f8a1 rc968684  
    1515 
    1616# -- Additional package to install along with ORIGIN 
    17 PBI_OTHERPKGS="" 
     17PBI_OTHERPKGS="www/linux-f10-flashplugin11 www/nspluginwrapper" 
    1818 
    1919# -- Optional related packages to show user 
    20 PBI_PLUGINS="www/gecko-mediaplayer www/firefox-i18n" 
     20PBI_PLUGINS="www/gecko-mediaplayer www/firefox-i18n java/icedtea-web" 
    2121 
    2222# -- Space delimited list of URLs to screenshots 
  • pbi-modules/www/opera/pbi.conf

    r8374584 rc968684  
    1515 
    1616# -- Additional package to install along with ORIGIN 
    17 PBI_OTHERPKGS="" 
     17PBI_OTHERPKGS="www/linux-f10-flashplugin11 www/nspluginwrapper" 
    1818 
    1919# -- Optional related packages to show user 
    20 PBI_PLUGINS="" 
    21  
    22  
     20PBI_PLUGINS="java/icedtea-web" 
    2321 
    2422# -- Space delimited list of URLs to screenshots 
Note: See TracChangeset for help on using the changeset viewer.