From 1045ba463e4b37570ec9b601a48b922948a32bda Mon Sep 17 00:00:00 2001 From: slakmagik Date: Mon, 24 May 2010 22:32:33 +0000 Subject: [PATCH] tag and release version 0.33.0 --- ChangeLog-current.txt | 28 ++---------------- src/usr/doc/ChangeLog.txt | 30 ++++++++++++++++++++ tools/current-download | 2 +- tools/current-package | 2 +- tools/current-source | 2 +- tools/current-version | 2 +- tools/sbopkg-conf5.html | 14 ++++----- tools/sbopkg-help | 20 ++++++------- tools/sbopkg.SlackBuild | 2 +- tools/sbopkg8.html | 60 +++++++++++++++++++++++++-------------- 10 files changed, 92 insertions(+), 70 deletions(-) diff --git a/ChangeLog-current.txt b/ChangeLog-current.txt index 34882d8..fb53b42 100644 --- a/ChangeLog-current.txt +++ b/ChangeLog-current.txt @@ -1,30 +1,6 @@ -Fri Mar 5 21:46:41 UTC 2010 +Mon May 24 20:53:43 UTC 2010 Sbopkg 0.XX.X released. This version contains the following fixes and enhancements: - * Addressed an apparent bash 4.1 bug that causes the 'obsolete sources' - function to break. - * Addressed issue 44 where hitting ^C during the download of part of a queue - and restarting the queue could result in a download failure. Thanks to - slava18 for the report. - * Changed the menu order of the "Build options" dialog to default to using - "Saved" options rather than "None". - * Fixed issue 45 where packages with '+' in the name were not properly - detected in some cases. Thanks to skalkoto for the report. - * Added a help item to the main menu of the dialog interface with pointers - to documentation and other resources. - * Added an option to print the version of sbopkg. We try not to change the - meaning of flags but note that this does change what was the '-v' flag to - '-V' and now uses '-v' for its customary 'version' purpose. Note that the - new -V flag now accepts a '?' argument (sbopkg -V ?) which will display - the list of valid repositories. - * Tweak the logic re determining ARCH and modify some ARCH-related - evals and conditionals in check_for_updates and info_item. - * Fixed a bug which could result in some sources being missed when checking - for obsolete sources. - * Added a command line option '-P' to access the 'remove uninstalled - packages' function which had previously only been accessible from the - dialog interface. - * Miscellaneous tweaks in preparation for release and to bring in line with - Slackware 13.1. + * +--------------------------+ diff --git a/src/usr/doc/ChangeLog.txt b/src/usr/doc/ChangeLog.txt index 9a5a460..64c66a7 100644 --- a/src/usr/doc/ChangeLog.txt +++ b/src/usr/doc/ChangeLog.txt @@ -1,3 +1,33 @@ +Mon May 24 20:53:43 UTC 2010 +Sbopkg 0.33.0 released. This version contains the following fixes and +enhancements: + + * Addressed an apparent bash 4.1 bug that causes the 'obsolete sources' + function to break. + * Addressed issue 44 where hitting ^C during the download of part of a queue + and restarting the queue could result in a download failure. Thanks to + slava18 for the report. + * Changed the menu order of the "Build options" dialog to default to using + "Saved" options rather than "None". + * Fixed issue 45 where packages with '+' in the name were not properly + detected in some cases. Thanks to skalkoto for the report. + * Added a help item to the main menu of the dialog interface with pointers + to documentation and other resources. + * Added an option to print the version of sbopkg. We try not to change the + meaning of flags but note that this does change what was the '-v' flag to + '-V' and now uses '-v' for its customary 'version' purpose. Note that the + new -V flag now accepts a '?' argument (sbopkg -V ?) which will display + the list of valid repositories. + * Tweak the logic re determining ARCH and modify some ARCH-related + evals and conditionals in check_for_updates and info_item. + * Fixed a bug which could result in some sources being missed when checking + for obsolete sources. + * Added a command line option '-P' to access the 'remove uninstalled + packages' function which had previously only been accessible from the + dialog interface. + * Miscellaneous tweaks in preparation for release and to bring in line with + Slackware 13.1. ++--------------------------+ Fri Mar 5 21:29:21 UTC 2010 Sbopkg 0.32.0 released. This version contains the following fixes and enhancements: diff --git a/tools/current-download b/tools/current-download index 089e91c..d55713a 100644 --- a/tools/current-download +++ b/tools/current-download @@ -1 +1 @@ -http://sbopkg.googlecode.com/files/sbopkg-0.32.0-noarch-1_cng.tgz +http://sbopkg.googlecode.com/files/sbopkg-0.33.0-noarch-1_cng.tgz diff --git a/tools/current-package b/tools/current-package index 6b0fa86..c35226c 100644 --- a/tools/current-package +++ b/tools/current-package @@ -1 +1 @@ -sbopkg-0.32.0-noarch-1_cng.tgz +sbopkg-0.33.0-noarch-1_cng.tgz diff --git a/tools/current-source b/tools/current-source index 374ec80..5a81314 100644 --- a/tools/current-source +++ b/tools/current-source @@ -1 +1 @@ -sbopkg-0.32.0.tar.gz +sbopkg-0.33.0.tar.gz diff --git a/tools/current-version b/tools/current-version index 9eb2aa3..be386c9 100644 --- a/tools/current-version +++ b/tools/current-version @@ -1 +1 @@ -0.32.0 +0.33.0 diff --git a/tools/sbopkg-conf5.html b/tools/sbopkg-conf5.html index ad5da0b..8ac8731 100644 --- a/tools/sbopkg-conf5.html +++ b/tools/sbopkg-conf5.html @@ -3,7 +3,7 @@ Content-type: text/html Manpage of SBOPKG.CONF

