{"comment":{"url":"https://api.github.com/repos/puppylinux-woof-CE/woof-CE/comments/13862417","html_url":"https://github.com/puppylinux-woof-CE/woof-CE/commit/e75d46f12394750ad3c396923ed476c1d70887a0#commitcomment-13862417","id":13862417,"user":{"login":"01micko","id":1019119,"avatar_url":"https://avatars.githubusercontent.com/u/1019119?v=3","gravatar_id":"","url":"https://api.github.com/users/01micko","html_url":"https://github.com/01micko","followers_url":"https://api.github.com/users/01micko/followers","following_url":"https://api.github.com/users/01micko/following{/other_user}","gists_url":"https://api.github.com/users/01micko/gists{/gist_id}","starred_url":"https://api.github.com/users/01micko/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/01micko/subscriptions","organizations_url":"https://api.github.com/users/01micko/orgs","repos_url":"https://api.github.com/users/01micko/repos","events_url":"https://api.github.com/users/01micko/events{/privacy}","received_events_url":"https://api.github.com/users/01micko/received_events","type":"User","site_admin":false},"position":null,"line":null,"path":"","commit_id":"e75d46f12394750ad3c396923ed476c1d70887a0","created_at":"2015-10-20T00:13:55Z","updated_at":"2015-10-20T00:13:55Z","body":"Ok, found that one too, because they don't belong in x86_64\r\n\r\nHere is the merge result from a dry run merging tedting >> fdrv\r\n\r\n```shell\r\n# git status\r\n# On branch testing\r\nnothing to commit, working directory clean\r\n# git checkout fdrv\r\nSwitched to branch 'fdrv'\r\n# git merge testing\r\nRemoving woof-code/rootfs-skeleton/usr/share/applications/legacy_grub_2013.desktop\r\nAuto-merging kernel-kit/configs_extra/DOTconfig-4.1.10-slacko64\r\nRemoving kernel-kit/configs_extra/DOTconfig-3.4.2-dpup\r\nRemoving kernel-kit/configs_extra/DOTconfig-3.2.8-saluki\r\nRemoving kernel-kit/configs_extra/DOTconfig-3.2.29-150912\r\nRemoving kernel-kit/configs_extra/DOTconfig-3.2.14-dpup\r\nAuto-merging kernel-kit/configs_extra/DOTconfig-3.18.22-slacko32\r\nAuto-merging kernel-kit/configs_extra/DOTconfig-3.14.54-slacko32\r\nRemoving kernel-kit/configs_extra/DOTconfig-3.1-dpup\r\nMerge made by the 'recursive' strategy.\r\n kernel-kit/configs_extra/DOTconfig-3.1-dpup        | 4621 -------------------\r\n ...4.20-tahr-no-PAE => DOTconfig-3.14.54-slacko32} |   11 +-\r\n ...-librepup-no-PAE => DOTconfig-3.18.22-slacko32} | 1159 ++---\r\n kernel-kit/configs_extra/DOTconfig-3.2.14-dpup     | 4691 -------------------\r\n kernel-kit/configs_extra/DOTconfig-3.2.29-150912   | 4780 --------------------\r\n kernel-kit/configs_extra/DOTconfig-3.2.8-saluki    | 4655 -------------------\r\n kernel-kit/configs_extra/DOTconfig-3.4.2-dpup      | 4773 -------------------\r\n ...nfig-4.1-librepup => DOTconfig-4.1.10-slacko64} | 3177 ++++++++++---\r\n .../x86/target/rootfs-skeleton/usr/sbin/printcols  |  Bin 21192 -> 13000 bytes\r\n woof-code/3builddistro                             |  263 +-\r\n woof-code/3builddistro-Z                           |   55 +-\r\n woof-code/DISTRO_PET_REPOS                         |   53 +-\r\n woof-code/findwoofinstalledpkgs                    |    3 +\r\n woof-code/rootfs-packages/change_kernels/pet.specs |    1 +\r\n woof-code/rootfs-packages/jwm_config/pet.specs     |    1 +\r\n woof-code/rootfs-packages/ptheme/pet.specs         |    1 +\r\n .../usr/local/bin/defaultimageviewer               |    2 +-\r\n .../usr/local/bin/defaulttexteditor                |    2 +-\r\n woof-code/rootfs-skeleton/usr/local/bin/drive_all  |    4 +-\r\n .../usr/local/petget/devx_service_pack.sh          |    2 +-\r\n .../usr/local/petget/installmodes.sh               |    2 +-\r\n woof-code/rootfs-skeleton/usr/local/petget/petget  |    2 +-\r\n .../usr/local/petget/pkg_chooser.sh                |    2 +-\r\n .../usr/local/petget/removepreview.sh              |   21 +-\r\n .../usr/local/petget/service_pack.sh               |    2 +-\r\n .../usr/local/simple_network_setup/sns             |    4 +-\r\n woof-code/rootfs-skeleton/usr/sbin/touchscreen     |   56 +\r\n .../share/applications/legacy_grub_2013.desktop    |   10 -\r\n woof-code/support/slacko/woof_base_hack            |    3 +\r\n woof-distro/Packages-puppy-noarch-official         |   41 +-\r\n woof-distro/x86/slackware/14.0/DISTRO_SPECS        |    2 +-\r\n .../14.0/Packages-puppy-slacko14-official          |    1 -\r\n .../14.1/DISTRO_PKGS_SPECS-slackware-14.1          |  459 +-\r\n woof-distro/x86/slackware/14.1/DISTRO_SPECS        |   11 +-\r\n .../14.1/Packages-puppy-slacko14.1-official        |  405 +-\r\n 35 files changed, 3628 insertions(+), 25647 deletions(-)\r\n delete mode 100644 kernel-kit/configs_extra/DOTconfig-3.1-dpup\r\n rename kernel-kit/configs_extra/{DOTconfig-3.14.20-tahr-no-PAE => DOTconfig-3.14.54-slacko32} (99%)\r\n rename kernel-kit/configs_extra/{DOTconfig-3.14-librepup-no-PAE => DOTconfig-3.18.22-slacko32} (89%)\r\n delete mode 100644 kernel-kit/configs_extra/DOTconfig-3.2.14-dpup\r\n delete mode 100644 kernel-kit/configs_extra/DOTconfig-3.2.29-150912\r\n delete mode 100644 kernel-kit/configs_extra/DOTconfig-3.2.8-saluki\r\n delete mode 100644 kernel-kit/configs_extra/DOTconfig-3.4.2-dpup\r\n rename kernel-kit/configs_extra/{DOTconfig-4.1-librepup => DOTconfig-4.1.10-slacko64} (60%)\r\n create mode 100644 woof-code/rootfs-packages/change_kernels/pet.specs\r\n create mode 100644 woof-code/rootfs-packages/jwm_config/pet.specs\r\n create mode 100644 woof-code/rootfs-packages/ptheme/pet.specs\r\n create mode 100755 woof-code/rootfs-skeleton/usr/sbin/touchscreen\r\n delete mode 100644 woof-code/rootfs-skeleton/usr/share/applications/legacy_grub_2013.desktop\r\n```\r\n\r\nAll recent commits seem in tact but I would like you (@mavrothal) and @dimkr and @zigbert to just check. I did have an issue with devuan and trisquel so they may not be exactly as they were. Should be ok though as the version matches up.. but I wasn't aware it changed from 'librepup' to 'belpup' :laughing: \r\n\r\nLast f* up I'll be making for a while! :laughing: "}}