Changeset 2c685dfe


Ignore:
Timestamp:
11/08/13 11:13:08 (14 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:
192923c
Parents:
f29fddc (diff), e4da50e (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
32 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-usermanager/user.cpp

    r87d35b7 r4e36155  
    144144void User::setPassword(QString password) 
    145145{ 
     146    this->clearPass = password; 
    146147    this->password = crypt(password.toAscii(), "KG"); 
    147148    qDebug("Done with crypt now........"); 
  • src-qt4/port-files/pkg-plist

    rbd99c30 rc79bd1a  
    8787share/pcbsd/icons/zmanager.png 
    8888share/pcbsd/doc/handbook_en.pdf 
    89 share/wallpapers/pcbsd9-default/contents/images/1024x768.jpg 
    90 share/wallpapers/pcbsd9-default/contents/images/1600x1200.jpg 
    91 share/wallpapers/pcbsd9-default/contents/images/1280x800.jpg 
    92 share/wallpapers/pcbsd9-default/contents/images/1280x1024.jpg 
    93 share/wallpapers/pcbsd9-default/contents/images/1440x900.jpg 
    94 share/wallpapers/pcbsd9-default/contents/images/1920x1200.jpg 
    95 share/wallpapers/pcbsd9-default/contents/images/800x600.jpg 
    96 share/wallpapers/pcbsd9-default/contents/images/1920x1080.jpg 
    97 share/wallpapers/pcbsd9-default/contents/screenshot.jpg 
    98 share/wallpapers/pcbsd9-default/metadata.desktop 
     89share/wallpapers/pcbsd10-default/contents/images/1024x768.jpg 
     90share/wallpapers/pcbsd10-default/contents/images/1600x1200.jpg 
     91share/wallpapers/pcbsd10-default/contents/images/1280x800.jpg 
     92share/wallpapers/pcbsd10-default/contents/images/1280x1024.jpg 
     93share/wallpapers/pcbsd10-default/contents/images/1440x900.jpg 
     94share/wallpapers/pcbsd10-default/contents/images/1920x1200.jpg 
     95share/wallpapers/pcbsd10-default/contents/images/800x600.jpg 
     96share/wallpapers/pcbsd10-default/contents/images/1920x1080.jpg 
     97share/wallpapers/pcbsd10-default/contents/screenshot.jpg 
     98share/wallpapers/pcbsd10-default/metadata.desktop 
    9999share/wallpapers/pcbsd-default.jpg 
    100100share/wallpapers/PCBSD/a_1280x1024.jpg 
  • src-sh/pbi-manager10/pbi-manager

    rf0b49b7 ra497938  
    212212  -l license    -- Application license type 
    213213                   Example: BSD, GPL, Commercial 
     214  -m email      -- Port / Application Maintainer 
    214215  -n name       -- Application / category name (Required) 
    215216  -t type       -- Application interface type 
     
    542543                      --cat) PBI_MT_TYPE="CAT" ;; 
    543544                      --app) PBI_MT_TYPE="APP" ;; 
     545                        -m) if [ $# -eq 1  ]; then usage_mt_add; fi 
     546                            shift; PBI_MT_MAINTAINER="$1" 
     547                            ;; 
    544548                        -n) if [ $# -eq 1  ]; then usage_mt_add; fi 
    545549                            shift; PBI_MT_ADDNAME="$1" 
     
    16391643        # Check first if we have this pkg in PKGNG 
    16401644        if [ -e "/usr/local/sbin/pkg-static" -a -n "${PBI_MAKEPORT}" ] ; then 
    1641                 local testPkgVer="`pkg query %v ${PBI_MAKEPORT}`" 
     1645                local testPkgVer="`pkg rquery %v ${PBI_MAKEPORT}`" 
    16421646                if [ -n "$testPkgVer" ] ; then 
    16431647                        export PBI_PROGVERSION="$testPkgVer" 
     
    20462050        if [ -n "$PBI_CATEGORY" ] ; then mFlags="$mFlags -c \"${PBI_CATEGORY}\""; fi 
    20472051        if [ -n "$PBI_LICENSE" ] ; then mFlags="$mFlags -l \"${PBI_LICENSE}\""; fi 
     2052        if [ -n "$PBI_MAINTAINER" ] ; then mFlags="$mFlags -m \"${PBI_MAINTAINER}\""; fi 
    20482053        if [ -n "$PBI_TAGS" ] ; then mFlags="$mFlags -k \"${PBI_TAGS}\""; fi 
    20492054        if [ -n "$PBI_ICONURL" ] ; then mFlags="$mFlags -i \"${PBI_ICONURL}\""; fi 
     
    21052110 
    21062111        cp ${PBI_MT_METAFILE} ${PBI_TMPDIR}/.meta.$$ 
    2107         echo "App=${PBI_MT_ADDNAME};${PBI_MT_ADDCAT};${PBI_MT_ADDICON};${PBI_MT_ADDAUTHOR};${PBI_MT_ADDURL};${PBI_MT_ADDLIC};${PBI_MT_ADDTYPE};${PBI_MT_ADDKEYWORDS};${PBI_MT_ADDDESC};$PBI_MT_REQUIRESROOT;${_date}" \ 
     2112        echo "App=${PBI_MT_ADDNAME};${PBI_MT_ADDCAT};${PBI_MT_ADDICON};${PBI_MT_ADDAUTHOR};${PBI_MT_ADDURL};${PBI_MT_ADDLIC};${PBI_MT_ADDTYPE};${PBI_MT_ADDKEYWORDS};${PBI_MT_ADDDESC};$PBI_MT_REQUIRESROOT;${_date};${PBI_MT_MAINTAINER}" \ 
    21082113        >> ${PBI_TMPDIR}/.meta.$$ 
    21092114        sort ${PBI_TMPDIR}/.meta.$$ > "${PBI_MT_METAFILE}" 
     
    30943099        PBI_DESC="" 
    30953100        PBI_SHORTDESC="" 
     3101        PBI_MAINTAINER="" 
    30963102        PBI_TAGS="" 
    30973103        PBI_PROGTYPE="" 
     
    31323138        if [ -e "${1}/pbi_shortdesc" ] ; then 
    31333139                PBI_SHORTDESC="`cat ${1}/pbi_shortdesc`" 
     3140        fi 
     3141        if [ -e "${1}/pbi_maintainer" ] ; then 
     3142                PBI_MAINTAINER="`cat ${1}/pbi_maintainer`" 
    31343143        fi 
    31353144 
     
    43724381        if [ -n "$PBI_SHORTDESC" ] ; then 
    43734382                echo "$PBI_SHORTDESC" > ${PBI_HEADERDIR}/pbi_shortdesc 
     4383        fi 
     4384        if [ -n "$PBI_MAINTAINER" ] ; then 
     4385                echo "$PBI_MAINTAINER" > ${PBI_HEADERDIR}/pbi_maintainer 
    43744386        fi 
    43754387 
     
    69066918        if [ -z "$PBI_SHORTDESC" ] ; then 
    69076919                PBI_SHORTDESC="`pkg query '%c' ${PBI_MAKEPORT}`" 
     6920        fi 
     6921        if [ -z "$PBI_MAINTAINER" ] ; then 
     6922                PBI_MAINTAINER="`pkg query '%m' ${PBI_MAKEPORT}`" 
    69086923        fi 
    69096924        if [ -z "$PBI_DESC" ] ; then 
  • src-sh/pc-extractoverlay/desktop-overlay/usr/share/skel/.kde4/share/config/startupconfig

    r5bdd55e r0978e4d  
    44# kcminputrc Mouse cursorSize '' 
    55kcminputrc_mouse_cursorsize='' 
    6 # ksplashrc KSplash Theme Default 
    7 ksplashrc_ksplash_theme=pcbsd9 
    8 # ksplashrc KSplash Engine KSplashX 
    9 ksplashrc_ksplash_engine=KSplashX 
    106# krandrrc Display ApplyOnStartup false 
    117krandrrc_display_applyonstartup=false 
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/share/apps/plasma-desktop/init/05-freebsdWallpaper.js

    rb53f797 r0978e4d  
    55  activity.wallpaperMode = "SingleImage"; 
    66  activity.currentConfigGroup = new Array("Wallpaper", "image"); 
    7   activity.writeConfig("wallpaper", "pcbsd9-default"); 
     7  activity.writeConfig("wallpaper", "pcbsd10-default"); 
    88} 
  • src-sh/warden/scripts/backend/startjail.sh

    r2c39b15 re4da50e  
    285285 
    286286IFACE= 
     287 
    287288DEFAULT=0 
    288289 
     
    292293fi 
    293294if [ -z "${IFACE}" ] ; then 
    294    IFACE=`get_default_interface` 
    295    DEFAULT=1 
     295  if [ -n "$NIC" ] ; then 
     296    IFACE="$NIC" 
     297  else 
     298    IFACE=`get_default_interface` 
     299    DEFAULT=1 
     300  fi 
    296301fi 
    297302if [ -z "${IFACE}" ] ; then 
  • src-sh/warden/scripts/backend/stopjail.sh

    r2c39b15 re4da50e  
    5252fi 
    5353if [ -z "${IFACE}" ] ; then 
    54    IFACE=`get_default_interface` 
    55    DEFAULT=1 
     54  if [ -n "$NIC" ] ; then 
     55    IFACE="$NIC" 
     56  else 
     57    IFACE=`get_default_interface` 
     58    DEFAULT=1 
     59  fi 
    5660fi 
    5761if [ -z "${IFACE}" ] ; then 
Note: See TracChangeset for help on using the changeset viewer.