Commit 296bf0c7 authored by arpinux's avatar arpinux

fix doc links, remove synaptics by default, remove touchpadtap

parent d356128e
20xx xx xx 20xx xx xx
DFLinux-Stretch-rev01 : DFLinux-Stretch-rev1 :
- ajout de xserver-xorg-input-synaptics - nettoyage
- ... - ...
----------------------------------------------------------------------- -----------------------------------------------------------------------
......
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
# https://framagit.org/dflinux/DFiso # https://framagit.org/dflinux/DFiso
# cfg ------------------------------------------------------------------ # cfg ------------------------------------------------------------------
VERSION="stretch" VERSION="stretch-rev1"
LCDD="../lescahiersdudebutant/docs/paquet_debian/lescahiersdudebutant_20170629_all.deb"
DFLDOC="../documentation/docs/paquet_debian/dflinux-manuel_20170630_all.deb"
if [ `whoami` != root ]; then if [ `whoami` != root ]; then
echo "erreur : lancer DFbuild en tant qu'administrateur" echo "erreur : lancer DFbuild en tant qu'administrateur"
...@@ -32,10 +34,31 @@ lb clean ...@@ -32,10 +34,31 @@ lb clean
## mise en place ## mise en place
echo "INFO: building DFLinux-${VERSION}-${ARCH}" echo "INFO: building DFLinux-${VERSION}-${ARCH}"
# dossier des paquets externes
mkdir -p config/packages
# import de la doc
cp $LCDD config/packages/
cp $DFLDOC config/packages/
# construction des paquets externes
# cd ext/mydflinux
# equivs-build mydflinux
# cd ../handymenu
# equivs-build handymenu
# cd ../info4help
# esuivs-build info4help
# import des paquets externes
cp ext/*.deb config/packages/
# architecture # architecture
if [ "$ARCH" == "i386" ]; then lb config -a ${ARCH} -k "686"; lb build; fi if [ "$ARCH" == "i386" ]; then lb config -a ${ARCH} -k "686"; lb build; fi
if [ "$ARCH" == "amd64" ]; then lb config -a ${ARCH}; lb build; fi if [ "$ARCH" == "amd64" ]; then lb config -a ${ARCH}; lb build; fi
# nettoyage
rm -Rf config/packages config/includes config/includes.bootstrap config/includes.source
## renommage ## renommage
echo "INFO: renommer" echo "INFO: renommer"
if test -f live-image-${ARCH}.hybrid.iso; then if test -f live-image-${ARCH}.hybrid.iso; then
...@@ -44,6 +67,7 @@ if test -f live-image-${ARCH}.hybrid.iso; then ...@@ -44,6 +67,7 @@ if test -f live-image-${ARCH}.hybrid.iso; then
mv chroot.packages.install dfl-${ARCH}/dflinux-${VERSION}-${ARCH}.pkgs mv chroot.packages.install dfl-${ARCH}/dflinux-${VERSION}-${ARCH}.pkgs
mv dflinux.log dfl-${ARCH}/dflinux-${VERSION}-${ARCH}.log mv dflinux.log dfl-${ARCH}/dflinux-${VERSION}-${ARCH}.log
cd dfl-${ARCH} && md5sum dflinux-${VERSION}-${ARCH}.iso > dflinux-${VERSION}-${ARCH}.md5 && cd ../ cd dfl-${ARCH} && md5sum dflinux-${VERSION}-${ARCH}.iso > dflinux-${VERSION}-${ARCH}.md5 && cd ../
lb clean
else else
echo "ISO non construite : erreur, voir le fichier dflinux.log" echo "ISO non construite : erreur, voir le fichier dflinux.log"
exit 1 exit 1
......
[Desktop Entry]
Encoding=UTF-8
Version=0.9.4
Type=Application
Name=touchpad-tap
Comment=activer le tap-to-clic du touchpad
Exec=/usr/bin/touchpad-tap
StartupNotify=false
Terminal=false
Hidden=true
...@@ -3,9 +3,9 @@ Version=1.0 ...@@ -3,9 +3,9 @@ Version=1.0
Type=Application Type=Application
Name=Les cahiers du débutant Name=Les cahiers du débutant
Comment=Bien débuter sur Debian Comment=Bien débuter sur Debian
Icon=dfl-doc Icon=lcdd
Exec=xdg-open /usr/share/dflinux/les_cahiers_du_debutant.pdf Exec=xdg-open /usr/share/lcdd/les_cahiers_du_debutant.pdf
Terminal=false Terminal=false
StartupNotify=true StartupNotify=true
Categories=Application;Utility; Categories=Application;Utility;
X-XFCE-Source=file:///usr/share/applications/dfl-doc.desktop X-XFCE-Source=file:///usr/share/applications/lcdd.desktop
favorites=exo-web-browser.desktop,exo-mail-reader.desktop,exo-file-manager.desktop,libreoffice-startcenter.desktop,handymenu.desktop,dfl-doc.desktop,dfl-manuel.desktop favorites=exo-web-browser.desktop,exo-mail-reader.desktop,exo-file-manager.desktop,libreoffice-startcenter.desktop,handymenu.desktop,lcdd.desktop,dfl-manuel.desktop
recent=xfce4-terminal.desktop,xfce-ui-settings.desktop recent=xfce4-terminal.desktop,xfce-ui-settings.desktop
button-title=Menu des applications button-title=Menu des applications
button-icon=debian-avatar button-icon=debian-avatar
......
...@@ -3,9 +3,9 @@ Version=1.0 ...@@ -3,9 +3,9 @@ Version=1.0
Type=Application Type=Application
Name=Les cahiers du débutant Name=Les cahiers du débutant
Comment=Bien débuter sur Debian Comment=Bien débuter sur Debian
Icon=dfl-doc Icon=lcdd
Exec=xdg-open /usr/share/dflinux/les_cahiers_du_debutant.pdf Exec=xdg-open /usr/share/lcdd/les_cahiers_du_debutant.pdf
Terminal=false Terminal=false
StartupNotify=true StartupNotify=true
Categories=Application;Utility; Categories=Application;Utility;
X-XFCE-Source=file:///usr/share/applications/dfl-doc.desktop X-XFCE-Source=file:///usr/share/applications/lcdd.desktop
#!/bin/bash
#propriétés du touchpad - voir man synclient
synclient VertEdgeScroll=1 &
synclient TapButton1=1 &
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
task-french-desktop task-french task-print-server task-french-desktop task-french task-print-server
lsb-release acpi accountsservice lsb-release acpi accountsservice
bash bash-completion command-not-found bash bash-completion command-not-found
xserver-xorg-input-synaptics
#login #login
lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings
......
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