Changeset 7c48fe8


Ignore:
Timestamp:
10/01/13 10:01:16 (15 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
01bbf9d
Parents:
1cad4120 (diff), 3ce959a (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 branch 'master' of github.com:pcbsd/pcbsd

Files:
1 added
15 edited
1 moved

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-bootconfig/mainUI.ui

    r1361cd4 r864e374  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>640</width> 
    10     <height>262</height> 
     9    <width>638</width> 
     10    <height>260</height> 
    1111   </rect> 
    1212  </property> 
    1313  <property name="windowTitle"> 
    1414   <string>PC-BSD Bootup Configuration</string> 
     15  </property> 
     16  <property name="windowIcon"> 
     17   <iconset resource="pc-bootconfig.qrc"> 
     18    <normaloff>:/pc-bootconfig.png</normaloff>:/pc-bootconfig.png</iconset> 
    1519  </property> 
    1620  <widget class="QWidget" name="centralwidget"> 
     
    387391     <x>0</x> 
    388392     <y>0</y> 
    389      <width>640</width> 
    390      <height>20</height> 
     393     <width>638</width> 
     394     <height>21</height> 
    391395    </rect> 
    392396   </property> 
  • src-qt4/pc-bootconfig/pc-bootconfig.qrc

    rb3cb948 r864e374  
    11<RCC> 
    2   <qresource> 
    3     <file>icons/undo.png</file> 
    4     <file>icons/gear.png</file> 
    5     <file>icons/save.png</file> 
    6     <file>icons/folder.png</file> 
    7     <file>icons/minus.png</file> 
    8     <file>icons/add.png</file> 
    9     <file>icons/close.png</file> 
    10     <file>icons/copy.png</file> 
    11     <file>icons/new.png</file> 
    12     <file>icons/rename.png</file> 
    13     <file>icons/star.png</file> 
    14     <file>icons/sync.png</file> 
    15     <file>icons/plus.png</file> 
    16   </qresource> 
     2    <qresource prefix="/"> 
     3        <file>icons/undo.png</file> 
     4        <file>icons/gear.png</file> 
     5        <file>icons/save.png</file> 
     6        <file>icons/folder.png</file> 
     7        <file>icons/minus.png</file> 
     8        <file>icons/add.png</file> 
     9        <file>icons/close.png</file> 
     10        <file>icons/copy.png</file> 
     11        <file>icons/new.png</file> 
     12        <file>icons/rename.png</file> 
     13        <file>icons/star.png</file> 
     14        <file>icons/sync.png</file> 
     15        <file>icons/plus.png</file> 
     16        <file>pc-bootconfig.png</file> 
     17    </qresource> 
    1718</RCC> 
  • src-qt4/pc-controlpanel/items/system/pc-gdmconf.desktop

    r0d2501b r0a6de4c  
    66TryExec=/usr/local/bin/pc-gdmconf 
    77Keywords="gdm,login,login window,auto login,autologin,xdmcp,remote login,login timout" 
    8 Icon=/usr/local/share/pcbsd/icons/pc-dmconf.png 
     8Icon=/usr/local/share/pcbsd/icons/pc-gdmconf.png 
    99StartupNotify=true 
    1010Terminal=false 
  • src-qt4/pc-updategui/main.cpp

    r1620346 r731c48b  
    2020   if ( ! QFile::exists( PREFIX + "/share/pcbsd/i18n/UpdateGUI_" + langCode + ".qm" ) ) 
    2121     langCode.truncate(langCode.indexOf("_")); 
    22    translator.load( QString("UpdateGUI_") + langCode, PREFIX + "/share/pcbsd/i18n/" ); 
     22   translator.load( QString("UpdateGui_") + langCode, PREFIX + "/share/pcbsd/i18n/" ); 
    2323   a.installTranslator( &translator ); 
    2424   qDebug() << "Locale:" << langCode; 
  • src-qt4/port-files/pkg-plist

    r1b89eeb rbbd20f2  
    417417share/pcbsd/pc-controlpanel/items/system/ksystemlog.desktop 
    418418share/pcbsd/pc-controlpanel/items/system/about.desktop 
    419 share/pcbsd/pc-controlpanel/items/system/pc-updategui.desktop 
    420419share/pcbsd/pc-controlpanel/items/system/pc-adsldap.desktop 
    421420share/pcbsd/pc-controlpanel/items/system/webmin.desktop 
     
    433432share/pcbsd/pc-controlpanel/items/tools/lifepreserver.desktop 
    434433share/pcbsd/pc-controlpanel/items/tools/flash-player-properties.desktop 
     434share/pcbsd/pc-controlpanel/items/software/pc-updategui.desktop 
    435435share/pcbsd/pc-controlpanel/items/software/pbi-winecfg.desktop 
    436436share/pcbsd/pc-controlpanel/items/software/pbi-q4wine.desktop 
  • src-sh/libsh/functions.sh

    r26599e2 r3b0aba7  
    243243   done 
    244244 
    245    _err="`cat ${_eFile}`" 
     245   _err="`cat ${_eFile} 2>/dev/null`" 
     246   if [ -z "$_err" ] ; then _err="0"; fi 
    246247   rm ${_eFile} 2>/dev/null 
    247248   if [ "$_err" = "0" ]; then echo "FETCHDONE" ; fi 
     
    304305                done 
    305306 
    306                 _err="`cat ${_eFile}`" 
     307                _err="`cat ${_eFile} 2>/dev/null`" 
     308                if [ -z "$_err" ] ; then _err="0"; fi 
    307309                rm ${_eFile} 2>/dev/null 
    308310                if [ "$_err" = "0" ]; then echo "FETCHDONE" ; fi 
  • src-sh/pbi-manager/pbi-manager

    rc60c604 r08c4fcf  
    75177517 
    75187518# Source our shared PCBSD functions 
    7519 if [ -z "$ALTPROGPREFIX" ] ; then 
     7519if [ -n "$ALTPROGPREFIX" ] ; then 
    75207520  . ${ALTPROGPREFIX}/share/pcbsd/scripts/functions.sh 
    75217521else 
  • src-sh/pbi-manager10/install.sh

    r651bd28 r393790b  
    66if [ $verCheck -lt 1000000 ] ; then 
    77  # This version is for FreeBSD >= 10 
    8   exit 0 
     8  #exit 0 
    99fi 
    1010 
     
    5353do 
    5454  rm ${LB}/man/man1/${i}.gz >/dev/null 2>/dev/null 
    55   cp man1/${i} ${LB}/man/man1/${i} 
     55  gzip -c man1/${i} > ${LB}/man/man1/${i}.gz 
    5656done 
    5757 
     
    6060do 
    6161  rm ${LB}/man/man5/${i}.gz >/dev/null 2>/dev/null 
    62   cp man5/${i} ${LB}/man/man5/${i} 
     62  gzip -c man5/${i} > ${LB}/man/man5/${i}.gz 
    6363done 
    6464 
     
    6868do 
    6969  rm ${LB}/man/man8/${i}.gz >/dev/null 2>/dev/null 
    70   cp man8/${i} ${LB}/man/man8/${i} 
     70  gzip -c man8/${i} > ${LB}/man/man8/${i}.gz 
    7171done 
    7272 
     
    8383 
    8484# If this is a new install, add the PC-BSD master repo 
    85 if [ ! -d "/var/db/pbi/keys" ] ; then 
    86         pbi_addrepo ${DIR}/repo/pcbsd.rpo 
    87 fi 
     85#if [ ! -d "/var/db/pbi/keys" ] ; then 
     86#       pbi_addrepo ${DIR}/repo/pcbsd.rpo 
     87#fi 
    8888 
    8989# Copy the default PC-BSD repo file 
     
    9797cp ${DIR}/etc/pbi.conf ${LB}/etc/pbi.conf 
    9898 
    99 if [ ! -d "/usr/pbi" ] ; then mkdir /usr/pbi ; fi 
    100  
    10199# Create the wrapper binary 
    102100cd ${DIR}/wrapper 
     
    104102  # Build 32bit wrapper 
    105103  echo "Building i386 wrapper..." 
    106   rm .pbiwrapper >/dev/null 2>/dev/null 
     104  rm pbiwrapper >/dev/null 2>/dev/null 
    107105  make clean 
    108106  make DEFINES="-mtune=i386 -march=i386 -m32" 
    109107  make install 
    110   chown root:wheel /usr/pbi/.pbiwrapper  
    111   chmod 644 /usr/pbi/.pbiwrapper 
    112   mv /usr/pbi/.pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-i386 
     108  chown root:wheel pbiwrapper  
     109  chmod 644 pbiwrapper 
     110  mv pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-i386 
    113111else 
    114112  touch ${LB}/share/pbi-manager/.pbiwrapper-i386 
     
    119117DEFINES="" 
    120118export DEFINES 
    121 rm .pbiwrapper >/dev/null 2>/dev/null 
     119rm pbiwrapper >/dev/null 2>/dev/null 
    122120make clean 
    123121make DEFINES="" 
    124122make install DEFINES="" 
    125 chown root:wheel /usr/pbi/.pbiwrapper  
    126 chmod 644 /usr/pbi/.pbiwrapper 
    127 mv /usr/pbi/.pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-`uname -m` 
     123chown root:wheel pbiwrapper  
     124chmod 644 pbiwrapper 
     125mv pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-`uname -m` 
     126cp ldconfig ${LB}/share/pbi-manager/ldconfig-pbi 
  • src-sh/pbi-manager10/pbi-manager

    r52c32d9 rb2a8744  
    35283528        mk_header_file 
    35293529 
    3530         # Remove the new headerdir 
    3531         rm -rf "$PBI_HEADERDIR" 
    3532          
    35333530        # Now finish up and make the resulting PBI file 
    35343531        mk_output_pbi 
     
    35523549 
    35533550        if [ "`basename $0`" = "pbi_makeport" -o "`basename $0`" = "pbi_makeport_chroot" ] ; then 
    3554           PBI_STAGEDIR="/usr/local" 
     3551          #PBI_STAGEDIR="/usr/local" 
     3552          # KPM REMOVE ME 
     3553          mk_stage_dir "/usr/local" "move" 
     3554 
     3555          # Check if we created a linux app, and need to copy files for it 
     3556          auto_copy_linuxbase 
    35553557        else 
    35563558          mk_stage_dir 
     
    35763578        save_pbi_details_to_header 
    35773579        mk_header_file 
    3578         rm_header_dir 
    35793580 
    35803581        mk_output_pbi 
    35813582 
    35823583        rm_stage_dir 
     3584        exit 0 
    35833585} 
    35843586 
     
    40484050# Create a dir for manipulating header info 
    40494051mk_header_dir() { 
    4050         PBI_HEADERDIR="${PBI_PROGDIRPATH}/.headerdir" 
     4052        PBI_HEADERDIR="${PBI_STAGEDIRMNT}/pbimeta" 
    40514053        if [ -e "${PBI_HEADERDIR}" ] ; then rm -rf "${PBI_HEADERDIR}" ; fi 
    40524054        mkdir -p ${PBI_HEADERDIR} 
    40534055} 
    40544056 
    4055 # Remove the tmp header-dir 
    4056 rm_header_dir() { 
    4057         PBI_HEADERDIR="${PBI_PROGDIRPATH}/.headerdir" 
    4058         if [ -e "${PBI_HEADERDIR}" ] ; then rm -rf "${PBI_HEADERDIR}" ; fi 
    4059 } 
    4060  
    40614057# Create a dir for staging the final archive 
    40624058mk_stage_dir() { 
    4063         local _excOpts="" 
     4059        if [ -n "$1" ] ; then 
     4060                cpDir="$1" 
     4061        else 
     4062                cpDir="${PBI_PROGDIRPATH}" 
     4063        fi 
    40644064 
    40654065        PBI_STAGEDIR="${PBI_PROGDIRPATH}/.stagedir" 
     
    40714071        fi 
    40724072        mkdir -p ${PBI_STAGEDIR} 
     4073 
     4074        mkdir -p ${PBI_STAGEDIR}/local 
     4075        mkdir -p ${PBI_STAGEDIR}/etc 
     4076        mkdir -p ${PBI_STAGEDIR}/pbimeta 
     4077        mkdir -p ${PBI_STAGEDIR}/virtbase 
     4078        mkdir -p ${PBI_STAGEDIR}/linux 
     4079        mkdir -p ${PBI_STAGEDIR}/run 
     4080 
     4081        local _excOpts="" 
    40734082 
    40744083        # Build module list of excludes 
     
    40844093        fi 
    40854094 
    4086         # Now copy the stagedir 
    4087         tar cvf - ${_excOpts} --exclude .stagedir \ 
     4095        if [ "$2" = "move" ] ; then 
     4096                mv ${cpDir}/* ${PBI_STAGEDIR}/local 
     4097        else 
     4098                # Now copy the stagedir 
     4099                tar cvf - ${_excOpts} --exclude .stagedir \ 
    40884100                --exclude .pkgdb --exclude .ld-elf.hints --exclude make.conf \ 
    40894101                --exclude make.conf.bak --exclude .keepports \ 
    4090                 -C "${PBI_PROGDIRPATH}" . 2>/dev/null \ 
    4091                 | tar xvpf - -C ${PBI_STAGEDIR} 2>/dev/null 
    4092  
     4102                -C "${cpDir}" . 2>/dev/null \ 
     4103                | tar xvpf - -C ${PBI_STAGEDIR}/local 2>/dev/null 
     4104        fi 
     4105 
     4106        cd ${PBI_PROGDIRPATH} 
     4107        PBI_STAGEDIRMNT="${PBI_STAGEDIR}" 
     4108        PBI_STAGEDIR="${PBI_STAGEDIR}/local" 
    40934109} 
    40944110 
    40954111# Remove the stagedir 
    40964112rm_stage_dir() { 
     4113        # If this is in the chroot we can exit and let the parent cleanup 
     4114        if [ "$0" = "pbi_makeport_chroot" ] ; then return; fi 
     4115 
    40974116        cd / 
    40984117        PBI_STAGEDIR="${PBI_PROGDIRPATH}/.stagedir" 
     
    41134132# See if we need to clean the stagedir 
    41144133clean_stage_dir() { 
     4134 
     4135        if [ -e "${PBI_STAGEDIR}/etc" ] ; then 
     4136                mv ${PBI_STAGEDIR}/etc/* ${PBI_STAGEDIRMNT}/etc/ 
     4137        fi 
     4138 
    41154139        if [ "${PBI_USESYSGL}" != "NO" ] ; then 
    41164140                rm ${PBI_STAGEDIR}/lib/libGl.* >/dev/null 2>/dev/null 
     
    41194143        fi 
    41204144        if [ "${PBI_USESYSFONTS}" != "NO" ] ; then 
    4121                 rm -rf ${PBI_STAGEDIR}/etc/fonts >/dev/null 2>/dev/null 
    4122                 rm -rf ${PBI_STAGEDIR}/lib/X11/fonts >/dev/null 2>/dev/null 
    4123                 rm -rf ${PBI_STAGEDIR}/lib/X11/icons >/dev/null 2>/dev/null 
     4145                rm -rf ${PBI_STAGEDIR}/etc/fonts/* >/dev/null 2>/dev/null 
     4146                rm -rf ${PBI_STAGEDIR}/lib/X11/fonts/* >/dev/null 2>/dev/null 
     4147                rm -rf ${PBI_STAGEDIR}/lib/X11/icons/* >/dev/null 2>/dev/null 
    41244148        fi 
    41254149} 
     
    41604184        if test_tar_lzma ; then _tcmp="J" ; else _tcmp="j" ; fi 
    41614185        echo "Creating compressed archive..." 
    4162         tar cv${_tcmp}f "${PBI_CREATE_ARCHIVE}" ${_excOpts} -C ${PBI_STAGEDIR} . 2>/dev/null  
     4186        tar cv${_tcmp}f "${PBI_CREATE_ARCHIVE}" ${_excOpts} -C ${PBI_STAGEDIRMNT} . 2>/dev/null  
    41634187} 
    41644188 
     
    42734297} 
    42744298 
    4275  
    42764299# All the pieces are ready, spit out the final PBI file 
    42774300mk_output_pbi() { 
     
    42814304                icon="${PBI_DEFAULT_ICON_CHROOT}" 
    42824305        fi 
     4306 
     4307        # Set PBI name all lower-case 
    42834308        _pbilow="`echo ${PBI_PROGNAME} | tr '[:upper:]' '[:lower:]' | sed 's| ||g'`" 
    4284  
    42854309        outfile="${PBI_CREATE_OUTDIR}/${_pbilow}-${PBI_PROGVERSION}-${ARCH}.pbi" 
     4310 
    42864311        mark1="${PBI_CREATE_OUTDIR}/.pbimark1.$$" 
    42874312        mark2="${PBI_CREATE_OUTDIR}/.pbimark2.$$" 
    4288  
    42894313        echo " 
    42904314${PBI_SS_ICON}" >$mark1 
     
    42924316${PBI_SS_ARCHIVE}" >$mark2 
    42934317 
     4318 
    42944319        # DO IT, DO IT NOW!!! 
    4295         cat ${PBI_HEADER_ARCHIVE} $mark1 ${icon} $mark2 ${PBI_CREATE_ARCHIVE} > ${outfile}       
     4320        cat ${PBI_HEADER_ARCHIVE} $mark1 ${icon} $mark2 ${PBI_CREATE_ARCHIVE} > ${outfile} 
    42964321        sha256 -q ${outfile} > ${outfile}.sha256 
    42974322 
     
    66576682                        mv ${PBI_CHROOTDIR}/pbiout/*.pbi ${PBI_CREATE_OUTDIR}/  
    66586683                        mv ${PBI_CHROOTDIR}/pbiout/*.sha256 ${PBI_CREATE_OUTDIR}/ 
     6684                else 
     6685                        echo "Error: pbi_makeport_chroot: returned non-0 status!" 
    66596686                fi 
    66606687 
     
    66986725 
    66996726        # Prune any proto / build specific ports 
    6700         start_pbi_prune_ports 
     6727        if [ -z "$PBI_PKGNGBUILD" ] ; then 
     6728                start_pbi_prune_ports 
     6729        fi 
    67016730 
    67026731        # See if we need to run a post make script 
     
    67116740 
    67126741        # Check if we created a linux app, and need to copy files for it 
    6713         auto_copy_linuxbase 
     6742        #auto_copy_linuxbase 
    67146743 
    67156744        # Break here if we are only doing a build 
     
    67916820auto_copy_linuxbase() 
    67926821{ 
    6793         echo "Checking for Linux libraries to copy..." 
    67946822        if [ -d "/compat/linux/usr/lib" ] ; then 
    67956823                mkdir ${PBI_PROGDIRPATH}/linuxlib 
    6796                 echo "Copying /compat/linux/lib -> ${PBI_PROGDIRPATH}/linuxlib" 
    6797                 tar cvf - -C /compat/linux/lib . 2>/dev/null | \ 
    6798                 tar xvf - -C ${PBI_PROGDIRPATH}/linuxlib 2>/dev/null 
    6799                 echo "Copying /compat/linux/usr/lib -> ${PBI_PROGDIRPATH}/linuxlib" 
    6800                 tar cvf - -C /compat/linux/usr/lib . 2>/dev/null | \ 
    6801                 tar xvf - -C ${PBI_PROGDIRPATH}/linuxlib 2>/dev/null 
     6824                echo "Copying /compat/linux -> ${PBI_STAGEDIRMNT}/linux" 
     6825                tar cvf - -C /compat/linux . 2>/dev/null | \ 
     6826                tar xvf - -C ${PBI_STAGEDIRMNT}/linux 2>/dev/null 
    68026827        fi 
    68036828} 
     
    73477372  if [ $? -eq 0 ] ; then return ; fi 
    73487373 
     7374  # Are we doing a PKGNG build? 
     7375  if [ -n "$PBI_PKGNGBUILD" ] ; then 
     7376        pkg install -y "$_lPortRaw" 
     7377        if [ $? -ne 0 ] ; then 
     7378           exit_err "Failed installing $_lPortRaw" 
     7379        fi 
     7380        return 0 
     7381  fi 
     7382 
     7383  # Lets do old-fashioned build 
     7384 
     7385  # KPM! ##############  
     7386  # We will need to revisit this portion later, see if we can 
     7387  # grab the user / group list from pkgng installed packages 
     7388 
    73497389  # Save any users / groups we need to create later 
    73507390  local pUsers="`make -V USERS -C $_lPort PORTSDIR=${PORTSDIR}`" 
     
    73727412  done 
    73737413 
    7374   # Are we doing a PKGNG build? 
    7375   if [ "$PBI_PKGNGBUILD" ] ; then 
    7376         pkg install -y "$_lPortRaw" 
    7377         if [ $? -ne 0 ] ; then 
    7378            exit_err "Failed installing $_lPortRaw" 
    7379         fi 
    7380         return 0 
    7381   fi 
    7382  
    7383   # Lets do old-fashioned build 
    73847414  echo "Compiling port: ${_lPort}" 
    73857415  cd ${_lPort} 
  • src-sh/pbi-manager10/wrapper/Makefile

    r6144235 r393790b  
    1515AR            = ar cqs 
    1616RANLIB        =  
    17 QMAKE         = /usr/local/bin/qmake-qt4 
    1817TAR           = tar -cf 
    1918COMPRESS      = gzip -9f 
     
    4140SOURCES       = main.c  
    4241OBJECTS       = main.o 
    43 MAKE_TARGET   = .pbiwrapper 
    44 DESTDIR       = /usr/pbi/ 
    45 TARGET        = .pbiwrapper 
     42MAKE_TARGET   = pbiwrapper 
     43TARGET        = pbiwrapper 
    4644 
    4745first: all 
     
    7068 
    7169$(TARGET):  $(OBJECTS)   
    72         @$(CHK_DIR_EXISTS) /usr/pbi/ || $(MKDIR) /usr/pbi/ 
    7370        $(CC) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) 
    7471 
     
    125122 
    126123install_scripts: first FORCE 
    127         -@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/pbi || $(MKDIR) $(INSTALL_ROOT)/usr/pbi/ 
    128         -$(INSTALL_FILE) .pbiwrapper $(INSTALL_ROOT)/usr/pbi/.pbiwrapper 
    129         -$(INSTALL_FILE) ldconfig $(INSTALL_ROOT)/usr/pbi/.ldconfig 
    130124 
    131125install:   FORCE install_scripts 
  • src-sh/pc-extractoverlay/desktop-overlay/root/.cshrc

    r129cfcd rae23d60  
    3737        set history = 100 
    3838        set savehist = 100 
     39        set autorehash = always 
    3940        set mail = (/var/mail/$USER) 
    4041        if ( $?tcsh ) then 
  • src-sh/pc-extractoverlay/desktop-overlay/usr/share/skel/dot.cshrc

    r129cfcd rae23d60  
    3838        set filec 
    3939        set autocorrect 
     40        set autorehash = always 
    4041        set filec 
    4142        set history = 100 
  • src-sh/port-files/pkg-plist

    r3388c59 r3ce959a  
    149149share/pcbsd/conf/server-excludes 
    150150share/pcbsd/pefs/other 
     151share/pcbsd/pefs/sshd 
    151152share/pcbsd/pefs/system 
    152153share/pcbsd/distfiles/desktop-overlay.txz 
  • src-sh/xtrafiles/local/bin/enable_user_pefs

    re961598 r3ce959a  
    7979cp /usr/local/share/pcbsd/pefs/other /etc/pam.d/other 
    8080cp /usr/local/share/pcbsd/pefs/system /etc/pam.d/system 
     81cp /usr/local/share/pcbsd/pefs/sshd /etc/pam.d/sshd 
  • src-qt4/pc-pkgmanager/mainWin.cpp

    r7d94108a r1cad4120  
    4040  connect(action_Quit, SIGNAL( triggered(bool) ), this, SLOT( slotCloseClicked() ) ); 
    4141  connect(tool_search, SIGNAL( clicked() ), this, SLOT( slotSearchPackages() ) ); 
    42  
     42  connect(line_search, SIGNAL( returnPressed()), this, SLOT( slotSearchPackages()) ); 
     43         
    4344  // Setup the action group 
    4445  viewGroup = new QActionGroup(this); 
Note: See TracChangeset for help on using the changeset viewer.