Merge branch 'testing' of gitorious.org:chakra-packages/desktop into testing

This commit is contained in:
Manuel Tortosa 2010-12-12 18:54:01 +01:00
commit 5b348cbf3f
14 changed files with 238 additions and 77 deletions

View File

@ -1,10 +1,12 @@
[Desktop Entry]
Comment=Chakra Bug Tracking System
Comment[ca]=Sistema de seguiment d'errors de Chakra
Comment[it]=Sistema di tracciatura errori di Chakra
Exec=xdg-open http://www.chakra-project.org/bugs/
Icon=kbugbuster
Name=Bugs
Name[ca]=Errors
Name[it]=Errori
StartupNotify=true
Terminal=false
Type=Application

View File

@ -1,10 +1,12 @@
[Desktop Entry]
Comment=Chakra Package ChangeLogs
Comment[ca]=Registre de canvis a paquets de Chakra
Comment[it]=Registro cambiamenti nei pacchetti di Chakra
Exec=xdg-open http://gitorious.org/chakra-packages
Icon=utilities-log-viewer
Name=Package ChangeLogs
Name[ca]=Registre de canvis a paquets
Name[it]=Registro cambiamenti nei pacchetti
StartupNotify=true
Terminal=false
Type=Application

View File

@ -1,10 +1,12 @@
[Desktop Entry]
Comment=Chakra Code Repository
Comment[ca]=Repostiori de codi de Chakra
Comment[it]=Repository del Codice di Chakra
Exec=xdg-open http://www.chakra-project.org/code/
Icon=preferences-system
Name=Code
Name[ca]=Codi
Name[it]=Codice
StartupNotify=true
Terminal=false
Type=Application

View File

@ -1,10 +1,12 @@
[Desktop Entry]
Comment=Chakra Documentation
Comment[ca]=Documentació de Chakra
Comment[it]=Documentazione di Chakra
Exec=xdg-open http://www.chakra-project.org/wiki/
Icon=system-help
Name=Documentation
Name[ca]=Documentació
Name[ca]=DocumentaciÃ
Name[it]=Documentazione
StartupNotify=true
Terminal=false
Type=Application

View File

@ -1,10 +1,12 @@
[Desktop Entry]
Comment=Chakra Donations
Comment[ca]=Donacions a Chakra
Comment[it]=Donazioni per Chakra
Exec=xdg-open http://www.chakra-project.org/donate.html
Icon=applications-toys
Name=Donate
Name[ca]=Donacions
Name[it]=Donazioni
StartupNotify=true
Terminal=false
Type=Application

View File

@ -1,9 +1,11 @@
[Desktop Entry]
Comment=Chakra Forums
Comment[ca]=Forums de Chakra
Comment[it]=Forum di Chakra
Exec=xdg-open http://www.chakra-project.org/bbs/
Icon=system-users
Name=Forums
Name[it]=Forum
StartupNotify=true
Terminal=false
Type=Application

View File

@ -1,6 +1,7 @@
[Desktop Entry]
Comment=Chakra Homepage
Comment[ca]=Lloc web de Chakra
Comment[it]=Homepage di Chakra
Exec=xdg-open http://www.chakra-project.org
Icon=chakra-flat
Name=Homepage

View File

@ -4,6 +4,7 @@ Exec=/usr/bin/chakra-backup
Name=miniBackup
GenericName=Backup your most important KDE files
GenericName[ca]=Còpia de seguretad dels fitxers més importants
GenericName[it]=Copia di sicurezza dei file più importanti di KDE
X-KDE-StartupNotify=false
Icon=application-x-tarz
Terminal=false

View File

@ -20,7 +20,7 @@ _origname=common
pkgname=kde-common
arch=(i686 x86_64)
pkgver=${_kdever}
pkgrel=1
pkgrel=2
pkgdesc="KDE SC - Common Configuration Files, Scripts and Artwork"
url="http://www.kde.org"
@ -65,16 +65,16 @@ source=(http://www.kde-apps.org/CONTENT/content-files/48411-rootactions_servicem
agent-shutdown.sh)
md5sums=('2afd86671ad0db31718157aecd46d528' # 48411-rootactions_servicemenu_2.4.10.tar.gz
'170a7675d1ee15d9d9d622de3eaa42a3' # servicemenu-copy-path.desktop
'a4108e264667380876ffa7e9842892f4' # servicemenu-copy-path.desktop
'630ffe7118eef8608a9e5e393a0b1e12' # 102825-compressattach.desktop.bz2
'75a91d82f262a2ad4625c55996ec5b82' # servicemenu-rootactions.patch
'd8c49b6344f08ca7b15fa4a1a0ac337f' # Chakra-Bugs.desktop
'fbc9bf83a6fa1fcef218ee3099e0d3d8' # Chakra-ChangeLog.desktop
'b51b1ee5e92d6c427fb5af7a321e16c9' # Chakra-Code.desktop
'06580ed0b0b79da5ed06c25444bb4511' # Chakra-Documentation.desktop
'514a0dc5883feb9a25335f2928e5066f' # Chakra-Donate.desktop
'd42617831b545d152f978c76aa6ac68d' # Chakra-Forum.desktop
'883231b91a7e03025f7f21ba3e9890b0' # Chakra-Homepage.desktop
'3f775e8c5626c216ac9a3e2f5c336a6b' # Chakra-Bugs.desktop
'35f4bd7a1ae4f1741e056a6f5715d822' # Chakra-ChangeLog.desktop
'50da3d602ce65df9350e94c1e35a4885' # Chakra-Code.desktop
'7342f9acdbb689ad7ab22dcb825a7f18' # Chakra-Documentation.desktop
'f84921b4be3029efdcf6d8a176be84f6' # Chakra-Donate.desktop
'1be911f58eeef76fe920b8ebe0941464' # Chakra-Forum.desktop
'bbd1e161559013dca5600c9f25fd6285' # Chakra-Homepage.desktop
'd314d4b658c7664efa407af3317ae0cd' # Chakra.directory
'0688a20010ad27e35755e77c26c94d2c' # kdm.daemon
'535501ac9f3ad05ddd18f8cfee4a2e06' # chakra-config-updater.sh
@ -85,7 +85,7 @@ md5sums=('2afd86671ad0db31718157aecd46d528' # 48411-rootactions_servicemenu_2.4
'4e974016ca509f187b4549d95877bacc' # chakra-update-user-sycoca.sh
'2b0aaf209d35e1e8c660db66e61d13c7' # chakra-sysinfo.sh
'660a7650478e5b7115fbb71811b5d9ee' # chakra-backup.sh
'931b22a8c53c9b02caac70dafc257bab' # Chakra-backup.desktop
'f2ab6538277002028f1263fa7841e2e6' # Chakra-backup.desktop
'466d7fc7cab5738d674df45fdeee4eb0' # updates.conf
'1c85260174e58fc6efaa8d2cac947761' # chakra-icons.tar.gz
'7daec96c125e1e238a35f31ea4a476f0' # agent-startup.sh

View File

@ -12,7 +12,8 @@ X-KDE-Submenu[de]=Pfad kopieren
X-KDE-Submenu[el]=Αντιγραφή Διαδρομής
X-KDE-Submenu[es]=Copiar ruta
X-KDE-Submenu[fr]=Copie de chemin
X-KDE-Submenu[sv]=Kopiera sökväg
X-KDE-Submenu[it]=Copia Percorso
X-KDE-Submenu[sv]=Kopiera sÃkvÃ
[Desktop Action wholePath]
Name=copy whole path
@ -21,6 +22,7 @@ Name[de]=kopiere Pfad
Name[el]=Αντιγραφή ολόκληρης διαδρομής
Name[es]=Copiar ruta completa
Name[fr]=copier le chemin complet
Name[it]=copia l'intero percorso
Name[sv]=Kopiera hela sökvägen
Icon=klipper
Exec=qdbus org.kde.klipper /klipper setClipboardContents %U
@ -32,6 +34,7 @@ Name[de]=kmail Anhang
Name[el]=Eπισύναψη στο kmail
Name[es]=Adjuntar en kmail
Name[fr]=envoyer avec kmail
Name[it]=allega a kmail
Name[sv]=Bifoga till KMail
Icon=internet-mail
Exec=kmail --attach %U
Exec=kmail --attach %U

View File

@ -0,0 +1,43 @@
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# (c) 2010 Drake Justice
pkgname=cinstall
pkgver=20101208
pkgrel=1
depends=('squashfs-tools' 'xz>=5.0.0' 'fakechroot' 'unionfs-fuse')
makedeps=('kdelibs' 'qt')
pkgdesc="Bundle Creator/Launcher and Package-Manager"
arch=("i686" "x86_64")
license=('GPL')
install=$pkgname.install
url="http://chakra-project.org/"
optdepends=('akabei: for akabei support'
'pacman: for pacman support')
source=(http://chakra-project.org/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz)
md5sums=(24c11f065fae3f54b2b6d0bd84f5f54d)
# create tarball: source PKGBUILD && mksource
mksource() {
git clone git://gitorious.org/cinstall/cinstall.git
pushd cinstall
popd
tar -cvJf ${pkgname}-${pkgver}.tar.xz cinstall/*
md5sum ${pkgname}-${pkgver}.tar.xz
}
build() {
cd "${srcdir}/cinstall"
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release
make || return 1
make DESTDIR=${pkgdir} install || return 1
}

View File

@ -0,0 +1,145 @@
post_install() {
if [ -e "/etc/chakra/updates.conf" ] ; then
. /etc/chakra/updates.conf
if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then
/usr/bin/chakra-update-icons
fi
else
echo " > WARNING"
echo " The package kde-common seems not to be installed,"
echo " this can possibly break the installation. Just install it"
echo " manually after this installation/update, run the following"
echo " commands and restart KDE afterwards:"
echo " sudo chakra-config-updater"
echo " kbuildsycoca4"
echo " "
fi
echo "Create group bundle"
if [ "Group: `grep bundle /etc/group`" = "Group: " ] ; then
groupadd bundle
else
echo "Group bundle already exists"
fi
echo "Adding all existing users to group bundle"
for i in `cat /etc/passwd | grep /home | cut -d: -f1` ; do
echo " - adding user $i"
usermod -a -G bundle $i
done
echo "Configuring sudoers file"
if [ "`grep '/bin/mount -o loop -t squashfs' /etc/sudoers`" = "" ] ; then
echo "%bundle ALL=NOPASSWD: /bin/mount -o loop -t squashfs *" >> /etc/sudoers
elif [ "`grep '/bin/mount -o loop -t ext4' /etc/sudoers`" = "" ] ; then
echo "%bundle ALL=NOPASSWD: /bin/mount -o loop -t ext4 *" >> /etc/sudoers
elif [ "`grep '/bin/umount *' /etc/sudoers`" = "" ] ; then
echo "%bundle ALL=NOPASSWD: /bin/umount *" >> /etc/sudoers
elif [ "`grep '/bin/chmod a+w *' /etc/sudoers`" = "" ] ; then
echo "%bundle ALL=NOPASSWD: /bin/chmod a+w *" >> /etc/sudoers
else
echo "sudoers file already modded"
fi
chmod -v 0440 /etc/sudoers
mkdir -p /etc/cb.conf.d &>/dev/null
chmod 775 /etc/cb.conf.d &>/dev/null
chown -R root:bundle /etc/cb.conf.d &>/dev/null
echo "update mime-database"
update-mime-database /usr/share/mime &>/dev/null
}
post_upgrade() {
if [ -e "/etc/chakra/updates.conf" ] ; then
. /etc/chakra/updates.conf
if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then
/usr/bin/chakra-update-icons
fi
else
echo " > WARNING"
echo " The package kde-common seems not to be installed,"
echo " this can possibly break the installation. Just install it"
echo " manually after this installation/update, run the following"
echo " commands and restart KDE afterwards:"
echo " sudo chakra-config-updater"
echo " kbuildsycoca4"
echo " "
fi
echo "Create group bundle"
if [ "Group: `grep bundle /etc/group`" = "Group: " ] ; then
groupadd bundle
else
echo "Group bundle already exists"
fi
echo "Adding all existing users to group bundle"
for i in `cat /etc/passwd | grep /home | cut -d: -f1` ; do
echo " - adding user $i"
usermod -a -G bundle $i
done
echo "Configuring sudoers file"
if [ "`grep '/bin/mount -o loop -t squashfs' /etc/sudoers`" = "" ] ; then
echo "%bundle ALL=NOPASSWD: /bin/mount -o loop -t squashfs *" >> /etc/sudoers
elif [ "`grep '/bin/mount -o loop -t ext4' /etc/sudoers`" = "" ] ; then
echo "%bundle ALL=NOPASSWD: /bin/mount -o loop -t ext4 *" >> /etc/sudoers
elif [ "`grep '/bin/umount *' /etc/sudoers`" = "" ] ; then
echo "%bundle ALL=NOPASSWD: /bin/umount *" >> /etc/sudoers
elif [ "`grep '/bin/chmod a+w *' /etc/sudoers`" = "" ] ; then
echo "%bundle ALL=NOPASSWD: /bin/chmod a+w *" >> /etc/sudoers
else
echo "sudoers file already modded"
fi
chmod -v 0440 /etc/sudoers
mkdir -p /etc/cb.conf.d &>/dev/null
chmod 775 /etc/cb.conf.d &>/dev/null
chown -R root:bundle /etc/cb.conf.d &>/dev/null
rm /etc/cb.conf.d/* -rv
echo "update mime-database"
update-mime-database /usr/share/mime &>/dev/null
}
post_remove() {
if [ -e "/etc/chakra/updates.conf" ] ; then
. /etc/chakra/updates.conf
if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then
/usr/bin/chakra-update-icons
fi
else
echo " > WARNING"
echo " The package kde-common seems not to be installed,"
echo " this can possibly break the installation. Just install it"
echo " manually after this installation/update, run the following"
echo " commands and restart KDE afterwards:"
echo " sudo chakra-config-updater"
echo " kbuildsycoca4"
echo " "
fi
rm /etc/cb.conf.d -r
}
op=$1
shift
$op $*

View File

@ -1,48 +0,0 @@
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
#
# package info
#
pkgname=tribe-partitionmanager
pkgver=0.3.40
pkgrel=1
pkgdesc="Tribe's partitionmanager"
url="http://git.chakra-project.org/chakra/"
license="GPL"
arch=('i686' 'x86_64')
depends=('kdebase-workspace' 'parted>=2.3' 'e2fsprogs' 'libatasmart')
replaces=('kdemod-tribe-partitionmanager')
makedepends=('cmake' 'automoc4' 'pkgconfig')
conflicts=('kdemod-tribe-partitionmanager' 'chakra-libpartitionmanager')
groups=('kde-uninstall')
source=("http://chakra-project.org/sources/tribe/tribe-$pkgver.tar.gz")
md5sums=('366779bc66699708838a82dfa5dda060')
#
# build function
#
build()
{
cd "${srcdir}/chakra-tribe/lib/"
cmake . -DCMAKE_INSTALL_PREFIX=${_installprefix} \
-DCMAKE_BUILD_TYPE=${_build_type} \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' || return 1
msg "Starting make..."
make || return 1
msg "Make successful, installing..."
make DESTDIR=$startdir/pkg install || return 1
# remove nasty files
find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} +
}

View File

@ -4,28 +4,26 @@
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
#
# package info
#
pkgname=tribe
pkgver=0.3.40
pkgver=0.3.45.6
pkgrel=1
pkgdesc="Tribe - Chakra LiveCD Installer"
url="http://git.chakra-project.org/chakra/"
license="GPL"
arch=('i686' 'x86_64')
depends=('kdelibs' 'kdeedu-marble>=4.5.80' 'squashfs-tools' "tribe-partitionmanager>=$pkgver")
depends=('kdelibs' 'kdeedu-marble>=4.5.80' 'squashfs-tools' 'partitionmanager>=1196188')
makedepends=('cmake' 'kdelibs' 'kdeedu-marble>=4.5.80' 'kdebase-workspace')
provides=('tribe')
replaces=('kdemod-tribe-svn' 'kdemod-tribe')
conflicts=('chakra-tribe' 'tribe-svn' 'kdemod-partitionmanager' 'kdemod-tribe' 'kdemod-tribe-debug' 'kdemod-tribe-partitionmanager')
options=('!splithdr' '!splitdbg')
source=("http://chakra-project.org/sources/tribe/tribe-$pkgver.tar.gz")
md5sums=('366779bc66699708838a82dfa5dda060')
source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}.tar.gz"
'http://chakra-project.org/sources/tribe/mirrorlist')
md5sums=('d2729edab1c98f499493ac312f5f4a46'
'dfb3c82b5b1fbc2fccba8725c74dab7a')
groups=('kde-uninstall')
install=tools-tribe.install
@ -38,19 +36,16 @@ build()
cd "${srcdir}"
# fixes
#cd "${srcdir}/chakra-$pkgname/src"
#patch -Np0 -i ${srcdir}/../root-pw.patch || return 1
#cd "${srcdir}/chakra-$pkgname"
#patch -Np1 -i ${srcdir}/fix.patch || return 1
cd "${srcdir}/chakra-$pkgname"
# add pkgver to tribe
sed -i -e "s~source build/from git~Build: ${pkgver}-${pkgrel} (Chakra)~g" config-tribe.h.cmake
sed -i -e "s~git-checkout~${pkgver}~g" "${srcdir}/chakra-$pkgname/scripts/postinstall-functions/job-initialize-target"
# fix keyboard routine
sed -i -e "s~HAL~XORG~g" "${srcdir}/chakra-$pkgname/scripts/postinstall-functions/job-setup-xorg"
sed -i -e "s~etc/hal/fdi/policy/10-keymap.fdi~etc/X11/xorg.conf.d/10-keyboard.conf~g" "${srcdir}/chakra-$pkgname/scripts/postinstall-functions/job-setup-xorg"
cmake . -DCMAKE_INSTALL_PREFIX=${_installprefix} \
-DCMAKE_BUILD_TYPE=${_build_type} \
cmake . -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' || return 1
@ -60,9 +55,18 @@ build()
msg "Make successful, installing..."
make DESTDIR=$startdir/pkg install || return 1
msg "fix selfnet issue..."
mkdir -p $startdir/pkg/etc/skel
cp -v $srcdir/mirrorlist $startdir/pkg/etc/skel
sed -i -e 's~rankmirrors -t -n 5 ${mountpoint}/etc/pacman.d/mirrorlist~rankmirrors -t -n 5 /etc/skel/mirrorlist~g' $startdir/pkg/usr/share/tribe/scripts/job-configure-pacman
sed -i -e "s/@carch@/${CARCH}/g" $startdir/pkg/etc/skel/mirrorlist
msg "fix postinstall.conf..."
sed -i -e 's~256~260~g' $startdir/pkg/usr/share/tribe/config/postinstall.conf
# remove nasty files
find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} +
# remove release notes
rm -v $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
}
}