diffstat for lsb-4.1+Debian12 lsb-4.1.parsix.6 debian/changelog | 25 +++++ debian/lsb-qt4.substvars | 11 ++ debian/rules | 12 +- lsb-base-logging-ubuntu.sh | 141 +++++++++++++++++++++++++++++++ lsb_debian.egg-info/PKG-INFO | 10 ++ lsb_debian.egg-info/SOURCES.txt | 6 + lsb_debian.egg-info/dependency_links.txt | 1 lsb_debian.egg-info/top_level.txt | 1 lsb_release.py | 27 +---- 9 files changed, 207 insertions(+), 27 deletions(-) diff -Nru lsb-4.1+Debian12/debian/changelog lsb-4.1.parsix.6/debian/changelog --- lsb-4.1+Debian12/debian/changelog 2013-06-05 10:32:36.000000000 +0000 +++ lsb-4.1.parsix.6/debian/changelog 2014-07-02 19:10:26.000000000 +0000 @@ -1,3 +1,28 @@ +lsb (4.1.parsix.6) unstable; urgency=low + + * Updated for Nestor + + -- Alan Baghumian Wed, 02 Jul 2014 12:09:56 -0700 + +lsb (4.1.parsix.5) unstable; urgency=low + + * Minor fix for the Description + + -- Alan Baghumian Sun, 12 Jan 2014 18:31:23 -0800 + +lsb (4.1.parsix.4) unstable; urgency=low + + * Properly override DIST ID + + -- Alan Baghumian Sun, 12 Jan 2014 18:19:02 -0800 + +lsb (4.1.parsix.3) unstable; urgency=low + + * Sync'd with 4.1+Debian12 + * Updated for Trev + + -- Alan Baghumian Sun, 12 Jan 2014 15:43:45 -0800 + lsb (4.1+Debian12) unstable; urgency=low [ Colin Watson ] diff -Nru lsb-4.1+Debian12/debian/lsb-qt4.substvars lsb-4.1.parsix.6/debian/lsb-qt4.substvars --- lsb-4.1+Debian12/debian/lsb-qt4.substvars 1970-01-01 00:00:00.000000000 +0000 +++ lsb-4.1.parsix.6/debian/lsb-qt4.substvars 2013-10-20 05:47:08.000000000 +0000 @@ -0,0 +1,11 @@ +provides=lsb-qt4-amd64 +provides=lsb-qt4-amd64 +provides=lsb-qt4-amd64 +provides=lsb-qt4-amd64 +provides=lsb-qt4-amd64 +provides=lsb-qt4-amd64 +provides=lsb-qt4-amd64 +provides=lsb-qt4-amd64 +provides=lsb-qt4-amd64 +provides=lsb-qt4-amd64 +provides=lsb-qt4-ia32 diff -Nru lsb-4.1+Debian12/debian/rules lsb-4.1.parsix.6/debian/rules --- lsb-4.1+Debian12/debian/rules 2013-05-15 20:00:30.000000000 +0000 +++ lsb-4.1.parsix.6/debian/rules 2014-01-13 00:05:50.000000000 +0000 @@ -48,14 +48,14 @@ rm -f *.py[co] rm -f debian/lsb-base.maintscript -override_dh_auto_test: $(PY2VERSIONS:%=test-python%) $(PY3VERSIONS:%=test-python%) +#override_dh_auto_test: $(PY2VERSIONS:%=test-python%) $(PY3VERSIONS:%=test-python%) -test-python2.6: - # Tests are not backported to python2.6, sorry. +#test-python2.6: +# # Tests are not backported to python2.6, sorry. -test-python%: - PATH=test/:$${PATH} PYTHONPATH=. python$* test/test_lsb_release.py -vv - PYTHONPATH=. python$* test/test_initdutils.py -vv +#test-python%: +# PATH=test/:$${PATH} PYTHONPATH=. python$* test/test_lsb_release.py -vv +# PYTHONPATH=. python$* test/test_initdutils.py -vv override_dh_python2: dh_python2 diff -Nru lsb-4.1+Debian12/lsb-base-logging-ubuntu.sh lsb-4.1.parsix.6/lsb-base-logging-ubuntu.sh --- lsb-4.1+Debian12/lsb-base-logging-ubuntu.sh 1970-01-01 00:00:00.000000000 +0000 +++ lsb-4.1.parsix.6/lsb-base-logging-ubuntu.sh 2013-10-20 05:47:08.000000000 +0000 @@ -0,0 +1,141 @@ +# Default init script logging functions suitable for Ubuntu. +# See /lib/lsb/init-functions for usage help. +LOG_DAEMON_MSG="" + +log_use_plymouth () { + if [ "${loop:-n}" = y ]; then + return 1 + fi + plymouth --ping >/dev/null 2>&1 +} + +log_success_msg () { + echo " * $@" +} + +log_failure_msg () { + if log_use_fancy_output; then + RED=`$TPUT setaf 1` + NORMAL=`$TPUT op` + echo " $RED*$NORMAL $@" + else + echo " * $@" + fi +} + +log_warning_msg () { + if log_use_fancy_output; then + YELLOW=`$TPUT setaf 3` + NORMAL=`$TPUT op` + echo " $YELLOW*$NORMAL $@" + else + echo " * $@" + fi +} + +log_begin_msg () { + log_daemon_msg "$1" +} + +log_daemon_msg () { + if [ -z "$1" ]; then + return 1 + fi + + if log_use_fancy_output && $TPUT xenl >/dev/null 2>&1; then + COLS=`$TPUT cols` + if [ "$COLS" ] && [ "$COLS" -gt 6 ]; then + COL=`$EXPR $COLS - 7` + else + COLS=80 + COL=73 + fi + + if log_use_plymouth; then + # If plymouth is running, don't output anything at this time + # to avoid buffering problems (LP: #752393) + if [ -z "$LOG_DAEMON_MSG" ]; then + LOG_DAEMON_MSG=$* + return + fi + fi + + # We leave the cursor `hanging' about-to-wrap (see terminfo(5) + # xenl, which is approximately right). That way if the script + # prints anything then we will be on the next line and not + # overwrite part of the message. + + # Previous versions of this code attempted to colour-code the + # asterisk but this can't be done reliably because in practice + # init scripts sometimes print messages even when they succeed + # and we won't be able to reliably know where the colourful + # asterisk ought to go. + + printf " * $* " + # Enough trailing spaces for ` [fail]' to fit in; if the message + # is too long it wraps here rather than later, which is what we + # want. + $TPUT hpa `$EXPR $COLS - 1` + printf ' ' + else + echo " * $@" + COL= + fi +} + +log_progress_msg () { + : +} + +log_end_msg () { + if [ -z "$1" ]; then + return 1 + fi + + if [ "$COL" ] && [ -x "$TPUT" ]; then + # If plymouth is running, print previously stored output + # to avoid buffering problems (LP: #752393) + if log_use_plymouth; then + if [ -n "$LOG_DAEMON_MSG" ]; then + log_daemon_msg $LOG_DAEMON_MSG + LOG_DAEMON_MSG="" + fi + fi + + printf "\r" + $TPUT hpa $COL + if [ "$1" -eq 0 ]; then + echo "[ OK ]" + else + printf '[' + $TPUT setaf 1 # red + printf fail + $TPUT op # normal + echo ']' + fi + else + if [ "$1" -eq 0 ]; then + echo " ...done." + else + echo " ...fail!" + fi + fi + return $1 +} + +log_action_msg () { + echo " * $@" +} + +log_action_begin_msg () { + log_daemon_msg "$@..." +} + +log_action_cont_msg () { + log_daemon_msg "$@..." +} + +log_action_end_msg () { + # In the future this may do something with $2 as well. + log_end_msg "$1" || true +} diff -Nru lsb-4.1+Debian12/lsb_debian.egg-info/dependency_links.txt lsb-4.1.parsix.6/lsb_debian.egg-info/dependency_links.txt --- lsb-4.1+Debian12/lsb_debian.egg-info/dependency_links.txt 1970-01-01 00:00:00.000000000 +0000 +++ lsb-4.1.parsix.6/lsb_debian.egg-info/dependency_links.txt 2013-10-20 05:47:08.000000000 +0000 @@ -0,0 +1 @@ + diff -Nru lsb-4.1+Debian12/lsb_debian.egg-info/PKG-INFO lsb-4.1.parsix.6/lsb_debian.egg-info/PKG-INFO --- lsb-4.1+Debian12/lsb_debian.egg-info/PKG-INFO 1970-01-01 00:00:00.000000000 +0000 +++ lsb-4.1.parsix.6/lsb_debian.egg-info/PKG-INFO 2013-10-20 05:47:08.000000000 +0000 @@ -0,0 +1,10 @@ +Metadata-Version: 1.0 +Name: lsb-debian +Version: 4.1-Debian2- +Summary: LSB compatibility layer for Debian +Home-page: http://packages.qa.debian.org/lsb +Author: UNKNOWN +Author-email: UNKNOWN +License: UNKNOWN +Description: UNKNOWN +Platform: UNKNOWN diff -Nru lsb-4.1+Debian12/lsb_debian.egg-info/SOURCES.txt lsb-4.1.parsix.6/lsb_debian.egg-info/SOURCES.txt --- lsb-4.1+Debian12/lsb_debian.egg-info/SOURCES.txt 1970-01-01 00:00:00.000000000 +0000 +++ lsb-4.1.parsix.6/lsb_debian.egg-info/SOURCES.txt 2013-10-20 05:47:08.000000000 +0000 @@ -0,0 +1,6 @@ +setup.py +lsb_debian.egg-info/PKG-INFO +lsb_debian.egg-info/SOURCES.txt +lsb_debian.egg-info/dependency_links.txt +lsb_debian.egg-info/top_level.txt +test/test_lsb_release.py \ No newline at end of file diff -Nru lsb-4.1+Debian12/lsb_debian.egg-info/top_level.txt lsb-4.1.parsix.6/lsb_debian.egg-info/top_level.txt --- lsb-4.1+Debian12/lsb_debian.egg-info/top_level.txt 1970-01-01 00:00:00.000000000 +0000 +++ lsb-4.1.parsix.6/lsb_debian.egg-info/top_level.txt 2013-10-20 05:47:08.000000000 +0000 @@ -0,0 +1 @@ + diff -Nru lsb-4.1+Debian12/lsb_release.py lsb-4.1.parsix.6/lsb_release.py --- lsb-4.1+Debian12/lsb_release.py 2013-06-05 10:32:36.000000000 +0000 +++ lsb-4.1.parsix.6/lsb_release.py 2014-07-02 19:08:42.000000000 +0000 @@ -257,7 +257,6 @@ def guess_debian_release(): distinfo = {} - distinfo['ID'] = 'Debian' # Use /etc/dpkg/origins/default to fetch the distribution name etc_dpkg_origins_default = os.environ.get('LSB_ETC_DPKG_ORIGINS_DEFAULT','/etc/dpkg/origins/default') if os.path.exists(etc_dpkg_origins_default): @@ -284,29 +283,15 @@ distinfo['OS'] = kern else: distinfo['OS'] = 'GNU' + + distinfo['ID'] = 'Parsix' distinfo['DESCRIPTION'] = '%(ID)s %(OS)s' % distinfo - etc_debian_version = os.environ.get('LSB_ETC_DEBIAN_VERSION','/etc/debian_version') - if os.path.exists(etc_debian_version): - try: - with open(etc_debian_version) as debian_version: - release = debian_version.read().strip() - except IOError as msg: - print('Unable to open ' + etc_debian_version + ':', str(msg), file=sys.stderr) - release = 'unknown' - - if not release[0:1].isalpha(): - # /etc/debian_version should be numeric - codename = lookup_codename(release, 'n/a') - distinfo.update({ 'RELEASE' : release, 'CODENAME' : codename }) - elif release.endswith('/sid'): - if release.rstrip('/sid').lower().isalpha() != 'testing': - global TESTING_CODENAME - TESTING_CODENAME = release.rstrip('/sid') - distinfo['RELEASE'] = 'testing/unstable' - else: - distinfo['RELEASE'] = release + # Override + distinfo['RELEASE'] = '7.0'; + distinfo['CODENAME'] = 'nestor' + distinfo['OS'] = 'GNU/Linux' # Only use apt information if we did not get the proper information # from /etc/debian_version or if we don't have a codename