Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lxqt Configuration of Meilix #92

Closed
wants to merge 59 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
1b973c8
Create .travis.yml
xeon-zolt Jun 8, 2017
98ddecb
upfated teavis
xeon-zolt Jun 8, 2017
3eb93ba
wallpaper test
xeon-zolt Jun 8, 2017
f876bd4
added mail to travis
xeon-zolt Jun 9, 2017
1fb3f90
updated url to test heroku app
xeon-zolt Jun 10, 2017
89367d5
added notify email taken from env variable
xeon-zolt Jun 10, 2017
3def3cf
Merge remote-tracking branch 'origin/master'
xeon-zolt Jun 10, 2017
a7d5fb8
Create .travis.yml
xeon-zolt Jun 11, 2017
415fdb4
Create .travis.yml
xeon-zolt Jun 11, 2017
626c85d
Create .travis.yml
xeon-zolt Jun 11, 2017
e5f9af1
to set wallpaper downloaded by wget in build .sh
xeon-zolt Jun 11, 2017
86e3e7c
Update .travis.yml
meets2tarun Jun 11, 2017
e00bbd8
Create .travis.yml
xeon-zolt Jun 11, 2017
090a3f8
Merge pull request #1 from meets2tarun/patch-2
xeon-zolt Jun 11, 2017
6f897a2
Create .travis.yml
meets2tarun Jun 11, 2017
001ad17
Merge pull request #2 from meets2tarun/patch-3
xeon-zolt Jun 11, 2017
b7cbdcf
changes for email
xeon-zolt Jun 11, 2017
e5e9072
Create .travis.yml
meets2tarun Jun 11, 2017
bf2d534
Create .travis.yml
xeon-zolt Jun 11, 2017
23ed447
Merge pull request #3 from meets2tarun/patch-4
xeon-zolt Jun 11, 2017
a25b021
Create .travis.yml
xeon-zolt Jun 11, 2017
2a7622e
Create .travis.yml
meets2tarun Jun 11, 2017
b3564ae
to overwrite the previous tag
xeon-zolt Jun 11, 2017
985d6e2
added lxqt conf
xeon-zolt Jun 21, 2017
5bdc090
added auto hide to pannel
xeon-zolt Jun 21, 2017
79a1b25
shift to old commit for testing
meets2tarun Jul 6, 2017
3d0d56e
updated metapackages
meets2tarun Jul 6, 2017
fc558f5
chromium config test
meets2tarun Jul 7, 2017
7c3c358
chromium-browser renamed to chrome
meets2tarun Jul 10, 2017
04524cf
added make file
meets2tarun Jul 10, 2017
81e4fed
added the meilix-default-settings package
meets2tarun Jul 10, 2017
33b2294
meilix-default-settings packages
meets2tarun Jul 10, 2017
3fab0e0
removed gdm and gnome-games
meets2tarun Jul 14, 2017
5cefafe
added lxqt
meets2tarun Jul 14, 2017
60602c6
removed openbox rc.xml
meets2tarun Jul 16, 2017
92add9d
updated meilix-metapackages
meets2tarun Jul 16, 2017
e96facc
added lxqt before meilix-metapackage
meets2tarun Jul 16, 2017
06bf593
added sudo
meets2tarun Jul 16, 2017
5821387
added lxqt after update
meets2tarun Jul 16, 2017
77cc138
deleted the old package and done the required changes for chromium co…
meets2tarun Jul 16, 2017
2fb33eb
rebuild the metapackages
meets2tarun Jul 16, 2017
539ddee
lxqt dekstop
meets2tarun Jul 16, 2017
54ba012
added lxqt as a base package
meets2tarun Jul 16, 2017
9486b4e
removed gdm and replaces lxqt
meets2tarun Jul 16, 2017
756a4d6
added sddm config
meets2tarun Jul 16, 2017
0d1f3d0
removed the older metapackages
meets2tarun Jul 16, 2017
c2587e8
debuiild the metapackages
meets2tarun Jul 16, 2017
5d5b1dd
added sddm conf
meets2tarun Jul 16, 2017
02b48cd
adddebuildbuld the metapackage
meets2tarun Jul 16, 2017
89a64ae
rebuild the metapackages
meets2tarun Jul 16, 2017
4375fef
all branches deployment set to true
meets2tarun Jul 16, 2017
a0c7e97
edited token
meets2tarun Jul 16, 2017
e9a5a69
edited build.sh and debuild metapackages
meets2tarun Jul 17, 2017
002a54b
added initramfs-tools
meets2tarun Jul 17, 2017
18594c4
lxqt config
meets2tarun Jul 20, 2017
7af0bcc
lxqt config
meets2tarun Jul 20, 2017
b75639d
Merge branch 'xeon-zolt-lxqt' into lxqt
meets2tarun Jul 20, 2017
5da3e8b
resolved conflicts
meets2tarun Jul 23, 2017
f1447a6
Merge branch 'meets2tarun-lxqt' into lxqt
meets2tarun Jul 23, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ sudo: required

