From ab937e6d34ad568156b9ed52456ccea3f9ba8ab0 Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Wed, 1 Oct 2014 20:37:51 +0300 Subject: [PATCH] updated for version 1.9.4 --- CHANGELOG | 8 +++++ INSTALL | 6 ++-- PKG-INFO | 2 +- README.rst | 62 ++++++++++++++++++------------------- install.sh | 2 +- man/slpkg.8 | 46 +++++++++++++-------------- requirements.txt | 7 +++-- slackbuild/slpkg.SlackBuild | 2 +- slackbuild/slpkg.info | 4 +-- 9 files changed, 74 insertions(+), 65 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index bf143d98..c1a34f04 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,11 @@ +Version 1.9.4 +01-10-2014 + +[Feature] - Added support install packages from Slackware current (version) + repository. + Added support upgrade current version. (Upgrade all Slackware current tree) +[Updated] - Fix arguments. + Version 1.9.3 29-09-2014 diff --git a/INSTALL b/INSTALL index 0310ac0c..d89a9efd 100644 --- a/INSTALL +++ b/INSTALL @@ -5,10 +5,8 @@ Installation Python & OS Support ------------------- -slpkg works with Python versions 2.7.5+ -slpkg works on Slackware stable distribution. - -Slackware current not support yet. +slpkg works with Python versions 2.7.5+ (Python 3 not supported yet) +slpkg works on Slackware distribution. Install slpkg ------------- diff --git a/PKG-INFO b/PKG-INFO index 08240750..3203288e 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: slpkg -Version: 1.9.3 +Version: 1.9.4 Author: dslackw Author-email: d zlatanidis at gmail com Maintainer: dslackw diff --git a/README.rst b/README.rst index a690a36c..f11d6fcb 100644 --- a/README.rst +++ b/README.rst @@ -7,9 +7,9 @@ Latest Release: -- Version: 1.9.3 +- Version: 1.9.4 - `Package `_ -- `Source `_ +- `Source `_ - `CHANGELOG `_ .. image:: https://raw.githubusercontent.com/dslackw/images/master/slpkg/logo.png @@ -98,15 +98,15 @@ Untar the archive and run install.sh script: .. code-block:: bash - $ tar xvf slpkg-1.9.3.tar.gz - $ cd slpkg-1.9.3 + $ tar xvf slpkg-1.9.4.tar.gz + $ cd slpkg-1.9.4 $ ./install.sh Using `pip `_ : .. code-block:: bash - $ pip install slpkg + $ pip install --upgrade slpkg uninstall: @@ -124,32 +124,32 @@ Command Line Tool Usage Utility for easy management packages in Slackware Optional arguments: - -h, --help show this help message and exit - -v, --version print version and exit - -a, script [source...] auto build packages - -l, all, sbo, slack, noarch list of installed packages - -c, --upgrade check if your packages is up to date - -s, download, build & install packages - -f, find installed packages - -t, packages tracking dependencies from SBo - -n, view packages from SBo repository - -b, --list blacklisted packages - -b [package...] --add --remove add, remove packages in blacklist - -i, [package...] install binary packages - -u, [package...] upgrade binary packages - -o, [package...] reinstall binary packages - -r, [package...] remove binary packages - -d, [package...] display the contents of the packages + -h, --help show this help message and exit + -v, --version print version and exit + -a, script [source...] auto build packages + -l, all, sbo, slack, noarch list of installed packages + -c, --upgrade --current check if your packages is up to date + -s, --current download, build & install packages + -f, find installed packages + -t, packages tracking dependencies from SBo + -n, view packages from SBo repository + -b, --list blacklisted packages + -b [package...] --add --remove add, remove packages in blacklist + -i, [package...] install binary packages + -u, [package...] upgrade binary packages + -o, [package...] reinstall binary packages + -r, [package...] remove binary packages + -d, [package...] display the contents of the packages Repositories: SlackBuilds = sbo - Slackware = slack + Slackware = slack '--current' Slpkg Examples -------------- -Find package from slackbuilds.org download, +Find packages from slackbuilds.org download, build and install with all dependencies : .. code-block:: bash @@ -202,11 +202,11 @@ build and install with all dependencies : Find packages from `Slackware official mirrors `_ -download and install: +download and install (use '--current' to switch in current repository): .. code-block:: bash - $ slpkg -s slack mozilla + $ slpkg -s slack mozilla (add '--current' to switch in current version) Packages with name matching [ mozilla ] Reading package lists ..............................Done @@ -281,11 +281,11 @@ Check if your packages is up to date from slackbuilds.org: Would you like to upgrade [Y/n]? Check if your distribution is up to date from `Slackware official mirrors -`_ +`_ (use '--current' to switch in current repository): .. code-block:: bash - $ slpkg -c slack --upgrade + $ slpkg -c slack --upgrade (add '--current' to switch in current version) Reading package lists .......Done These packages need upgrading: @@ -329,7 +329,7 @@ Find packages from slackbuilds.org: Install Download/Build/Install Quit Quit - > _ + Choose an option: _ Auto tool to build package: @@ -580,12 +580,12 @@ Remove packages with all dependencies: +============================================================================== -Using the blacklist file manually from /etc/slpkg/blacklist or -with the following options: +Add packages in blacklist file manually from +/etc/slpkg/blacklist or with the following options: .. code-block:: bash - $ slpkg -b live554 speex faac --add + $ slpkg -b live555 speex faac --add Add packages in blacklist: diff --git a/install.sh b/install.sh index 8dc5f26d..6ab7e631 100755 --- a/install.sh +++ b/install.sh @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=slpkg -VERSION=${VERSION:-1.9.3} +VERSION=${VERSION:-1.9.4} TAG=${TAG:-_dsw} cd .. diff --git a/man/slpkg.8 b/man/slpkg.8 index 55e11e3e..7dcba724 100644 --- a/man/slpkg.8 +++ b/man/slpkg.8 @@ -17,8 +17,8 @@ slpkg - Utility for easy management packages in Slackware .SH SYNOPSIS \fBUsage: slpkg [-h] [-v] [-a script [sources...]] [-l all, sbo, slack, noarch] - [-c --upgrade] - [-s ] + [-c --upgrade --current] + [-s --current] [-f] [-t] [-n] [-i [...]] [-u [...]] [-o [...]] [-r [...]] [-d [...]]\fp @@ -30,26 +30,26 @@ It's a quick and easy way to manage your packages in slackware to a command. \fBUtility for easy management packages in Slackware Optional arguments: - -h, --help show this help message and exit - -v, --version print version and exit - -a, script [source...] auto build packages - -l, all, sbo, slack, noarch list of installed packages - -c, --upgrade check if your packages is up to date - -s, download, build & install packages - -f, find installed packages - -t, packages tracking dependencies from SBo - -n, view packages from SBo repository - -b, --list blacklisted packages - -b [package...] --add --remove add, remove packages in blacklist - -i, [package...] install binary packages - -u, [package...] upgrade binary packages - -o, [package...] reinstall binary packages - -r, [package...] remove binary packages - -d, [package...] display the contents of the packages + -h, --help show this help message and exit + -v, --version print version and exit + -a, script [source...] auto build packages + -l, all, sbo, slack, noarch list of installed packages + -c, --upgrade --current check if your packages is up to date + -s, --current download, build & install packages + -f, find installed packages + -t, packages tracking dependencies from SBo + -n, view packages from SBo repository + -b, --list blacklisted packages + -b [package...] --add --remove add, remove packages in blacklist + -i, [package...] install binary packages + -u, [package...] upgrade binary packages + -o, [package...] reinstall binary packages + -r, [package...] remove binary packages + -d, [package...] display the contents of the packages Repositories: SlackBuilds = sbo - Slackware = slack\fP + Slackware = slack '--current'\fP .SH GLOBAL OPTIONS .TP @@ -68,16 +68,16 @@ With this argument, build slackware package from source quickly and easy. Four display options list, sbo, slack, noarch and all packages items that are installed on the system. .SS -c , check if your packages is up to date -\fBslpkg\fP \fB-c\fP <\fIrepository\fP> \fI--upgrade\fP +\fBslpkg\fP \fB-c\fP <\fIrepository\fP> \fI--upgrade\fP \fI--current\fP .PP Check your packages from Slackware official mirrors or from -slackbuilds.org is up to date. +slackbuilds.org is up to date. Use '--current' to switch in current repository. .SS -s , download, build and install package with all dependencies -\fBslpkg\fP \fB-s\fP <\fIrepository\fP> <\fIname of package\fP> +\fBslpkg\fP \fB-s\fP <\fIrepository\fP> <\fIname of package\fP> \fI--current\fP .PP Installs or upgrade packages from the repository slackbuilds.org automatically resolving all dependencies of the package. Also installs the official distribution Slackware -packages. +packages. Use '--current' to install packages from Slackware current repository. .SS -f find packages \fBslpkg\fP \fB-f\fP <\fIname of packages\fP> .PP diff --git a/requirements.txt b/requirements.txt index 753d12bf..ffb8615c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,5 +2,8 @@ # GNU wget # Slackware 32 x86 # Slackware 64 x86_64 -# Slackware current (not supported yet) - +# Slackware current +# +# NOTE from SlackBuilds.org FAQ(15): +# Slackware -current is not supported, but as a general rule, the scripts +# should work on it as well. diff --git a/slackbuild/slpkg.SlackBuild b/slackbuild/slpkg.SlackBuild index 3e00ceb8..129ed376 100755 --- a/slackbuild/slpkg.SlackBuild +++ b/slackbuild/slpkg.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=slpkg -VERSION=${VERSION:-1.9.3} +VERSION=${VERSION:-1.9.4} BUILD=${BUILD:-1} TAG=${TAG:-_dsw} diff --git a/slackbuild/slpkg.info b/slackbuild/slpkg.info index c22d9e43..2b2a8863 100644 --- a/slackbuild/slpkg.info +++ b/slackbuild/slpkg.info @@ -1,7 +1,7 @@ PRGNAM="slpkg" -VERSION="1.9.3" +VERSION="1.9.4" HOMEPAGE="https://github.com/dslackw/slpkg" -DOWNLOAD="https://github.com/dslackw/slpkg/archive/v1.9.3.tar.gz" +DOWNLOAD="https://github.com/dslackw/slpkg/archive/v1.9.4.tar.gz" MD5SUM="" DOWNLOAD_x86_64="" MD5SUM_x86_64=""