Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2012-11-14 16:32:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2012-11-06 11:11:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2012-11-14 16:32:57.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Nov 13 11:12:59 UTC 2012 - [email protected] + +- merged last bits from gitorious: + - from froh: + - /etc/bash.bashrc: add prompt to the terminal "status line", + which on most graphical terminals is the window title. + - from fcrozat: + - rc.status: output initscript status before systemd one. + - rc.status: educate users on which systemctl command was started + - rc.status: systemctl 195+ allows to not specify .service + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base-12.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-12.3/files/etc/bash.bashrc new/aaa_base-12.3/files/etc/bash.bashrc --- old/aaa_base-12.3/files/etc/bash.bashrc 2012-11-06 11:07:06.000000000 +0100 +++ new/aaa_base-12.3/files/etc/bash.bashrc 2012-11-14 01:42:56.000000000 +0100 @@ -180,12 +180,21 @@ ;; esac # Colored root prompt (see bugzilla #144620) + _ps1_nocolor="$PS1" if test "$UID" -eq 0 -a -n "$TERM" -a -t ; then _bred="$(path tput bold 2> /dev/null; path tput setaf 1 2> /dev/null)" _sgr0="$(path tput sgr0 2> /dev/null)" PS1="\[$_bred\]$PS1\[$_sgr0\]" unset _bred _sgr0 fi + # Mirror prompt in terminal "status line", which for graphical + # terminals usually is the window title. kde konsole in + # addition needs to have "%w" in the "tabs" setting, ymmv fo + # other console emulators. + if _tsl=$(path tput tsl 2> /dev/null) && _fsl=$(path tput fsl 2> /dev/null); then + PS1="$_tsl$_ps1_nocolor$_fsl$PS1" + fi + unset _ps1_nocolor _tsl _fsl unset _u _p _t ;; ash) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-12.3/files/etc/rc.status new/aaa_base-12.3/files/etc/rc.status --- old/aaa_base-12.3/files/etc/rc.status 2012-11-06 11:07:06.000000000 +0100 +++ new/aaa_base-12.3/files/etc/rc.status 2012-11-14 01:42:56.000000000 +0100 @@ -54,11 +54,12 @@ ;; esac case "$1" in - start|stop|reload|restart|try-restart|force-reload|status) echo "redirecting to systemctl" >/dev/stderr ;; + status) SYSTEMD_NO_WRAP=1 "$0" "$1" ;; + start|stop|reload|restart|try-restart|force-reload) echo "redirecting to systemctl $1 ${_rc_base}" >/dev/stderr ;; *) unset _rc_base ;; esac if test -n "$_rc_base" -a -x /bin/systemctl ; then - exec /bin/systemctl $1 "${_rc_base}.service" + exec /bin/systemctl $1 "${_rc_base} fi unset _rc_base fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-12.3/obs/mkpackage new/aaa_base-12.3/obs/mkpackage --- old/aaa_base-12.3/obs/mkpackage 2012-11-06 11:07:06.000000000 +0100 +++ new/aaa_base-12.3/obs/mkpackage 2012-11-14 01:42:56.000000000 +0100 @@ -22,12 +22,12 @@ cd "$src" "$src"/obs/mkchanges "$name/$name".changes | tee "$name"/.changes #test ! -s $name/.changes || git push -for i in *.bz2; do +for i in *.gz; do /bin/rm -vi "$i" done cd "$src" "$src"/obs/mktar -mv *bz2 "$name" +mv *gz "$name" cd "$name" osc vc "$name".changes .changes && rm -f .changes cd "$src" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-12.3/obs/mktar new/aaa_base-12.3/obs/mktar --- old/aaa_base-12.3/obs/mktar 2012-11-06 11:07:06.000000000 +0100 +++ new/aaa_base-12.3/obs/mktar 2012-11-14 01:42:56.000000000 +0100 @@ -1,16 +1,16 @@ #!/bin/sh set -e NAME=aaa_base -#VERSION=1.0 +VERSION=12.3 #datefmt="%Y.%m.%d.%H%M" #LAST_COMMIT=(`git rev-list --timestamp HEAD^..HEAD`) #DATE=`date +$datefmt -d "1970-01-01 00:00 UTC $LAST_COMMIT seconds"` #scmver="$DATE" -#fullver="$VERSION${scmver:+_}$scmver" +fullver="$VERSION${scmver:+_}$scmver" pfx="$NAME${fullver:+-$fullver}" -fn="$pfx".tar.bz2 +fn="$pfx".tar.gz if ! git config --get tar.umask >/dev/null 2>&1 ; then git config --add tar.umask 022 fi -git archive --prefix="$pfx"/ HEAD | bzip2 > $fn +git archive --prefix="$pfx"/ HEAD | gzip > $fn echo "version $fullver -> $fn" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