script:
- ./build.sh
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./scripts/aptRepoUpdater.sh; fi'

before_deploy:
- export image_name="`echo *.iso`"
Expand All @@ -18,8 +17,8 @@ deploy:
- provider: releases
skip_cleanup: true
api_key:
secure: "tVVKOMh0dZCrHkAfoqIYJYleJwTwXptumugYVcGi/WDaeFi9o1ROTKVdLXUO2CcAUgWUphWjnckF4uVdKBcCB87Af0hgQBXdpDJ4VSb2FFjjY3Lf5dpR1FTYR6Tqsn821mYM17wtwmO1tlg8zFqd1yysr36wZ0EqzFwBtV2FA0jNfxGtFyyJRZnDcCQqwREc2iIENSt8tE787HbwPaWGBEkpC8zYwNYkQXPgFvTi+Z/6Tnobz7gnk9wQFuzFDymr6sDTQF+2ycfGnJnXDOZjqC5haDZbXop6dR/ru6hwO6U4khQIFHEPMZEEHnocB1gOOSiM9Z/yztmY18X4jzx8gZAMIrdKwYlZzEeVAbnlX0WXfjOFmcKIvaMtdNZg9QJil3ePPq/80uNo4TGUy+04ll6jBqqMf4BTs/dxohLyksxN79iuAplRtEl96ZQG+0VI1B0OE3WjwtcuvcuTW7oZ1sOULY4UsNmIdPpJZqIrQpN4AevRJ6DV844uvJ63Sbdzyu0EjMTp+h+2dWiQnnW4aP0mbYsBGWTj0vM2CD/fHtM9W6oVNqLsF7pEe9fg7d2hYJS7Zkuwco33WHqy4JGvLl9uyzSsy0cueJgwg5DYJ8zWDzhlCbKtEk1kG+eKVj+C5rG4shOMK4zf+0iVn5BCNB5d3OgLpAGJwFx1uqqTMrc="
secure: "nAvyjKgkn5G7BYXq85kNXBgb3fdzVSVibvaJKWftimjhHjKzjNfcoUk/IvuoEmwpP6TofgVRx2T689DaUqW29TVXV5O23DvOyJE6SpO7xn0yPC12SPPy3nwwCWkGYvy77akz3N+DvIwGZ712lF2gttTB/mjNB1ZcX5438nCDI1hUw5TcH2QoajhxGJVDJoHQBUxWcOLQh+N+6+ZGnenR7wfLcYOmC6dLNSS9Mn2f/IPF3y3xmq3HZ7CJpHJcfIQ1a0bnHa2h7CIMRZZeXzK/W2RD1qaZ2upz33lVgpCq+/pJCED3vk+XZgmATJML8vzRsY1FlgXgEfWYmaJlsUEcNb/Llu4hwmA9pFO0pI432S3z4pX7NlcVy8Om0eaYvMbyWX4VTOz1urutWTNHQ5337wbkaPYk5ELoI7Ph2pe0uvtlrHzCO6sQWjg79asyFj2zxefOWxRM4d8k1eRQoUZaRpq95wBVYbVCiZqMc+V7TrABBlfC7f8iDmTA4nLmH6f8RIHFL018ikgd6CaRbpSO2XSSNmktR7fuLmC68vBZ64CCxVGMn0poNbdHZVphQ3KgiKH2c2Qb990XgwV/YYDNrjgh2qwpB+NzhE3PJIYWs1AGyEU9fJRJV2ElfLeel9vAWqWSZ/7q+0yPb6ScVCQ4SOJ1TYUpb8qOV3VqgbN/BwQ="
file_glob: true # http://stackoverflow.com/a/28579635/1320237
file: "/home/travis/${image_name}"
on:
branch: master
all_branches: true
70 changes: 22 additions & 48 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
# lxgames-build.sh -- creates an LXgames LiveCD ISO, based on lubuntu-build.sh
# Author: Team
# Based heavily on HOWTO information by
# Based heavily on HOWTO information by
# Julien Lavergne <gilir@ubuntu.com>
# Version: 20110303

