diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..bc74a18a561b25ccf8e1a150f0fb47c364e03fd4
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,25 @@
+# Is performed before the scripts in the stages step
+before_script:
+ - apt-get update
+ - apt-get -y install apt-utils
+
+# Defines stages which are to be executed
+stages:
+ - buildcalamares
+
+# Stage "buildcalamares"
+run-build:
+ stage: buildcalamares
+ script:
+ - apt-get install -y build-essential devscripts debhelper
+ - cd packages/calamares-settings-hamara/
+ - dpkg-buildpackage -us -uc
+ - mkdir build
+ - mv ../*.deb build
+ - mv ../*.xz build
+ - mv ../*.dsc build
+
+# The files which are to be made available in GitLab
+ artifacts:
+ paths:
+ - build/
diff --git a/packages/calamares-settings-hamara/calamares/branding/hamara/branding.desc b/packages/calamares-settings-hamara/calamares/branding/hamara/branding.desc
index ddcc7757d141b324b240a681184c8b67c94fcca4..dc6d0cf3b949921afa4d3c15e3aad2df72658d1d 100644
--- a/packages/calamares-settings-hamara/calamares/branding/hamara/branding.desc
+++ b/packages/calamares-settings-hamara/calamares/branding/hamara/branding.desc
@@ -11,7 +11,7 @@ strings:
bootloaderEntryName: Hamara Linux
productUrl: https://hamaralinux.org
supportUrl: https://forum.hamaralinux.org/
- releaseNotesUrl: https://hamaralinux.org
+ releaseNotesUrl: https://www.hamaralinux.org/beta-release-of-hamara-sugam-2-0/
images:
productLogo: "hamara-logo.png"
diff --git a/packages/calamares-settings-hamara/calamares/branding/hamara/community.png b/packages/calamares-settings-hamara/calamares/branding/hamara/community.png
new file mode 100644
index 0000000000000000000000000000000000000000..97942afbeaf377f8d161baaea3eb75a003bb4c98
Binary files /dev/null and b/packages/calamares-settings-hamara/calamares/branding/hamara/community.png differ
diff --git a/packages/calamares-settings-hamara/calamares/branding/hamara/freedom.png b/packages/calamares-settings-hamara/calamares/branding/hamara/freedom.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a6f792f38f7ad074b4a61fc29329400614f2d83
Binary files /dev/null and b/packages/calamares-settings-hamara/calamares/branding/hamara/freedom.png differ
diff --git a/packages/calamares-settings-hamara/calamares/branding/hamara/media.png b/packages/calamares-settings-hamara/calamares/branding/hamara/media.png
new file mode 100644
index 0000000000000000000000000000000000000000..a86880b7fdf673ea9987e5fa639579d421868a3f
Binary files /dev/null and b/packages/calamares-settings-hamara/calamares/branding/hamara/media.png differ
diff --git a/packages/calamares-settings-hamara/calamares/branding/hamara/opensource.png b/packages/calamares-settings-hamara/calamares/branding/hamara/opensource.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a1c0bf6dbdfe5a5c9c88231bcc8ea7c8d0bff74
Binary files /dev/null and b/packages/calamares-settings-hamara/calamares/branding/hamara/opensource.png differ
diff --git a/packages/calamares-settings-hamara/calamares/branding/hamara/productivity.png b/packages/calamares-settings-hamara/calamares/branding/hamara/productivity.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c19e7b64f1b6342f8957628f00cc488ab859770
Binary files /dev/null and b/packages/calamares-settings-hamara/calamares/branding/hamara/productivity.png differ
diff --git a/packages/calamares-settings-hamara/calamares/branding/hamara/show.qml b/packages/calamares-settings-hamara/calamares/branding/hamara/show.qml
index abb65e8acd1b7630065fcae2246bcf2e965c474a..0e46acbf805ae0c4b191f3536911c4d5d6d3decf 100644
--- a/packages/calamares-settings-hamara/calamares/branding/hamara/show.qml
+++ b/packages/calamares-settings-hamara/calamares/branding/hamara/show.qml
@@ -21,31 +21,283 @@ import calamares.slideshow 1.0;
Presentation
{
- id: presentation
-
- Timer {
- interval: 20000
- repeat: true
- onTriggered: presentation.goToNextSlide()
- }
-
- Slide {
- Image {
- id: background1
- source: "slide1.png"
- width: 467; height: 280
- fillMode: Image.PreserveAspectFit
- anchors.centerIn: parent
- }
- Text {
- anchors.horizontalCenter: background1.horizontalCenter
- anchors.top: background1.bottom
- text: "Welcome to Hamara Linux.
"+
- "The rest of the installation is automated and typically takes a few minutes to complete."
- wrapMode: Text.WordWrap
- width: 600
- horizontalAlignment: Text.Center
- }
- }
+ id: presentation
+ Timer {
+ interval: 12000
+ running: true
+ repeat: true
+ onTriggered: presentation.goToNextSlide()
+ }
+
+ /* First Slide starting the Installation*/
+
+ Slide {
+ Image {
+ id: background1
+ source: "slide1.png"
+ fillMode: Image.PreserveAspectFit
+ anchors.centerIn: parent
+ }
+ Image{
+ id: icon
+ source: "hamara-logo.png"
+ fillMode: Image.PreserveAspectFit
+ anchors.right: parent.right
+ anchors.bottom: parent.bottom
+ anchors.rightMargin: 14
+ anchors.bottomMargin: 10
+ }
+ Text {
+ id: title
+ font.pointSize: 16
+ anchors.top: parent.top
+ anchors.left: parent.left
+ anchors.topMargin: 8
+ anchors.leftMargin: 18
+ width: parent.width-10
+ wrapMode: Text.WordWrap
+ font.weight: Font.SourceSansProSemiBold
+ text: "Welcome to Hamara Linux Installer"
+ }
+ Text {
+ id: description
+ font.pointSize: 9
+ anchors.top: parent.top
+ anchors.left: parent.left
+ anchors.topMargin: 46
+ anchors.leftMargin: 18
+ width: parent.width-10
+ wrapMode: Text.WordWrap
+ text: "
Welcome to Hamara Sugam.
"+ + "You are installing an operating system which is
"+ + "Thank you for choosing Hamara Linux and joining us in our mission of Making Technology Ours.
"+ + "The rest of the installation is automated and typically takes a few minutes to complete.
" + } + } + + + /*Second Slide with start of the slideshow*/ + /*WELCOME*/ + + + Slide { + Image { + /*source: "welcome1.png"*/ + source: "slide1.png" + fillMode: Image.PreserveAspectFit + anchors.centerIn: parent + } + Text { + font.pointSize: 16 + anchors.top: parent.top + anchors.left: parent.left + anchors.topMargin: 8 + anchors.leftMargin: 18 + width: parent.width-10 + wrapMode: Text.WordWrap + font.weight: Font.SourceSansProSemiBold + text: "Welcome" + } + Text { + font.pointSize: 9 + anchors.top: parent.top + anchors.left: parent.left + anchors.topMargin: 40 + anchors.leftMargin: 18 + width: parent.width-10 + wrapMode: Text.WordWrap + text: "
Thank you for choosing Hamara Linux.
"+ + "We certainly hope Hamara fulfills your needs: it is built with love with the unequalled goal of providing Open-Source Software for the World's Largest Democracy.
"+ + "Beginning with Hamara welcomes you to a world of possibility, and we invite you to start exploring the freedom of our software collection
"+ + "We have selected from the over 20,000 packages available in our repositories: free software for a free future.
"+ + "Hamara Linux is free of cost, and our software collection is also free.
"+ + "Hamara Linux: Open Source Software for You.
" + } + } + + + /*Always Open Source*/ + + Slide { + Image { + /*source: "opensource.png"*/ + source: "slide1.png" + fillMode: Image.PreserveAspectFit + anchors.centerIn: parent + } + Text { + font.pointSize: 16 + anchors.top: parent.top + anchors.left: parent.left + anchors.topMargin: 8 + anchors.leftMargin: 18 + width: parent.width-10 + wrapMode: Text.WordWrap + font.weight: Font.SourceSansProSemiBold + text: "Always Open Source" + } + Text { + font.pointSize: 9 + anchors.top: parent.top + anchors.left: parent.left + anchors.topMargin: 40 + anchors.leftMargin: 18 + width: parent.width-10 + wrapMode: Text.WordWrap + text: "The Hamara Linux Project is 100% committed to providing free software following the Free System Distribution Guidelines.
"+ + "This guidance extends to you all the freedom to use, study, modify and share every single piece of Hamara: it is yours, for your future.
"+ + "Our promise is that Hamara will always be free as the light from the sun, and if you find something inappropriate simply tell us and we will do what is necessary to make an improvement.
"+ + "Hamara Linux: Open Source Software for the Worlds Greatest Democracy
" + } + } + + + /*MEDIA*/ + + Slide { + Image { + /*source: "media.png"*/ + source: "slide1.png" + fillMode: Image.PreserveAspectFit + anchors.centerIn: parent + } + Text { + font.pointSize: 16 + anchors.top: parent.top + anchors.left: parent.left + anchors.topMargin: 8 + anchors.leftMargin: 18 + width: parent.width-10 + wrapMode: Text.WordWrap + font.weight: Font.SourceSansProSemiBold + text: "Media" + } + Text { + font.pointSize: 9 + anchors.top: parent.top + anchors.left: parent.left + anchors.topMargin: 40 + anchors.leftMargin: 18 + width: parent.width-10 + wrapMode: Text.WordWrap + text: "Hamara Linux brings you a set of media players and editing options:
"+ + "Music players; Video players; Audio recording, editing, & conversion; Video recording, editing and conversion ;
"+ + "DVD Ripping and Authoring; CD & DVD burning; and Flash, Hamara Linux supports all free and some restricted formats in certain applications.
"+ + "As well as having a choice of front end applications and back end services, you have a huge library of free software to choose from, including applications developed to meet a great range of media needs.
"+ + "Install Hamara Linux, plug in your headphones, and sit back to enjoy a world of music, sound, and motion.
" + } + } + + /*PRODUCTIVITY*/ + + Slide { + Image { + /*source: "productivity.png"*/ + source: "slide1.png" + fillMode: Image.PreserveAspectFit + anchors.centerIn: parent + } + Text { + font.pointSize: 16 + anchors.top: parent.top + anchors.left: parent.left + anchors.topMargin: 8 + anchors.leftMargin: 18 + width: parent.width-10 + wrapMode: Text.WordWrap + font.weight: Font.SourceSansProSemiBold + text: "Productivity" + } + Text { + font.pointSize: 9 + anchors.top: parent.top + anchors.left: parent.left + anchors.topMargin: 40 + anchors.leftMargin: 18 + width: parent.width-10 + wrapMode: Text.WordWrap + text: "Hamara comes preloaded with a whole suite of free productivity software that allows you to open create and edit standard document formats, spreadsheets, presentations, drawings and diagrams, .pdf and image files.
"+ + "Additionally Hamara Linux brings you an email client with integrated calendars, and instant messaging platform.
"+ + "An entire toolbox you need to work harder, faster, and more efficiently at your workstation is available for you from Hamara Linux free to use from the start.
" + } + } + + + /*SUPPORT*/ + + Slide { + Image { + source: "slide1.png" + fillMode: Image.PreserveAspectFit + anchors.centerIn: parent + } + Text { + font.pointSize: 16 + anchors.top: parent.top + anchors.left: parent.left + anchors.topMargin: 8 + anchors.leftMargin: 18 + width: parent.width-10 + wrapMode: Text.WordWrap + font.weight: Font.SourceSansProSemiBold + text: "Support" + } + Text { + font.pointSize: 9 + anchors.top: parent.top + anchors.left: parent.left + anchors.topMargin: 40 + anchors.leftMargin: 18 + width: parent.width-10 + wrapMode: Text.WordWrap + text: "Hamara Linux is here for you. If you need help using Hamara software, it is available for you in many ways.
"+ + "You can always check the user manuals included within the system or consult our Wiki pages for information about usage.
"+ + "If something goes wrong, you can refer to our issues database or send in your own bugs or suggestions to that database.
"+ + "Hamara Linux community is always there for you. You can meet people and stay connected via the forum at forum.hamaralinux.org or join the mailing list (see www.hamaralinux.org/support), and the people you meet there are Hamara people
"+ + "too: these are places to give and to receive help. You can also be in touch through social media www.twitter.com/hamaralinux
"+ + "If you want to deploy Hamara Linux in your company or school you can also get commercial support. See www.hamaralinux.org/support for more information.
" + } + } + + /*Join the Community*/ + + Slide { + Image { + source: "slide1.png" + fillMode: Image.PreserveAspectFit + anchors.centerIn: parent + } + Text { + font.pointSize: 16 + anchors.top: parent.top + anchors.left: parent.left + anchors.topMargin: 8 + anchors.leftMargin: 18 + width: parent.width-10 + wrapMode: Text.WordWrap + font.weight: Font.SourceSansProSemiBold + text: "Join the Community" + } + Text { + font.pointSize: 9 + anchors.top: parent.top + anchors.left: parent.left + anchors.topMargin: 40 + anchors.leftMargin: 18 + width: parent.width-10 + wrapMode: Text.WordWrap + text: "As a Hamara Linux user we welcome you to join Hamara Community too.
"+ + "All registered users can contribute to the discussion forums, edit the Wiki pages, work on translations for the site, submit suggestions and bugs, as well as many other things.
"+ + "If you are a hacker we encourage you to work to help develop Hamara Linux. Translators, designers, musicians, betatesters, webmasters, sysadmins, and maintainers are all welcome, along with programmers, of course: there is work for many hands to build a free future with Hamara Linux together.
"+ + "If you do not have the time to help with development, you can always contribute by spreading the word of Hamara Linux throughout your region, your workplace, your social networks and publications, and in your offline community, or by making donations.
"+ + "Hamara Linux is our linux, our open source software, our free future, together.
" + } + } } diff --git a/packages/calamares-settings-hamara/calamares/branding/hamara/software.png b/packages/calamares-settings-hamara/calamares/branding/hamara/software.png new file mode 100644 index 0000000000000000000000000000000000000000..f6f27e1fa3f453186d4f9ec70a7ac40a7f61f27d Binary files /dev/null and b/packages/calamares-settings-hamara/calamares/branding/hamara/software.png differ diff --git a/packages/calamares-settings-hamara/calamares/branding/hamara/support.png b/packages/calamares-settings-hamara/calamares/branding/hamara/support.png new file mode 100644 index 0000000000000000000000000000000000000000..83b0158810fa08a54ce9d00da01044e007ae691b Binary files /dev/null and b/packages/calamares-settings-hamara/calamares/branding/hamara/support.png differ diff --git a/packages/calamares-settings-hamara/calamares/branding/hamara/welcome1.png b/packages/calamares-settings-hamara/calamares/branding/hamara/welcome1.png new file mode 100644 index 0000000000000000000000000000000000000000..2992a8f30b53e4e1a979e080396a4c666464fc37 Binary files /dev/null and b/packages/calamares-settings-hamara/calamares/branding/hamara/welcome1.png differ diff --git a/packages/calamares-settings-hamara/calamares/modules/partition.conf b/packages/calamares-settings-hamara/calamares/modules/partition.conf index bf2de99ddc88d997ced8862e19a473bc6589abb8..c482a6d4782923c5719046f6f4f3afd8c3568606 100644 --- a/packages/calamares-settings-hamara/calamares/modules/partition.conf +++ b/packages/calamares-settings-hamara/calamares/modules/partition.conf @@ -11,7 +11,7 @@ ensureSuspendToDisk: true # Never create swap partitions in automated partitioning modes. # If this is true, ensureSuspendToDisk is ignored. # Default is false. -neverCreateSwap: true +neverCreateSwap: false # Correctly draw nested (e.g. logical) partitions as such. drawNestedPartitions: false diff --git a/packages/calamares-settings-hamara/calamares/modules/welcome.conf b/packages/calamares-settings-hamara/calamares/modules/welcome.conf index 4055f87a7448bd47be277ee375311c99a38012cd..286ef837f21bd71288fd8a19f2d5dd59f4b97565 100644 --- a/packages/calamares-settings-hamara/calamares/modules/welcome.conf +++ b/packages/calamares-settings-hamara/calamares/modules/welcome.conf @@ -13,6 +13,7 @@ requirements: - power - internet - root + - screen required: - storage - ram diff --git a/packages/calamares-settings-hamara/debian/changelog b/packages/calamares-settings-hamara/debian/changelog index 58e290c2c5105b1bee21f61f70db5227943ceca2..f918e733fdf1ce9c29c8dde6cd34d5b845e5ca2b 100644 --- a/packages/calamares-settings-hamara/debian/changelog +++ b/packages/calamares-settings-hamara/debian/changelog @@ -1,10 +1,16 @@ calamares-settings-hamara (201710) namaste; urgency=medium - [ Raju Devidas Vindane ] + * Added slideshows to Calamares Installer + + -- Raju Devidas