diff --git a/woof-distro/x86/slackware/s15pup32/DISTRO_PET_REPOS b/woof-distro/x86/slackware/s15pup32/DISTRO_PET_REPOS index 7718c21dc2d..a2f3daa55b2 100644 --- a/woof-distro/x86/slackware/s15pup32/DISTRO_PET_REPOS +++ b/woof-distro/x86/slackware/s15pup32/DISTRO_PET_REPOS @@ -15,6 +15,7 @@ fi PKG_DOCS_PET_REPOS=" z|http://smokey01.com/peebee/s15pup/Packages-puppy-s15pup-extra|z +z|https://raw.githubusercontent.com/puppylinux-woof-CE/woof-CE/${WCE_BRANCH}/woof-distro/x86/${DISTRO_BINARY_COMPAT}/15.0/Packages-puppy-slacko15.0-official|z z|https://raw.githubusercontent.com/puppylinux-woof-CE/woof-CE/${WCE_BRANCH}/woof-distro/x86/${DISTRO_BINARY_COMPAT}/14.2/Packages-puppy-slacko14.2-official|z z|https://raw.githubusercontent.com/puppylinux-woof-CE/woof-CE/${WCE_BRANCH}/woof-distro/x86/Packages-puppy-common32-official|z z|https://raw.githubusercontent.com/puppylinux-woof-CE/woof-CE/${WCE_BRANCH}/woof-distro/Packages-puppy-noarch-official|z @@ -48,6 +49,7 @@ z|http://mirror.internode.on.net/pub/puppylinux|Packages-puppy-*-official PACKAGELISTS_PET_ORDER=" Packages-puppy-s15pup-extra +Packages-puppy-slacko15.0-official Packages-puppy-common32-official Packages-puppy-slacko14.2-official Packages-puppy-noarch-official diff --git a/woof-distro/x86/slackware/s15pup32/DISTRO_PKGS_SPECS-slackware-15.0 b/woof-distro/x86/slackware/s15pup32/DISTRO_PKGS_SPECS-slackware-15.0 index b773f45e9c5..0e101052dab 100644 --- a/woof-distro/x86/slackware/s15pup32/DISTRO_PKGS_SPECS-slackware-15.0 +++ b/woof-distro/x86/slackware/s15pup32/DISTRO_PKGS_SPECS-slackware-15.0 @@ -151,7 +151,7 @@ yes|gmp|gmp|exe,dev,doc,nls no|gmtk||exe,dev,doc,nls yes|gnome-icon-theme||exe>dev,dev,doc,nls| #too bloated for main fs so send to devx, needed to compile some progs no|gnome-menus||exe,dev,doc,nls # petbuild -yes|gnome-mplayer||exe,dev,doc,nls +yes|gnome-mplayer||exe,dev,doc,nls|pet:common32 no|gnumeric||exe,dev,doc,nls # petbuild yes|gnutls|gnutls,nettle,p11-kit|exe,dev,doc,nls yes|goffice|goffice|exe,dev,doc,nls diff --git a/woof-distro/x86/slackware/s15pup32/_00build.conf b/woof-distro/x86/slackware/s15pup32/_00build.conf index 08ce7253e0d..af6c86683f3 100644 --- a/woof-distro/x86/slackware/s15pup32/_00build.conf +++ b/woof-distro/x86/slackware/s15pup32/_00build.conf @@ -180,7 +180,7 @@ cp etc/DISTRO_SPECS ../build # copy adrv, fdrv and README into iso cp ../README-extra_sfs ../*drv*.sfs ../build # fix PPM -echo \"PKG_REPOS_ENABLED=\' Packages-puppy-slacko14.2-official Packages-puppy-noarch-official Packages-puppy-s15pup-extra Packages-slackware-15.0-official Packages-slackware-15.0-extra \'\" >> var/packages/PKGS_MANAGEMENT +echo \"PKG_REPOS_ENABLED=\' Packages-puppy-slacko15.0-official Packages-puppy-noarch-official Packages-puppy-s15pup-extra Packages-slackware-15.0-official Packages-slackware-15.0-extra \'\" >> var/packages/PKGS_MANAGEMENT # cursor default link rm root/.icons/default && ln -s Premium root/.icons/default # fix pcur - hide Apply button diff --git a/woof-distro/x86_64/slackware64/s15pup64/DISTRO_PET_REPOS b/woof-distro/x86_64/slackware64/s15pup64/DISTRO_PET_REPOS index 19a841d04ac..111aee34d07 100644 --- a/woof-distro/x86_64/slackware64/s15pup64/DISTRO_PET_REPOS +++ b/woof-distro/x86_64/slackware64/s15pup64/DISTRO_PET_REPOS @@ -15,6 +15,7 @@ fi PKG_DOCS_PET_REPOS=" z|http://smokey01.com/peebee/s15pup/Packages-puppy-s15pup64-extra|z +z|https://raw.githubusercontent.com/puppylinux-woof-CE/woof-CE/${WCE_BRANCH}/woof-distro/x86_64/slackware64/15.0/Packages-puppy-slacko6415.0-official|z z|https://raw.githubusercontent.com/puppylinux-woof-CE/woof-CE/${WCE_BRANCH}/woof-distro/x86_64/slackware64/14.2/Packages-puppy-slacko6414.2-official|z z|https://raw.githubusercontent.com/puppylinux-woof-CE/woof-CE/${WCE_BRANCH}/woof-distro/x86_64/Packages-puppy-common64-official|z z|https://raw.githubusercontent.com/puppylinux-woof-CE/woof-CE/${WCE_BRANCH}/woof-distro/Packages-puppy-noarch-official|z @@ -52,6 +53,7 @@ z|http://mirror.internode.on.net/pub/puppylinux|Packages-puppy-*-official PACKAGELISTS_PET_ORDER=" Packages-puppy-s15pup64-extra +Packages-puppy-slacko6415.0-official Packages-puppy-common64-official Packages-puppy-slacko6414.2-official Packages-puppy-noarch-official diff --git a/woof-distro/x86_64/slackware64/s15pup64/DISTRO_PKGS_SPECS-slackware64-15.0 b/woof-distro/x86_64/slackware64/s15pup64/DISTRO_PKGS_SPECS-slackware64-15.0 index 489d171e6c8..7832661f6af 100644 --- a/woof-distro/x86_64/slackware64/s15pup64/DISTRO_PKGS_SPECS-slackware64-15.0 +++ b/woof-distro/x86_64/slackware64/s15pup64/DISTRO_PKGS_SPECS-slackware64-15.0 @@ -148,7 +148,7 @@ yes|gmeasures||exe,dev>null,doc,nls yes|gmp|gmp|exe,dev,doc,nls no|gmtk||exe,dev,doc,nls no|gnome-menus||exe,dev,doc,nls # petbuild -yes|gnome-mplayer||exe,dev,doc,nls +yes|gnome-mplayer||exe,dev,doc,nls|pet:common64 no|gnumeric||exe,dev,doc,nls # petbuild yes|gnutls|gnutls,nettle,p11-kit|exe,dev,doc,nls yes|goffice|goffice|exe,dev,doc,nls diff --git a/woof-distro/x86_64/slackware64/s15pup64/_00build.conf b/woof-distro/x86_64/slackware64/s15pup64/_00build.conf index a754c2e672a..7c50ee051ea 100644 --- a/woof-distro/x86_64/slackware64/s15pup64/_00build.conf +++ b/woof-distro/x86_64/slackware64/s15pup64/_00build.conf @@ -180,7 +180,7 @@ cp etc/DISTRO_SPECS ../build # copy adrv, fdrv and README into iso cp ../README-extra_sfs ../*drv*.sfs ../build # fix PPM -echo \"PKG_REPOS_ENABLED=\' Packages-puppy-slacko6414.2-official Packages-puppy-noarch-official Packages-puppy-s15pup64-extra Packages-slackware64-15.0-official Packages-slackware64-15.0-salix \'\" >> var/packages/PKGS_MANAGEMENT +echo \"PKG_REPOS_ENABLED=\' Packages-puppy-slacko6415.0-official Packages-puppy-noarch-official Packages-puppy-s15pup64-extra Packages-slackware64-15.0-official Packages-slackware64-15.0-salix \'\" >> var/packages/PKGS_MANAGEMENT # cursor default link rm root/.icons/default && ln -s Premium root/.icons/default # fix pcur - hide Apply button