Expand Down Expand Up @@ -52,13 +52,11 @@ sudo cp -v plymouth-meilix-text_*_all.deb chroot
sudo cp -v meilix-metapackage_*_all.deb chroot
sudo cp -v skype-ubuntu_*_i386.deb chroot
sudo cp -v meilix-imclient_*_all.deb chroot
sudo cp -v meilix-metapackages_*_all.deb chroot
sudo cp -v meilix-metapackages-2_*_all.deb chroot

# Mount needed pseudo-filesystems
sudo mount -t sysfs sys chroot/sys
sudo mount -t proc proc chroot/proc
sudo mount -o bind /dev chroot/dev
sudo mount --rbind /sys chroot/sys
sudo mount --rbind /dev chroot/dev
sudo mount -t proc none chroot/proc

# Work *inside* the chroot
sudo chroot chroot <<EOF
Expand Down Expand Up @@ -87,17 +85,12 @@ apt-get -q update
apt-get -q -y --purge install ubuntu-standard casper lupin-casper \
laptop-detect os-prober linux-generic

# Install meilix-metapackage
dpkg -i meilix-metapackage*.deb
apt-get install -f

# Install base packages
apt-get -q -y --purge install --no-install-recommends \
lxsession lightdm lightdm-gtk-greeter lxterminal gvfs-backends seahorse \
network-manager-gnome xorg dbus-x11 openbox ubiquity-frontend-gtk vlc \
xfce4-mixer gstreamer0.10-alsa pulseaudio pavucontrol lxpanel \
mozilla-plugin-vlc lubuntu-core jockey-gtk

apt-get install -q -y xorg sddm lxqt

# Plymouth theme
dpkg -i plymouth-meilix-logo_1.0-1_all.deb plymouth-meilix-text_1.0-1_all.deb
apt-get install -f
Expand All @@ -109,15 +102,15 @@ apt-get -q -y --purge install xfce4-power-manager

# Archive Manager
apt-get -q -y --purge install file-roller unrar
# lubuntu-restricted-extras
apt-get -q -y --purge install lubuntu-restricted-extras

# lubuntu-restricted-extras
apt-get -q -y --purge install lubuntu-restricted-extras

# Install specific packages
apt-get -q -y -o Dpkg::Options::="--force-overwrite" --purge install chromium-browser

#rm -rf /etc/chromium-browser
mv /etc/chromium-browser_ /etc/chromium-browser
mv /etc/chromium-browser_ /etc/chromium-browser

# Install lxrandr to change monitor settings
apt-get -q -y --purge install lxrandr
Expand All @@ -127,34 +120,17 @@ apt-get -q -y --purge install flashplugin-installer google-talkplugin pidgin gal
gpicview evince libqtwebkit4
dpkg -i -y --purge install skype-ubuntu_4.1.0.20-1_i386.deb

