Author: tille Date: Thu Mar 18 19:42:11 2010 New Revision: 2105 URL: http://svn.debian.org/viewsvn/blends?rev=2105&view=rev
Log: Use prerm instead of postrm, debconf translation in UTF-8 Added: blends/trunk/blends/templates/prerm (contents, props changed) Removed: blends/trunk/blends/templates/postrm Modified: blends/trunk/blends/debian/blends-common.lintian-overrides blends/trunk/blends/debian/changelog blends/trunk/blends/devtools/blend-install-helper blends/trunk/blends/devtools/rules blends/trunk/blends/templates/apt.conf blends/trunk/blends/templates/po/ca.po blends/trunk/blends/templates/po/de.po blends/trunk/blends/templates/po/fr.po blends/trunk/blends/templates/po/pt_BR.po Modified: blends/trunk/blends/debian/blends-common.lintian-overrides URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/debian/blends-common.lintian-overrides?rev=2105&view=diff&r1=2105&r2=2104&p1=blends/trunk/blends/debian/blends-common.lintian-overrides&p2=blends/trunk/blends/debian/blends-common.lintian-overrides ============================================================================== --- blends/trunk/blends/debian/blends-common.lintian-overrides (original) +++ blends/trunk/blends/debian/blends-common.lintian-overrides Thu Mar 18 19:42:11 2010 @@ -1,11 +1,11 @@ # The script /usr/lib/menu/blends-menu is not intended to be called by the # blends-common package but should be called by meta packages according to # the Debian Pure Blends philosphy which is explained in blends-doc. -# That's why neither postinst nor postrm will call update-menus and +# That's why neither postinst nor prerm will call update-menus and # if they would it would just be a useless call because it just exits 0 # if called by root. blends-common: postinst-does-not-call-updatemenus usr/share/menu/blend-menu -blends-common: postrm-does-not-call-updatemenus usr/share/menu/blend-menu +blends-common: prerm-does-not-call-updatemenus usr/share/menu/blend-menu # For obvious reasons the script has to be executable which is the # intended use for scripts which dynamically create menu entries. Modified: blends/trunk/blends/debian/changelog URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/debian/changelog?rev=2105&view=diff&r1=2105&r2=2104&p1=blends/trunk/blends/debian/changelog&p2=blends/trunk/blends/debian/changelog ============================================================================== --- blends/trunk/blends/debian/changelog (original) +++ blends/trunk/blends/debian/changelog Thu Mar 18 19:42:11 2010 @@ -1,3 +1,11 @@ +blends (0.6.12) unstable; urgency=low + + * Use prerm instead of postrm to make sure the blends-common package + is installed to recreate menus and thus avoid problems on purging + metapackages like in #574237, #574203, #574208 + + -- Andreas Tille <[email protected]> Wed, 17 Mar 2010 08:06:31 +0100 + blends (0.6.11) unstable; urgency=low * Install NEWS.Debian files properly Modified: blends/trunk/blends/devtools/blend-install-helper URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/devtools/blend-install-helper?rev=2105&view=diff&r1=2105&r2=2104&p1=blends/trunk/blends/devtools/blend-install-helper&p2=blends/trunk/blends/devtools/blend-install-helper ============================================================================== --- blends/trunk/blends/devtools/blend-install-helper (original) +++ blends/trunk/blends/devtools/blend-install-helper Thu Mar 18 19:42:11 2010 @@ -83,7 +83,7 @@ /usr/share/blends/templates/postinst >> debian/"$blend"-"$pkg".postinst sed -e "s/#BLEND#/${blend}/g" \ -e "s/#PKG#/${blend}-${pkg}/g" \ - /usr/share/blends/templates/postrm >> debian/"$blend"-"$pkg".postrm + /usr/share/blends/templates/prerm >> debian/"$blend"-"$pkg".prerm done # if config/config exists use this as general helper script Modified: blends/trunk/blends/devtools/rules URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/devtools/rules?rev=2105&view=diff&r1=2105&r2=2104&p1=blends/trunk/blends/devtools/rules&p2=blends/trunk/blends/devtools/rules ============================================================================== --- blends/trunk/blends/devtools/rules (original) +++ blends/trunk/blends/devtools/rules Thu Mar 18 19:42:11 2010 @@ -52,13 +52,15 @@ # Remove backup files from source tarball rm -f tasks/*~ # Remove auto generated post{inst,rm} scripts - rm -f debian/$(PREFIX)-*.postinst debian/$(PREFIX)-*.postrm + rm -f debian/$(PREFIX)-*.postinst debian/$(PREFIX)-*.prerm # remove auto generated files for config package rm -f debian/$(PREFIX)-config.templates debian/$(PREFIX)-config.config \ debian/$(PREFIX)-config.install debian/$(PREFIX)-config.links \ debian/90$(PREFIX)-config # remove auto generated debconf template translations rm -rf debian/po + # remove possibly remaining debhelper files + rm -f debian/$(PREFIX)-*.debhelper.log dh_clean get-orig-source: $(BLEND)-tasks.desc debian/control Modified: blends/trunk/blends/templates/apt.conf URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/templates/apt.conf?rev=2105&view=diff&r1=2105&r2=2104&p1=blends/trunk/blends/templates/apt.conf&p2=blends/trunk/blends/templates/apt.conf ============================================================================== --- blends/trunk/blends/templates/apt.conf (original) +++ blends/trunk/blends/templates/apt.conf Thu Mar 18 19:42:11 2010 @@ -1,7 +1,4 @@ /* - * $Id$ - */ -/* * APT configuration file for #BLEND#-config package */ Modified: blends/trunk/blends/templates/po/ca.po URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/templates/po/ca.po?rev=2105&view=diff&r1=2105&r2=2104&p1=blends/trunk/blends/templates/po/ca.po&p2=blends/trunk/blends/templates/po/ca.po ============================================================================== --- blends/trunk/blends/templates/po/ca.po (original) +++ blends/trunk/blends/templates/po/ca.po Thu Mar 18 19:42:11 2010 @@ -20,7 +20,7 @@ "Last-Translator: Guillem Jover <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: multiselect @@ -37,19 +37,19 @@ "#BLENDNAME# user menu." msgstr "" "Si us plau seleccioneu, de la llista de tots els usuaris del sistema, " -"aquells usuaris que han d'obtenir un men� d'usuari de #BLENDNAME#." +"aquells usuaris que han d'obtenir un menú d'usuari de #BLENDNAME#." #. Type: select #. Choices #: ../config.templates:10 msgid "Each package installation, End of installation, Never" -msgstr "En cada instal�laci� d'un paquet, Al final de la instal�laci�, Mai" +msgstr "En cada instal·lació d'un paquet, Al final de la instal·lació, Mai" #. Type: select #. Description #: ../config.templates:12 msgid "Build user menus at:" -msgstr "Construir els men�s d'usuari a:" +msgstr "Construir els menús d'usuari a:" #. Type: select #. Description @@ -70,18 +70,18 @@ " the whole installation/upgrading process;\n" " * Never : Do not call \"update-menus\" at all." msgstr "" -"Els meta paquets de la distribuci� de Debian adaptada #BLENDNAME# contenen " -"men�s extra basats en rols per als usuaris. Aquests seran constru�ts quan " +"Els meta paquets de la distribució de Debian adaptada #BLENDNAME# contenen " +"menús extra basats en rols per als usuaris. Aquests seran construïts quan " "un usuari que estigui registrat en algun dels rols faci servir la utilitat " -"�update-menus�. Aix� es pot fer autom�ticament per a tots els usuaris que " -"estiguin registrats per #BLENDNAME# despr�s de la instal�laci� de cada meta " -"paquet, al final de tot el proc�s d'instal�laci� per a estalviar temps en " -"cas d'instal�lar m�s d'un meta paquet o senzillament deixar l'execuci� de " -"�update-menus� als propis usuaris.\n" -" * En cada instal�laci� d'un paquet: Executar �update-menus� despr�s de cada\n" +"«update-menus». Això es pot fer automàticament per a tots els usuaris que " +"estiguin registrats per #BLENDNAME# després de la instal·lació de cada meta " +"paquet, al final de tot el procés d'instal·lació per a estalviar temps en " +"cas d'instal·lar més d'un meta paquet o senzillament deixar l'execució de " +"«update-menus» als propis usuaris.\n" +" * En cada instal·lació d'un paquet: Executar «update-menus» després de cada\n" " meta paquet (consumeix molt de temps);\n" -" * Al final d'instal�laci� : Executar �update-menus� nom�s al final\n" -" de tota la instal�laci� o proc�s\n" -" d'actualitzaci�;\n" -" * Mai : No executar mai �update-menus�." +" * Al final d'instal·lació : Executar «update-menus» només al final\n" +" de tota la instal·lació o procés\n" +" d'actualització;\n" +" * Mai : No executar mai «update-menus»." Modified: blends/trunk/blends/templates/po/de.po URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/templates/po/de.po?rev=2105&view=diff&r1=2105&r2=2104&p1=blends/trunk/blends/templates/po/de.po&p2=blends/trunk/blends/templates/po/de.po ============================================================================== --- blends/trunk/blends/templates/po/de.po (original) +++ blends/trunk/blends/templates/po/de.po Thu Mar 18 19:42:11 2010 @@ -20,7 +20,7 @@ "Last-Translator: Andreas Tille <[email protected]>\n" "Language-Team: German <[email protected]>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: multiselect @@ -36,8 +36,8 @@ "Please select, among the whole system user list, users who should get a " "#BLENDNAME# user menu." msgstr "" -"Bitte w�hlen Sie aus der Liste aller Nutzer des Systems diejenigen aus, die " -"ein #BLENDNAME# Nutzermen� erhalten sollen." +"Bitte wählen Sie aus der Liste aller Nutzer des Systems diejenigen aus, die " +"ein #BLENDNAME# Nutzermenü erhalten sollen." #. Type: select #. Choices @@ -49,7 +49,7 @@ #. Description #: ../config.templates:12 msgid "Build user menus at:" -msgstr "Erzeugen der Nutzermen�s bei:" +msgstr "Erzeugen der Nutzermenüs bei:" #. Type: select #. Description @@ -71,9 +71,9 @@ " * Never : Do not call \"update-menus\" at all." msgstr "" "Die Metapakete der Debian Pure Blend #BLENDNAME# enthalten Rollen " -"basierte Nutzermen�s. Diese werden erzeugt, wenn ein Nutzer, der f�r eine " +"basierte Nutzermenüs. Diese werden erzeugt, wenn ein Nutzer, der für eine " "bestimmte Rolle registriert ist, das Programm \"update-menus\" aufruft. Das " -"kann automatisch f�r alle f�r #BLENDNAME# registrierten Nutzer geschehen und " +"kann automatisch für alle für #BLENDNAME# registrierten Nutzer geschehen und " "zwar nach der Installation jedes einzelnen Metapaketes oder zeitsparend am " "Ende des Installationsprozesses mehrerer Metapakete. Alternativ kann " "\"update-menus\" auch manuell durch jeden Nutzer aufgerufen werden.\n" Modified: blends/trunk/blends/templates/po/fr.po URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/templates/po/fr.po?rev=2105&view=diff&r1=2105&r2=2104&p1=blends/trunk/blends/templates/po/fr.po&p2=blends/trunk/blends/templates/po/fr.po ============================================================================== --- blends/trunk/blends/templates/po/fr.po (original) +++ blends/trunk/blends/templates/po/fr.po Thu Mar 18 19:42:11 2010 @@ -22,7 +22,7 @@ "Last-Translator: Eric Madesclair <[email protected]>\n" "Language-Team: French <[email protected]>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3.1\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" @@ -31,7 +31,7 @@ #. Description #: ../config.templates:4 msgid "#BLENDNAME# users:" -msgstr "Utilisateurs de #BLENDNAME#�:" +msgstr "Utilisateurs de #BLENDNAME# :" #. Type: multiselect #. Description @@ -40,20 +40,20 @@ "Please select, among the whole system user list, users who should get a " "#BLENDNAME# user menu." msgstr "" -"Veuillez choisir parmi tous les utilisateurs du syst�me ceux qui auront un " +"Veuillez choisir parmi tous les utilisateurs du système ceux qui auront un " "menu #BLENDNAME#." #. Type: select #. Choices #: ../config.templates:10 msgid "Each package installation, End of installation, Never" -msgstr "� chaque installation de paquet, � la fin de l'installation, Jamais" +msgstr "À chaque installation de paquet, À la fin de l'installation, Jamais" #. Type: select #. Description #: ../config.templates:12 msgid "Build user menus at:" -msgstr "Construction des menus des utilisateurs�:" +msgstr "Construction des menus des utilisateurs :" #. Type: select #. Description @@ -74,19 +74,19 @@ " the whole installation/upgrading process;\n" " * Never : Do not call \"update-menus\" at all." msgstr "" -"Les m�ta-paquets de la distribution Debian sp�cialis�e #BLENDNAME# comportent " -"des menus additionnels suivant le r�le attribu� aux utilisateurs. Ces menus " -"sont construits quand un utilisateur enregistr� dans un r�le donn� lancera " -"la commande ��update-menus��. Cette op�ration peut se faire automatiquement " -"apr�s l'installation de chaque m�ta-paquet pour chaque utilisateur " -"enregistr� pour #BLENDNAME# ou � la fin du processus d'installation pour " -"gagner du temps si plu sd'un m�ta-paquet est install�. Il est �galement " -"possible de laisser aux utilisateurs l'initiative de lancer eux-m�me la " +"Les méta-paquets de la distribution Debian spécialisée #BLENDNAME# comportent " +"des menus additionnels suivant le rôle attribué aux utilisateurs. Ces menus " +"sont construits quand un utilisateur enregistré dans un rôle donné lancera " +"la commande « update-menus ». Cette opération peut se faire automatiquement " +"après l'installation de chaque méta-paquet pour chaque utilisateur " +"enregistré pour #BLENDNAME# ou à la fin du processus d'installation pour " +"gagner du temps si plu sd'un méta-paquet est installé. Il est également " +"possible de laisser aux utilisateurs l'initiative de lancer eux-même la " "commande.\n" -" - � chaque installation de paquet�: lancer ��update-menus�� apr�s\n" -" l'installation de chaque m�ta-paquet\n" -" (cette op�ration peut �tre longue)�;\n" -" - � la fin de l'installation �: lancer ��update-menus�� seulement\n" -" � la fin de la proc�dure\n" -" d'installation ou de mise � jour�;\n" -" - Jamais �: ne pas du tout lancer ��update-menus��." +" - À chaque installation de paquet : lancer « update-menus » après\n" +" l'installation de chaque méta-paquet\n" +" (cette opération peut être longue) ;\n" +" - À la fin de l'installation : lancer « update-menus » seulement\n" +" à la fin de la procédure\n" +" d'installation ou de mise à jour ;\n" +" - Jamais : ne pas du tout lancer « update-menus »." Modified: blends/trunk/blends/templates/po/pt_BR.po URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/templates/po/pt_BR.po?rev=2105&view=diff&r1=2105&r2=2104&p1=blends/trunk/blends/templates/po/pt_BR.po&p2=blends/trunk/blends/templates/po/pt_BR.po ============================================================================== --- blends/trunk/blends/templates/po/pt_BR.po (original) +++ blends/trunk/blends/templates/po/pt_BR.po Thu Mar 18 19:42:11 2010 @@ -17,17 +17,17 @@ "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-06-28 15:58+0200\n" "PO-Revision-Date: 2004-06-29 22:00-0300\n" -"Last-Translator: Andr� Lu�s Lopes <[email protected]>\n" +"Last-Translator: André Luís Lopes <[email protected]>\n" "Language-Team: Debian-BR Project <[email protected]>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: multiselect #. Description #: ../config.templates:4 msgid "#BLENDNAME# users:" -msgstr "Usu�rios #BLENDNAME# : " +msgstr "Usuários #BLENDNAME# : " #. Type: multiselect #. Description @@ -36,20 +36,20 @@ "Please select, among the whole system user list, users who should get a " "#BLENDNAME# user menu." msgstr "" -"Por favor, selecione dentre a lista de usu�rios de todo o sistema os " -"usu�rios que devem obter um menu de usu�rio do #BLENDNAME#." +"Por favor, selecione dentre a lista de usuários de todo o sistema os " +"usuários que devem obter um menu de usuário do #BLENDNAME#." #. Type: select #. Choices #: ../config.templates:10 msgid "Each package installation, End of installation, Never" -msgstr "A cada instala��o de pacote, Ao final da instala��o, Nunca" +msgstr "A cada instalação de pacote, Ao final da instalação, Nunca" #. Type: select #. Description #: ../config.templates:12 msgid "Build user menus at:" -msgstr "Construir menus de usu�rios :" +msgstr "Construir menus de usuários :" #. Type: select #. Description @@ -70,19 +70,19 @@ " the whole installation/upgrading process;\n" " * Never : Do not call \"update-menus\" at all." msgstr "" -"Os meta-pacotes da Debian Pure Blend #BLENDNAME# cont�m " -"menus extras para usu�rios com base em suas fun��es. Tais menus ser�o " -"gerados quando um usu�rio registrado para uma fun��o espec�fica utilizar " -"o utilit�rio \"update-menus\". Isso pode ser feito automaticamente para " -"todos os usu�rios que estejam registrados para o #BLENDNAME# ap�s a " -"instala��o de cada meta-pacote, ao final de todo o processo de instala��o " -"para economizar tempo no caso da instala��o de mais de um meta-pacote ou " -"deixar a execu��o do utilit�rio \"update-menus\" por conta dos pr�rios" -"usu�rios.\n" -" * A cada instala��o de pacote : Executa \"update-menus\" ap�s cada meta " +"Os meta-pacotes da Debian Pure Blend #BLENDNAME# contém " +"menus extras para usuários com base em suas funções. Tais menus serão " +"gerados quando um usuário registrado para uma função específica utilizar " +"o utilitário \"update-menus\". Isso pode ser feito automaticamente para " +"todos os usuários que estejam registrados para o #BLENDNAME# após a " +"instalação de cada meta-pacote, ao final de todo o processo de instalação " +"para economizar tempo no caso da instalação de mais de um meta-pacote ou " +"deixar a execução do utilitário \"update-menus\" por conta dos prórios" +"usuários.\n" +" * A cada instalação de pacote : Executa \"update-menus\" após cada meta " "pacote\n" " (consome muito tempo);\n" -" * Ao final da instala��o : Executa \"update-menus\" uma �nica vez " +" * Ao final da instalação : Executa \"update-menus\" uma única vez " "no final\n" -" do processo completo de instala��o/atualiza��o;\n" -" * Nunca : N�o executa \"update-menus\"." +" do processo completo de instalação/atualização;\n" +" * Nunca : Não executa \"update-menus\"." Added: blends/trunk/blends/templates/prerm ============================================================================== --- (empty file) +++ blends/trunk/blends/templates/prerm Thu Mar 18 19:42:11 2010 @@ -0,0 +1,58 @@ +#!/bin/bash -e + +# This is the default prerm file from the blends-dev package which is used +# in all meta packages. If there is a certain need to provide extra +# prerm files for some meta packages this template will be appended. Thus +# it will be checked whether debconf was just initialized. +# +# You should not insert the _DEBHELPER_ template in the special postscript +# file because it is in the end of this template anyway. + +########################################################################### +# If the user menus are not needed/wished for a Blend (like for instance +# Debian Edu there is no need to install blends-common package. Thus we +# have to make sure that postinst does not try to include the menu stuff +if [ -d /etc/blends -a -f /etc/blends/blends.conf ] ; then + # Also verify that this Blend provides special configuration + # If not there is no need to execute the user menu code + if [ -d /etc/blends/#BLEND# -a -f /etc/blends/#BLEND#/#BLEND#.conf ] ; then + + test -x /usr/sbin/blend-update-menus && blend-update-menus --blend #BLEND# + + test -s /etc/blends/blends.conf && . /etc/blends/blends.conf + test -s /etc/blends/#BLEND#/#BLEND#.conf && . /etc/blends/#BLEND#/#BLEND#.conf + + if [ -x /usr/sbin/blend-update-usermenus ] ; then + # Initialize debconf if not yet done + if [ _"$DEBCONF_REDIR" = _"" ]; then + . /usr/share/debconf/confmodule + db_version 2.0 + fi + + . /etc/blends/blends.conf + if [ -s /etc/blends/#BLEND#/#BLEND#.conf ] ; then . /etc/blends/#BLEND#/#BLEND#.conf ; fi + + case "$1" in + abort-install|abort-upgrade|failed-upgrade|upgrade) + ;; + remove|purge) + db_get "shared/#BLEND#-config/usermenus" || true + case "$RET" in + "Each package installation") + blend-update-usermenus #BLEND# + ;; + "End of installation") + touch /var/run/#BLEND#-config.usermenu + ;; + esac + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; + esac + fi + fi +fi + +#DEBHELPER#
_______________________________________________ Blends-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/blends-commit
