Commit d53e67eb authored by Luis Guzmán's avatar Luis Guzmán
Browse files

Fix conflict

parents 54952bc9 dcb925dd
ACTIVITY (VERSION) nabia; urgency=low
* VERSION release
-- Ruben Rodriguez <ruben@trisquel.info> DATE
Source: ACTIVITY
Section: games
Priority: optional
Maintainer: Ruben Rodriguez <ruben@trisquel.info>
Build-Depends: debhelper (>= 7)
Standards-Version: 3.9.2
Package: ACTIVITY
Architecture: all
Description: ACTIVITY
An activity for the Sugar learning environment.
This package was debianized by Ruben Rodriguez <ruben@trisquel.info>
It was downloaded from http://activities.sugarlabs.org
Copyright The autors
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
#!/usr/bin/make -f
%:
dh $@
sh update_bundles.sh
rm tmp -rf
ls bundles/|grep '.xo'|xargs -i sh package-activity.sh {}
#!/bin/bash
set -e
build(){
ACTIVITY=sugar-activity-$(echo $1 |sed 's/-.*//; s/\(.*\)/\L\1/; s/_/-/;')
VERSION=$(echo $1 |sed 's/.*-//; s/\.xo//')
DATE=$(LANG=en date '+%a, %d %b %Y %T +0000')
echo $ACTIVITY
mkdir -p tmp/$ACTIVITY/usr/share/sugar/activities
unzip bundles/$1 -d tmp/$ACTIVITY/usr/share/sugar/activities/
cp debian -a tmp/$ACTIVITY
sed -i "s/ACTIVITY/$ACTIVITY/" -i tmp/$ACTIVITY/debian/*
sed -i "s/VERSION/$VERSION/" -i tmp/$ACTIVITY/debian/*
sed -i "s/DATE/$DATE/" -i tmp/$ACTIVITY/debian/*
mkdir -p tmp/$ACTIVITY/usr/share/locale
cp tmp/$ACTIVITY/usr/share/sugar/activities/*/locale/* tmp/$ACTIVITY/usr/share/locale/ -a || true
rm -rf tmp/$ACTIVITY/usr/share/locale/*/activity.linfo
cd tmp/$ACTIVITY
dpkg-buildpackage -us -uc
cd ../..
}
if [ 1$1 = 1 ]; then
for BUNDLE in $(ls -1 bundles |grep xo$); do
build $BUNDLE
done
else
build $1
fi
set -e
rm -rf bundles
mkdir bundles
for repo in browse-activity calculate-activity chat imageviewer-activity jukebox-activity log-activity Pippy read-activity terminal-activity turtleart-activity write-activity activity-abacus AnalyzeJournal clock-activity colordeducto deducto develop-activity flip flipsticks fractionbounce gcompris-wrapper-activity sugarchess iknowmyabcs iq-activity implode-activity jumble-activity lettermatch locosugar maze-activity Measure moon-activity music-keyboard-activity napier nutrition paint-activity periodic-table poll-activity portfolio-activity pukllanapac recall record-activity reflection speak stopwatch story typing-turtle-activity wordcloud words-activity irc-activity memorize-activity
do
git clone https://github.com/sugarlabs/$repo.git bundles/$repo
dos2unix bundles/$repo/activity/activity.info
activity=$(grep "^name *=" bundles/$repo/activity/activity.info| sed 's/.*=//;s/ //g')
version=$(grep "^activity_version *=" bundles/$repo/activity/activity.info| sed 's/.*=//;s/ //g')
rm bundles/$repo/.git* -rf
#mv bundles/$repo bundles/$activity
mv bundles/$repo bundles/$activity.activity
(cd bundles ; zip -r ${activity}-${version}.xo $activity.activity)
done
/usr/share/icons/gnome-brave/16x16/
\ No newline at end of file
/usr/share/icons/gnome-brave/22x22/
\ No newline at end of file
/usr/share/icons/gnome-brave/24x24/
\ No newline at end of file
/usr/share/icons/gnome-brave/32x32/
\ No newline at end of file
[Icon Theme]
Name=Trisquel-Brave
Comment=Colorized Gnome Icons
Inherits=trisquel-mono-dark,gnome-colors-common,gnome,hicolor
Example=folder
Directories=16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/places,16x16/status,22x22/actions,22x22/apps,22x22/categories,22x22/devices,22x22/emblems,22x22/places,22x22/status,24x24/actions,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/places,24x24/status,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/places,32x32/status,scalable/actions,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/places,scalable/status
[16x16/actions]
Size=16
Context=Actions
Type=Fixed
[16x16/apps]
Size=16
Context=Applications
Type=Fixed
[16x16/categories]
Size=16
Context=Categories
Type=Fixed
[16x16/devices]
Size=16
Context=Devices
Type=Fixed
[16x16/emblems]
Size=16
Context=Emblems
Type=Fixed
[16x16/places]
Size=16
Context=Places
Type=Fixed
[16x16/status]
Size=16
Context=Status
Type=Fixed
[22x22/actions]
Size=22
Context=Actions
Type=Fixed
[22x22/apps]
Size=22
Context=Applications
Type=Fixed
[22x22/categories]
Size=22
Context=Categories
Type=Fixed
[22x22/devices]
Size=22
Context=Devices
Type=Fixed
[22x22/emblems]
Size=22
Context=Emblems
Type=Fixed
[22x22/places]
Size=22
Context=Places
Type=Fixed
[22x22/status]
Size=22
Context=Status
Type=Fixed
[24x24/actions]
Size=24
Context=Actions
Type=Fixed
[24x24/apps]
Size=24
Context=Applications
Type=Fixed
[24x24/categories]
Size=24
Context=Categories
Type=Fixed
[24x24/devices]
Size=24
Context=Devices
Type=Fixed
[24x24/emblems]
Size=24
Context=Emblems
Type=Fixed
[24x24/places]
Size=24
Context=Places
Type=Fixed
[24x24/status]
Size=24
Context=Status
Type=Fixed
[32x32/actions]
Size=32
Context=Actions
Type=Fixed
[32x32/apps]
Size=32
Context=Applications
Type=Fixed
[32x32/categories]
Size=32
Context=Categories
Type=Fixed
[32x32/devices]
Size=32
Context=Devices
Type=Fixed
[32x32/emblems]
Size=32
Context=Emblems
Type=Fixed
[32x32/places]
Size=32
Context=Places
Type=Fixed
[32x32/status]
Size=32
Context=Status
Type=Fixed
[scalable/actions]
Size=48
MinSize=32
MaxSize=256
Context=Actions
Type=Scalable
[scalable/apps]
Size=48
MinSize=32
MaxSize=256
Context=Applications
Type=Scalable
[scalable/categories]
Size=48
MinSize=32
MaxSize=256
Context=Categories
Type=Scalable
[scalable/devices]
Size=48
MinSize=32
MaxSize=256
Context=Devices
Type=Scalable
[scalable/emblems]
Size=48
MinSize=32
MaxSize=256
Context=Emblems
Type=Scalable
[scalable/places]
Size=48
MinSize=32
MaxSize=256
Context=Places
Type=Scalable
[scalable/status]
Size=48
MinSize=32
MaxSize=256
Context=Status
Type=Scalable
/usr/share/icons/gnome-brave/scalable/
\ No newline at end of file
/usr/share/icons/ubuntu-mono-dark/actions/
\ No newline at end of file
/usr/share/icons/ubuntu-mono-dark/animations/
\ No newline at end of file
/usr/share/icons/ubuntu-mono-dark/apps/
\ No newline at end of file
/usr/share/icons/ubuntu-mono-dark/categories/
\ No newline at end of file
[Icon Theme]
Name=Trisquel-Mono-Dark
Comment=Smooth modern theme designed to be intuitive.
Example=directory-x-normal
#Directory list
Directories=actions/16,actions/22,actions/24,animations/24,animations/24,apps/16,apps/22,apps/24,apps/48,categories/22,categories/24,mimes/16,mimes/22,mimes/24,places/16,places/22,places/24,places/32,places/48,places/64,status/16,status/22,status/24,stock/16,stock/22,stock/24,stock/32,stock/48,stock/64,stock/128
[actions/16]
Size=16
Context=Actions
Type=Fixed
[actions/22]
Size=22
Context=Actions
Type=Fixed
[actions/24]
Size=24
Context=Actions
Type=Fixed
[animations/22]
Size=22
Context=Actions
Type=Fixed
[animations/24]
Size=24
Context=Actions
Type=Fixed
[apps/16]
Size=16
Context=Applications
Type=Fixed
[apps/22]
Size=22
Context=Applications
Type=Fixed
[apps/24]
Size=24
Context=Applications
Type=Fixed
[apps/48]
Size=48
Context=Applications
Type=Fixed
[categories/22]
Size=22
Context=Categories
Type=Fixed
[categories/24]
Size=24
Context=Categories
Type=Fixed
[mimes/16]
Size=16
Context=MimeTypes
Type=Fixed
[mimes/22]
Size=22
Context=MimeTypes
Type=Fixed
[mimes/24]
Size=24
Context=MimeTypes
Type=Fixed
[places/16]
Size=16
Context=Places
Type=Fixed
[places/22]
Size=22
Context=Places
Type=Fixed
[places/24]
Size=24
Context=Places
Type=Fixed
[places/32]
Size=32
Context=Places
Type=Fixed
[places/48]
Size=48
Context=Places
Type=Scalable
[places/64]
Size=64
Context=Places
Type=Scalable
[status/16]
Size=16
Context=Status
Type=Fixed
[status/22]
Size=22
Context=Status
Type=Fixed
[status/24]
Size=24
Context=Status
Type=Fixed
[stock/16]
Size=16
Context=stock
Type=Fixed
[stock/22]
Size=22
Context=stock
Type=Fixed
[stock/24]
Size=24
Context=stock
Type=Fixed
[stock/32]
Size=32
Context=stock
Type=Fixed
[stock/48]
Size=48
Context=stock
Type=Fixed
[stock/64]
Size=64
Context=stock
Type=Fixed
[stock/128]
Size=128
Context=stock
Type=Fixed
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment