see CHANGELOG

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@653 04377dda-e619-0410-9926-eae83683ac58

2 files changed, 22 insertions, 24 deletions

diff --git a/trunk/conf/repos.conf b/trunk/conf/repos.conf
index c6f806f..480a0f8 100644
--- a/trunk/conf/repos.conf
+++ b/trunk/conf/repos.conf
@@ -23,7 +23,7 @@ ROOT-powerpc="workaround%http://slackintosh.workaround.ch/pub/slackintosh/"
 ROOT-s390="ibiblio%http://distro.ibiblio.org/pub/linux/distributions/slack390/"
 
 # slamd64 root repositories
-#ROOT-x86_64="sarava%http://slack.sarava.org/slamd64/"
+#ROOT-x86_64="sarava%http://slack.sarava.org/packages/slamd64/"
 ROOT-x86_64="slackadelic%http://mirror1.slackadelic.com/slamd64/"
 ROOT-x86_64="heanet%http://ftp.heanet.ie/pub/slamd64/"
 
@@ -38,7 +38,3 @@ ROOT-x86_64="heanet%http://ftp.heanet.ie/pub/slamd64/"
 
 # noarch
 NOARCH="sarava%http://slack.sarava.org/packages/noarch"
-
-# i386 12.1
-REPOS-i386-12.1="sarava%http://slack.sarava.org/packages/slackware/slackware-12.1/"
-PATCHES-i386-12.1="sarava%http://slack.sarava.org/packages/slackware/slackware-12.1/patches/"
diff --git a/trunk/conf/simplepkg.conf b/trunk/conf/simplepkg.conf
index b10382c..fa5f863 100644
--- a/trunk/conf/simplepkg.conf
+++ b/trunk/conf/simplepkg.conf
@@ -12,11 +12,11 @@
 #---------------------------------------------------------------------
 # Default architecture: set this option if you dont want simplepkg
 # to use the value from /etc/slackware-version
-# DEFAULT_ARCH="i386"
+# DEFAULT_ARCH="i486"
 
 # Default version: set this option if you dont want simplepkg
 # to use the value from /etc/slackware-version
-# DEFAULT_VERSION="12.1"
+# DEFAULT_VERSION="12.2"
 
 # Temporary folder
 TMP="/tmp"
@@ -25,20 +25,23 @@ TMP="/tmp"
 #                   MKBUILD AND CREATEPKG SECTION
 #---------------------------------------------------------------------
 
-# Set SlackBuilds default directory for scripts
-SLACKBUILDS_DIR="/var/simplepkg/slackbuilds"
-
 # Set default directory for mkbuilds
 MKBUILDS_DIR="/var/simplepkg/mkbuilds"
 
-# Set SlackBuilds svn default repository
-SLACKBUILDS_SVN="http://slack.sarava.org/slackbuilds"
+# Set SlackBuilds default directory for scripts
+SLACKBUILDS_DIR="/var/simplepkg/slackbuilds"
+
+# Set packages default repository directory
+PACKAGES_DIR="/var/simplepkg/repos"
 
 # Set mkbuilds svn default repository
 MKBUILDS_SVN="http://slack.sarava.org/mkbuilds"
 
-# Set binaries default repository directory
-MAKEPKG_REPOS="/var/simplepkg/repos"
+# Set SlackBuilds svn default repository
+SLACKBUILDS_SVN="http://slack.sarava.org/slackbuilds"
+
+# Set packages svn default repository
+PACKAGES_SVN="http://slack.sarava.org/packages"
 
 # Set the binaries default repository nested folder, useful if you manage
 # packages from different distribution versions and architectures in the
@@ -50,19 +53,19 @@ MAKEPKG_REPOS="/var/simplepkg/repos"
 #
 # Default value is "distro/distro-version" and you should change this just
 # if you know what are you doing.
-MAKEPKG_REPOS_STYLE="distro/distro-version"
+PACKAGES_REPOS_STYLE="distro/distro-version"
 
 # Se this to "yes" if you want createpkg to put noarch packages also in
 # a noarch/ folder.
-MAKEPKG_REPOS_NOARCH="off"
+PACKAGES_REPOS_NOARCH="on"
 
-# If your binary repository is under svn and you plan to manage it with an
+# If your packages repository is under svn and you plan to manage it with an
 # user different than root, then set this parameter with the username
 # owning the repository working copy.
-MAKEPKG_SVN_USER=""
+PACKAGES_SVN_USER=""
 
 # Same as the previous option, but for svn repository group.
-MAKEPKG_SVN_GROUP=""
+PACKAGES_SVN_GROUP=""
 
 # If your mkbuild and slackbuild repositories is under svn and you plan to
 # manage it with an user different than root, then set this parameter with the
@@ -75,15 +78,14 @@ MKBUILDS_SVN_GROUP=""
 # Set sources default directory
 SOURCE_DIR="/var/simplepkg/sources"
 
-# Set color style
-# possible values are: color,gray, none
+# Set color style. Possible values are: color,gray, none.
 COLOR_MODE="none"
 
-# Createpkg architecture
-CREATE_ARCH="i486"
+# Createpkg architecture. Use this to force createpkg to a given arch.
+# CREATEPKG_ARCH="i486"
 
 # Remove build files
-CREATE_CLEANUP="yes"
+CREATEPKG_CLEANUP="yes"
 
 # Remove old packages from repository tree by createpkg
 REMOVE_OLD_PACKAGE="off"