#Install Games
apt-get -q -y --purge install --no-install-recommends pingus supertux nikwi tuxpaint gnome-games

# Install graphic
apt-get -q -y --purge install gimp inkscape
apt-get -q -y --purge remove imagemagick

# Install Libreoffice
apt-get -q -y --purge install --no-install-recommends libreoffice-gtk libreoffice-gtk libreoffice-writer libreoffice-calc libreoffice-impress

#Clean system before install gdm
apt-get -q -y autoremove
apt-get -q -y autoclean
# Install GDM to fix ubiquity-frontend-gtkity issue
apt-get -q -y --purge install gdm
apt-get -q -y --purge remove gdm

# Install imclient
dpkg -i meilix-imclient_*_all.deb
apt-get install -f

# Install meilix-metapackage
dpkg -i meilix-metapackages_*_all.deb
apt-get install -f

# Install meilix-metapackages-2
dpkg -i meilix-metapackages-2_*_all.deb

#Google custom ad
apt-get -q -y --purge install mygoad
#Install East Asia font
Expand All @@ -168,7 +144,8 @@ apt-get -q -y --purge install ibus-unikey ibus-anthy ibus-pinyin ibus-m17n
apt-get -q -y --purge install im-switch
#Hotel OS default settings
#apt-get download hotelos-default-settings
dpkg -i --force-overwrite meilix-default-settings_1.0_all.deb
dpkg -i --force-overwrite meilix-default-settings_1.0_all.deb
update-initramfs -u
dpkg -i --force-overwrite systemlock_0.1-1_all.deb
apt-get install -f
apt-get -q -y remove dconf-tools
Expand All @@ -177,27 +154,24 @@ perl -i -nle 'print unless /^Package: language-(pack|support)/ .. /^$/;' /var/li
apt-get clean
rm -rf /tmp/*
#rm /etc/resolv.conf
rm meilix-default-settings_1.0_all.deb
rm meilix-default-settings_1.0_all.deb
rm systemlock_0.1-1_all.deb plymouth-meilix-logo_1.0-1_all.deb plymouth-meilix-text_1.0-1_all.deb skype-ubuntu_4.1.0.20-1_i386.deb
rm meilix-imclient_*_all.deb

# Reverting earlier initctl override. JM 2012-0604
rm /sbin/initctl
dpkg-divert --rename --remove /sbin/initctl

#clean history
rm -rf /tmp/* ~/.bash_history

exit
EOF

###############################################################
# Continue work outside the chroot, preparing image

# Unmount pseudo-filesystems
sudo umount -l chroot/proc
sudo umount -l chroot/sys
sudo umount -l chroot/dev
sudo umount -lfr chroot/proc
sudo umount -lfr chroot/sys
sudo umount -lfr chroot/dev

echo $0: Preparing image...

Expand Down Expand Up @@ -236,14 +210,14 @@ sudo cp -v /tmp/manifest.$$ image/casper/filesystem.manifest
sudo cp -v image/casper/filesystem.manifest image/casper/filesystem.manifest-desktop
rm /tmp/manifest.$$

# Remove packages from filesystem.manifest-desktop
# Remove packages from filesystem.manifest-desktop
# (language and extra for more hardware support)
REMOVE='gparted ubiquity ubiquity-frontend-gtk casper live-initramfs user-setup discover1
xresprobe libdebian-installer4 pptp-linux ndiswrapper-utils-1.9
REMOVE='gparted ubiquity ubiquity-frontend-gtk casper live-initramfs user-setup discover1
xresprobe libdebian-installer4 pptp-linux ndiswrapper-utils-1.9
ndisgtk linux-wlan-ng libatm1 setserial b43-fwcutter uterm
linux-headers-generic indicator-session indicator-application
linux-headers-generic indicator-session indicator-application
language-pack-*'
for i in $REMOVE
for i in $REMOVE
do
sudo sed -i "/${i}/d" image/casper/filesystem.manifest-desktop
done
Expand All @@ -253,7 +227,7 @@ echo "$0: Starting mksquashfs at $(date -u) ..."
sudo mksquashfs chroot image/casper/filesystem.squashfs -noappend -no-progress
echo "$0: Finished mksquashfs at $(date -u )"

# Generate md5sum.txt checksum file
# Generate md5sum.txt checksum file
cd image && sudo find . -type f -print0 |xargs -0 sudo md5sum |grep -v "\./md5sum.txt" >md5sum.txt

# Generate a small temporary ISO so we get an updated boot.cat
Expand Down
2 changes: 1 addition & 1 deletion meilix-default-settings/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
meilix-default-settings (1.0-1) unstable; urgency=low
meilix-default-settings (1.0) unstable; urgency=low

* Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>

Expand Down
1 change: 1 addition & 0 deletions meilix-default-settings/debian/debhelper-build-stamp
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
meilix-default-settings
2 changes: 1 addition & 1 deletion meilix-default-settings/debian/files
Original file line number Diff line number Diff line change
@@ -1 +1 @@
meilix-default-settings_1.0-1_all.deb x11 extra
meilix-default-settings_1.0_all.deb x11 extra
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
dh_update_autotools_config
dh_auto_configure
dh_auto_build
dh_auto_test
Expand All @@ -8,10 +9,10 @@ dh_install
dh_installdocs
dh_installchangelogs
dh_installman
dh_pysupport
dh_icons
dh_perl
dh_link
dh_strip_nondeterminism
dh_compress
dh_fixperms
dh_installdeb
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
misc:Depends=
misc:Pre-Depends=
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
/etc/skel/.mozilla/firefox/Crash Reports/InstallTime20121129151900
/etc/skel/.mozilla/firefox/Crash Reports/InstallTime20130107224806
/etc/apport/blacklist.d/firefox
/etc/apport/native-origins.d/firefox
/etc/apt/.sources.list.d
/etc/chromium/default
/etc/chromium/policies/managed/chrome.json
/etc/sddm.conf
/etc/skel/.config/lxqt/panel.conf
/etc/skel/.config/vlc/vlc-qt-interface.conf
/etc/skel/.config/vlc/vlcrc
/etc/xdg/openbox/rc.xml
/etc/skel/.mozilla/*.default/prefs.js
/etc/skel/.mozilla/firefox/Crash Reports/InstallTime20121129151900
/etc/skel/.mozilla/firefox/Crash Reports/InstallTime20130107224806
/etc/skel/.mozilla/profiles.ini
/etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf
/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf
/etc/xdg/pcmanfm/default/pcmanfm.conf
/etc/xdg/lxsession/Lubuntu/autostart
/etc/xdg/lxsession/Lubuntu/desktop.conf
/etc/xdg/lxqt/globalkeyshortcuts.conf
/etc/xdg/lxqt/lxqt.conf
/etc/xdg/lxqt/panel.conf
/etc/xdg/lxqt/session.conf
/etc/xdg/lxqt/windowmanagers.conf
/etc/xdg/lxsession/Lubuntu-Netbook/autostart
/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf
/etc/chromium-browser/policies/managed/chrome.json
/etc/chromium-browser/default
/etc/apport/blacklist.d/firefox
/etc/apport/native-origins.d/firefox
/etc/xdg/lxsession/Lubuntu/autostart
/etc/xdg/lxsession/Lubuntu/desktop.conf
/etc/xdg/pcmanfm/default/pcmanfm.conf
/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: meilix-default-settings
Version: 1.0-1
Version: 1.0
Architecture: all
Maintainer: meilix <vanhonit@gmail.com>
Installed-Size: 97692
Installed-Size: 99508
Section: x11
Priority: extra
Homepage: http://mbm.vn
Expand Down
Loading