SBOPKG.CONF

-Section: (5)
Updated: February 2010
Index +Section: (5)
Updated: May 2010
Index Return to Main Contents
  @@ -55,14 +55,14 @@ REPO_NAME=${REPO_NAME:-SBo}.
This option allows the user to set the default active repository -branch. The current options are 11.0, 12.0, 12.1, 12.2, and 13.0 for -the SBo repository, master for the SB64 repositort and local for the -local repository. +branch. The current options are 11.0, 12.0, 12.1, 12.2, 13.0, and +13.1 for the SBo repository and local for the local repository. The +Slamd64Builds repository is 'master' but is not officially supported.

The default value of REPO_BRANCH is:
-REPO_BRANCH=${REPO_BRANCH:-13.0}. +REPO_BRANCH=${REPO_BRANCH:-13.1}.

REPO_ROOT @@ -286,7 +286,7 @@ these default options is not recommended. The default value of WGETFLAGS is:
-"--continue --progress-bar --timeout=15 --tries=5". +"--continue --progress-bar:force --timeout=15 --tries=5".

DIFF @@ -406,6 +406,6 @@ README-repos.d document in the sbopkg doc/ directory for more information. This document was created by man2html, using the manual pages.
-Time: 21:44:48 GMT, March 05, 2010 +Time: 20:55:24 GMT, May 24, 2010 diff --git a/tools/sbopkg-help b/tools/sbopkg-help index 7140b57..94d0871 100644 --- a/tools/sbopkg-help +++ b/tools/sbopkg-help @@ -1,4 +1,4 @@ -sbopkg 0.32.0 +sbopkg 0.33.0 Usage: sbopkg [OPTIONS] Options are: -b pkg/queue(s) Build the specified package(s). If one or more queuefiles @@ -13,8 +13,9 @@ Options are: -i pkg/queue(s) Like '-b', but also install built packages. -k Skip installed packages when building. -l Display the repo's ChangeLog.txt and then quit. - -o Display the obsolete source files and prompt for deletion. - -p List installed repo's packages. + -o Display the obsolete source files & prompt for deletion. + -P List uninstalled cached package files & prompt for deletion. + -p List installed packages from active repo. -q Quiet some of the command-line output. -r Sync the remote repository with the local mirror and then quit. @@ -22,13 +23,10 @@ Options are: -s package(s) Specific search by specific package and, if found, display package information. -u Check for an update to sbopkg. - -v repo/branch Set the repository/branch (e.g. "-v SBo/13.0"). - If the repository name is not specified, sbopkg will first - try with the default one. If no match is found, sbopkg will - look for the first matching branch of any repository. - The default valid choices are SBo/{11.0,12.0,12.1,12.2,13.0} - for the SlackBuilds.org repository, SB64/master for the - builds.Slamd64.com repository and local/local for the local - repository). + -v Print sbopkg's version on stdout. + -V repo/branch Set the repository/branch. The repo is optional and, if + not given, sbopkg will try to make the best match, + starting with the default repo. For a list of valid repos, + issue '-V ?' Note: multiple arguments to -b, -g, -i, and -s must be quoted ("pkg1 pkg2") diff --git a/tools/sbopkg.SlackBuild b/tools/sbopkg.SlackBuild index 7549fc2..f4088cd 100644 --- a/tools/sbopkg.SlackBuild +++ b/tools/sbopkg.SlackBuild @@ -8,7 +8,7 @@ # SlackBuilds.org template. PRGNAM=sbopkg -VERSION=${VERSION:-0.32.0} +VERSION=${VERSION:-0.33.0} ARCH=${ARCH:-noarch} BUILD=${BUILD:-1} TAG=${TAG:-_cng} diff --git a/tools/sbopkg8.html b/tools/sbopkg8.html index 8ef8211..e602a39 100644 --- a/tools/sbopkg8.html +++ b/tools/sbopkg8.html @@ -3,7 +3,7 @@ Content-type: text/html Manpage of SBOPKG

