Ole Streicher pushed to branch master at Debian Blends Team / blends
Commits: 4468c766 by Sunil Mohan Adapa at 2020-10-07T22:31:43-07:00 Fix a typo in comments Signed-off-by: Sunil Mohan Adapa <[email protected]> - - - - - 039005c6 by Sunil Mohan Adapa at 2020-10-07T22:40:00-07:00 cosmetic: Drop some trailing spaces Signed-off-by: Sunil Mohan Adapa <[email protected]> - - - - - 20ee4aa7 by Sunil Mohan Adapa at 2020-10-07T22:40:03-07:00 doc: en: Fix typo in Makefile target name The framework generates <Blend>-tasks.desc and not <Blend>-tasks.desk. Signed-off-by: Sunil Mohan Adapa <[email protected]> - - - - - 6b9d3f5f by Sunil Mohan Adapa at 2020-10-07T22:40:07-07:00 doc: en: Fix minor a grammatical error 'Not only' should be followed by 'but also' with 'also' being optional. Signed-off-by: Sunil Mohan Adapa <[email protected]> - - - - - d511792e by Sunil Mohan Adapa at 2020-10-07T22:40:10-07:00 example: Update to latest policy - Priority 'extra' is now 'optional'. - Use latest debhelper. - Depend on latest version of blends-dev available in Debian Buster. - Standards version has been kept as it needs investigation. Signed-off-by: Sunil Mohan Adapa <[email protected]> - - - - - d2cd5f8d by Ole Streicher at 2020-10-08T05:58:01+00:00 Merge branch 'minor-fixes' into 'master' Fix minor issues and update some example code See merge request blends-team/blends!5 - - - - - 7 changed files: - blend-task-lister - blend-update-menus - blend-user - doc/en/A_devel.xml - − examples/debian/compat - examples/debian/control.stub - share/menu/blend-menu Changes: ===================================== blend-task-lister ===================================== @@ -27,7 +27,7 @@ if [ -n "${DBBACKEND}" ]; then checkBlend ${BLEND} || blendFail $? "Debian Pure Blend ${BLEND} does not exist" fi -# Check consistency of passed argouments +# Check consistency of passed arguments if [ $# -ne 1 ] ; then # printing usage makes no sense here exit 67 # EX_USAGE ===================================== blend-update-menus ===================================== @@ -87,7 +87,7 @@ done # update menu scripts for BLENDUSER, for any Blend, if any -if [ -n "${BLENDUSER}" ]; then +if [ -n "${BLENDUSER}" ]; then SYSSCRIPT="${SHAREDIR}/menu/blend-menu" USERSCRIPT="`getUserHome ${BLENDUSER}`/.menu/blend-menu" @@ -96,26 +96,26 @@ if [ -n "${BLENDUSER}" ]; then blendFail 67 "User does not exist" isUserRegistered ${BLENDUSER} || \ blendFail 67 "User ${BLENDUSER} is not registered to any Blend" - + # there's nothing to do on per user basis criteria #updateUser ${BLENDUSER} "${SYSSCRIPT}" "${USERSCRIPT}" set +e # update menu scripts for any user registered into the specified Blend -elif [ -n "${BLEND}" ]; then +elif [ -n "${BLEND}" ]; then # Now that we know the selected Blend, we can check if there is a local # configuration for it (ie differnt backend from the default one) test -n "${BLEND}" -a -f ${CONFBASE}/${BLEND}/${BLEND}.conf && . ${CONFBASE}/${BLEND}/${BLEND}.conf - + set -e checkBlend ${BLEND} || \ blendFail $? "Debian Pure Blend ${BLEND} does not exist" - + # there's nothing to do on per Blend basis criteria #SYSSCRIPT="${SHAREDIR}/menu/blend-menu" #updateBlend ${BLEND} "${SYSSCRIPT}" set +e else exec $0 --user `whoami` -fi +fi ===================================== blend-user ===================================== @@ -7,7 +7,7 @@ usage () { echo "action: add|del" echo "Blend: `getBlendList|tr ' ' '|'`" echo "user: user of the system who should be added to the Blend" - echo "Role: a registered Role for specified Blend" + echo "Role: a registered Role for specified Blend" echo " (default: the one named like Blend)" } @@ -20,7 +20,7 @@ CONFBASE=${CONFBASE:-/etc/blends} . ${CONFBASE}/blends.conf -# Check consistency of passed argouments +# Check consistency of passed arguments if [ $# -eq 0 ] ; then usage exit 67 # EX_USAGE @@ -68,7 +68,7 @@ if [ -n "${DBBACKEND}" ]; then elif [ "`toLower ${ACTION}`" = "del" ]; then unsetUserRole ${BLEND} ${BLENDUSER} ${ROLE} || \ blendFail $? "Failed to unset user ${BLENDUSER} to role ${ROLE}" - fi + fi set +e else ===================================== doc/en/A_devel.xml ===================================== @@ -62,7 +62,7 @@ to call them directly. Here is a list of the <filename>make</filename> targets. </para> <sect2 id="blends-tasks.desc"> - <title>Blend<package>-tasks.desk</package></title> + <title>Blend<package>-tasks.desc</package></title> <para> This target generates a <package>task-description.template</package> file. @@ -105,9 +105,9 @@ package pool can be considered as the packages available for a combination of distribution, component and release values. By default when creating metapackages debian,main,testing values are used to "create" a package pool from UDD. Once a Blends' dependencies are verified the <filename>debian/control</filename> file is generated -according to the available packages. This does not only work for the Debian package pool -containing the distributions stable, testing and unstable. You can -even build your metapackages against a different package pool of a +according to the available packages. This works not only for the Debian package pool +containing the distributions stable, testing and unstable, but also +when building your metapackages against a different package pool of a Debian based distribution. This is for instance used to create the SkoleLinux metapackages. </para> @@ -191,7 +191,7 @@ influence the creation of the <filename>debian/control</filename> file are given Packages that are specified with "Suggests" will not be taken over to the <package>tasksel</package> control file - (Blend<filename>-tasks.desk</filename>, + (Blend<filename>-tasks.desc</filename>, see <xref linkend="blends-tasks.desc"/>) but only to the list of suggested packages of the according metapackage.</para> </listitem> @@ -204,7 +204,7 @@ influence the creation of the <filename>debian/control</filename> file are given are tagged with Ignore will not be taken over into the list of dependencies inside the <filename>debian/control</filename> file of the resulting - metapackage neither to the Blend<filename>-tasks.desk</filename> + metapackage neither to the Blend<filename>-tasks.desc</filename> control file for <package>tasksel</package> but will be taken over onto the installation medium of a Blend in case there is some space left. This key becomes especially ===================================== examples/debian/compat deleted ===================================== @@ -1 +0,0 @@ -9 ===================================== examples/debian/control.stub ===================================== @@ -1,9 +1,9 @@ Source: debian-_BLEND_ Section: misc -Priority: extra +Priority: optional Maintainer: _MAINTAINER_ <[email protected]> Uploaders: _OPTIONAL-FURTHER-MAINTAINER_ <[email protected]> -Build-Depends-Indep: debhelper (>= 9), - blends-dev (>= 0.6.16.4) +Build-Depends-Indep: blends-dev (>= 0.7.2~) +Build-Depends: debhelper-compat (= 13) Standards-Version: 3.9.4 ===================================== share/menu/blend-menu ===================================== @@ -197,7 +197,7 @@ EOT # HACK: Add blank line which helps in case of missing newlines echo done - + [ -s "$blendmenufile" ] && cat "$blendmenufile" } View it on GitLab: https://salsa.debian.org/blends-team/blends/-/compare/5ddb83c20cd98823aa724cba576b87d6af1e0627...d2cd5f8dce8baa99b70e25b5e59fa5d207d53065 -- View it on GitLab: https://salsa.debian.org/blends-team/blends/-/compare/5ddb83c20cd98823aa724cba576b87d6af1e0627...d2cd5f8dce8baa99b70e25b5e59fa5d207d53065 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Blends-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/blends-commit