SBOPKG

-Section: (8)
Updated: October 2009
Index +Section: (8)
Updated: May 2010
Index Return to Main Contents
  @@ -45,10 +45,17 @@ Before sbopkg can be used, a configuration file must be created at (5) for more information about the configuration file.

Sbopkg can be run from the command line by simply invoking "sbopkg." -Doing so will launch the dialog-based interface, and the menus -provided should be fairly self-explanatory. The main menu allows the -user to rsync with the SlackBuilds.org repository (currently, the size -of a local copy of the SBo repository is less than 50MB), view the +Sbopkg must be run as the root user (since the SlackBuild scripts at +SlackBuilds.org are written with the intention of being run as root). +Furthermore, using 'su -' instead of 'su' is strongly encouraged. +The reason is that some SlackBuild scripts rely on certain tools that +are only available in root's $PATH when root's $PATH is inherited +(i.e. texmf to build man pages) and root's $PATH is not inherited when +only using 'su'. In any evnet, invoking 'sbopkg' from the command +line will launch the dialog-based interface, and the menus provided +should be fairly self-explanatory. The main menu allows the user to +rsync with the SlackBuilds.org repository (currently, the size of a +local copy of the SBo repository is less than 50MB), view the SlackBuilds.org Changelog, check for potential updates to SBo packages, display the contents of the local cache directory where source tarballs are saved, display the permanent build log, and browse @@ -60,16 +67,16 @@ repository. Selecting a package will display another menu allowing the user to view the package's README, SlackBuild, .info, or slack-desc files. The user can also edit the .info file and SlackBuild and the edited files will remain after doing an rsync. -Additionally, the user can -choose to build a package as well using either the original SlackBuild -or the locally-edited one, if present. If using the dialog interface, -and if sbopkg finds a built package for a particular piece of software -in the OUTPUT directory, then sbopkg will automatically add a new menu -entry allowing the user to install the package if he so choosed. -Alternatively, the user can choose to automatically build or build and -install individual packages or several packages in a build queue. -Finally, if KEEPLOG is set to YES in the sbopkg.conf file then a -permanent log of the build process is saved in /tmp/sbopkg-build-log. +Additionally, the user can choose to build a package as well using +either the original SlackBuild or the locally-edited one, if present. +If using the dialog interface, and if sbopkg finds a built package for +a particular piece of software in the OUTPUT directory, then sbopkg +will automatically add a new menu entry allowing the user to install +the package if he so chose. Alternatively, the user can choose to +automatically build or build and install individual packages or +several packages in a build queue. Finally, if KEEPLOG is set to YES +in the sbopkg.conf file then a permanent log of the build process is +saved in /tmp/sbopkg-build-log.

Alternatively, sbopkg can be run from the command line without using the dialog interface. Executing "sbopkg -h" will display a list of @@ -223,6 +230,12 @@ used to identify the obsoleted sources, so if you build packages with different repositories (e.g. for different Slackware versions) the source files only used in the "other" repository will be listed.

+

-P + +
+List the cached package files which are not currently installed on the +system and optionally delete them. +

-p
@@ -262,24 +275,29 @@ will search for foo and then bar.
Check for an update to sbopkg itself and then quit.

-

-v VERSION +
-V REPO/BRANCH
Set the repository and branch to use.

-The currently supported repositories are SBo, SB64 and local. Inside -these, the supported branches are 11.0, 12.0, 12.1, 12.2, and 13.0 for -SBo, master for SB64 (Slamd64Builds repository) and local for local. +For a list of valid versions, invoke sbopkg as +sbopkg -V ?. + See the sbopkg.conf (5) man page for more information about the 'local' repository.

-The VERSION format is repository/branch (e.g. SBo/13.0). If the repository is +The VERSION format is repository/branch (e.g. SBo/13.1). If the repository is omitted, sbopkg will first look for the specified branch in the default repository. If that attempt fails, sbopkg will look for the first matching branch in any repository.

+

-v + +
+Prints the current version of sbopkg on stdout. +

 

FILES

@@ -338,6 +356,6 @@ Chess Griffin This document was created by man2html, using the manual pages.
-Time: 21:44:48 GMT, March 05, 2010 +Time: 20:55:24 GMT, May 24, 2010