diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 13 | ||||
| -rw-r--r-- | debian/po/cs.po | 12 | ||||
| -rw-r--r-- | debian/po/eu.po | 12 | ||||
| -rw-r--r-- | debian/po/fi.po | 12 | ||||
| -rw-r--r-- | debian/po/fr.po | 12 | ||||
| -rw-r--r-- | debian/po/gl.po | 12 | ||||
| -rw-r--r-- | debian/po/it.po | 12 | ||||
| -rw-r--r-- | debian/po/nl.po | 12 | ||||
| -rw-r--r-- | debian/po/pt.po | 12 | ||||
| -rw-r--r-- | debian/po/ru.po | 12 | ||||
| -rw-r--r-- | debian/po/templates.pot | 6 | ||||
| -rw-r--r-- | debian/postinst | 30 | ||||
| -rw-r--r-- | debian/preinst | 4 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | debian/templates | 6 |
16 files changed, 98 insertions, 73 deletions
diff --git a/debian/changelog b/debian/changelog index 6ab928d..53c32c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ etckeeper (0.7) UNRELEASED; urgency=low to be used for other package managers. * Use the name of the highlevel package manager in commit messages. * Add gnarly conffile renaming code. + * Support mercurial as an alternative to git. Original patch by Mathieu + Clabaut, significantly changed. [ Miklos Vajna ] * Add support for frugalware's pacman-g2 package manager. diff --git a/debian/control b/debian/control index 708f929..8a03771 100644 --- a/debian/control +++ b/debian/control @@ -10,11 +10,12 @@ Homepage: http://kitenet.net/~joey/code/etckeeper/ Package: etckeeper Architecture: all Section: admin -Depends: metastore, git-core (>= 1:1.5.3.4), ${misc:Depends} -Description: store /etc in git - The etckeeper program is a tool to let /etc be stored in a git +Depends: metastore, git-core (>= 1:1.5.3.4) | mercurial, ${misc:Depends} +Description: store /etc in git or mercurial + The etckeeper program is a tool to let /etc be stored in a git or mercurial repository. It hooks into APT to automatically commit changes made to /etc during package upgrades. It uses 'metastore' to track file metadata that - git does not normally support, but that is important for /etc, such as the - permissions of /etc/shadow. It's quite modular and configurable, while - also being simple to use if you understand the basics of working with git. + version control systems do not normally support, but that is important for + /etc, such as the permissions of /etc/shadow. It's quite modular and + configurable, while also being simple to use if you understand the basics of + working with version control. diff --git a/debian/po/cs.po b/debian/po/cs.po index 7b355b6..a9efe07 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -18,19 +18,19 @@ msgstr "" #. Type: boolean #. Description #: ../templates:2001 -msgid "Commit changed files in /etc to git?" -msgstr "Zapsat změněné soubory v /etc do gitu?" +msgid "Commit changed files in /etc to ${VCS}?" +msgstr "Zapsat změněné soubory v /etc do ${VCS}?" #. Type: boolean #. Description #: ../templates:2001 msgid "" "The /etc directory contains uncommitted files or other changes. It's best " -"for all files in /etc to be committed to git before running APT. Added and " +"for all files in /etc to be committed to ${VCS} before running APT. Added and " "changed files listed below can be committed automatically:" msgstr "" "Adresář /etc obsahuje nezapsané soubory nebo jiné změny. Před spuštěním APT " -"je lepší mít všechny soubory v /etc uloženy do gitu. Přidané a změněné " +"je lepší mít všechny soubory v /etc uloženy do ${VCS}. Přidané a změněné " "soubory vypsané níže budou uloženy automaticky:" #. Type: error @@ -42,8 +42,8 @@ msgstr "Zápis selhal" #. Type: error #. Description #: ../templates:3001 -msgid "An attempt to commit /etc changes to git failed." -msgstr "Pokus o zapsání změn v /etc do gitu selhal." +msgid "An attempt to commit /etc changes to ${VCS} failed." +msgstr "Pokus o zapsání změn v /etc do ${VCS} selhal." #. Type: error #. Description diff --git a/debian/po/eu.po b/debian/po/eu.po index 372725b..86e692f 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -21,19 +21,19 @@ msgstr "" #. Type: boolean #. Description #: ../templates:2001 -msgid "Commit changed files in /etc to git?" -msgstr "Aldaturiko fitxategiak git-en onartu?" +msgid "Commit changed files in /etc to ${VCS}?" +msgstr "Aldaturiko fitxategiak ${VCS}-en onartu?" #. Type: boolean #. Description #: ../templates:2001 msgid "" "The /etc directory contains uncommitted files or other changes. It's best " -"for all files in /etc to be committed to git before running APT. Added and " +"for all files in /etc to be committed to ${VCS} before running APT. Added and " "changed files listed below can be committed automatically:" msgstr "" "/etc direktorioak onartu gabeko fitxategiak edo beste aldaketa batzuk ditu. /" -"etc-n dauden fitxategi guztientzat hobe da git-en onarpena egitea APT " +"etc-n dauden fitxategi guztientzat hobe da ${VCS}-en onarpena egitea APT " "exekutatu baino lehen.Azpian dauden erantsi eta aldatutako fitxategiak " "automatikoki onartu daitezke:" @@ -46,8 +46,8 @@ msgstr "Onarpenak failatu du" #. Type: error #. Description #: ../templates:3001 -msgid "An attempt to commit /etc changes to git failed." -msgstr "/etc-ko aldaketak git-en onartzearen saiakerak huts egin du." +msgid "An attempt to commit /etc changes to ${VCS} failed." +msgstr "/etc-ko aldaketak ${VCS}-en onartzearen saiakerak huts egin du." #. Type: error #. Description diff --git a/debian/po/fi.po b/debian/po/fi.po index a8c4693..78f4766 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -15,19 +15,19 @@ msgstr "" #. Type: boolean #. Description #: ../templates:2001 -msgid "Commit changed files in /etc to git?" -msgstr "Talletetaanko hakemiston /etc muutetut tiedostot gitiin?" +msgid "Commit changed files in /etc to ${VCS}?" +msgstr "Talletetaanko hakemiston /etc muutetut tiedostot ${VCS}in?" #. Type: boolean #. Description #: ../templates:2001 msgid "" "The /etc directory contains uncommitted files or other changes. It's best " -"for all files in /etc to be committed to git before running APT. Added and " +"for all files in /etc to be committed to ${VCS} before running APT. Added and " "changed files listed below can be committed automatically:" msgstr "" "Hakemisto /etc sisältää tallettamattomia tiedostoja tai muita muutoksia. On " -"parasta tallettaa kaikki /etc:n tiedostot git-varastoon ennen APTin " +"parasta tallettaa kaikki /etc:n tiedostot ${VCS}-varastoon ennen APTin " "ajamista. Alla luetellut lisätyt tai muutetut tiedostot voidaan tallettaa " "automaattisesti." @@ -40,8 +40,8 @@ msgstr "Tallettaminen epäonnistui" #. Type: error #. Description #: ../templates:3001 -msgid "An attempt to commit /etc changes to git failed." -msgstr "Yritys tallettaa /etc:n muutokset git-varastoon epäonnistui." +msgid "An attempt to commit /etc changes to ${VCS} failed." +msgstr "Yritys tallettaa /etc:n muutokset ${VCS}-varastoon epäonnistui." #. Type: error #. Description diff --git a/debian/po/fr.po b/debian/po/fr.po index d99ddc3..10f261d 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -21,21 +21,21 @@ msgstr "" #. Type: boolean #. Description #: ../templates:2001 -msgid "Commit changed files in /etc to git?" +msgid "Commit changed files in /etc to ${VCS}?" msgstr "" -"Faut-il enregistrer dans git les modifications de fichiers faites dans /etc ?" +"Faut-il enregistrer dans ${VCS} les modifications de fichiers faites dans /etc ?" #. Type: boolean #. Description #: ../templates:2001 msgid "" "The /etc directory contains uncommitted files or other changes. It's best " -"for all files in /etc to be committed to git before running APT. Added and " +"for all files in /etc to be committed to ${VCS} before running APT. Added and " "changed files listed below can be committed automatically:" msgstr "" "Le répertoire /etc contient des fichiers non synchronisés ou d'autres " "changements. Il est préférable que toutes les modifications apportées dans /" -"etc soient enregistrées dans git avant de lancer APT. Les ajouts et " +"etc soient enregistrées dans ${VCS} avant de lancer APT. Les ajouts et " "modifications de fichiers dont la liste suit peuvent être enregistrés " "automatiquement :" @@ -48,9 +48,9 @@ msgstr "Échec de la synchronisation" #. Type: error #. Description #: ../templates:3001 -msgid "An attempt to commit /etc changes to git failed." +msgid "An attempt to commit /etc changes to ${VCS} failed." msgstr "" -"La tentative d'enregistrement des modifications de /etc vers git a échoué." +"La tentative d'enregistrement des modifications de /etc vers ${VCS} a échoué." #. Type: error #. Description diff --git a/debian/po/gl.po b/debian/po/gl.po index ca00982..7c47c91 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -17,19 +17,19 @@ msgstr "" #. Type: boolean #. Description #: ../templates:2001 -msgid "Commit changed files in /etc to git?" -msgstr "¿Gardar en git os ficheiros modificados de /etc?" +msgid "Commit changed files in /etc to ${VCS}?" +msgstr "¿Gardar en ${VCS} os ficheiros modificados de /etc?" #. Type: boolean #. Description #: ../templates:2001 msgid "" "The /etc directory contains uncommitted files or other changes. It's best " -"for all files in /etc to be committed to git before running APT. Added and " +"for all files in /etc to be committed to ${VCS} before running APT. Added and " "changed files listed below can be committed automatically:" msgstr "" "O directorio /etc contén ficheiros ou outros cambios sen gardar. É mellor " -"que se garden en git tódolos ficheiros de /etc antes de executar APT. Os " +"que se garden en ${VCS} tódolos ficheiros de /etc antes de executar APT. Os " "ficheiros engadidos e modificados da lista de embaixo pódense gardar " "automaticamente:" @@ -42,8 +42,8 @@ msgstr "O gardado fallou" #. Type: error #. Description #: ../templates:3001 -msgid "An attempt to commit /etc changes to git failed." -msgstr "Fallou unha tentativa de gardar en git os cambios de /etc." +msgid "An attempt to commit /etc changes to ${VCS} failed." +msgstr "Fallou unha tentativa de gardar en ${VCS} os cambios de /etc." #. Type: error #. Description diff --git a/debian/po/it.po b/debian/po/it.po index 2b547b4..a40b8bc 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -18,20 +18,20 @@ msgstr "" #. Type: boolean #. Description #: ../templates:2001 -msgid "Commit changed files in /etc to git?" -msgstr "Commit dei file modificati in /etc a git?" +msgid "Commit changed files in /etc to ${VCS}?" +msgstr "Commit dei file modificati in /etc a ${VCS}?" #. Type: boolean #. Description #: ../templates:2001 msgid "" "The /etc directory contains uncommitted files or other changes. It's best " -"for all files in /etc to be committed to git before running APT. Added and " +"for all files in /etc to be committed to ${VCS} before running APT. Added and " "changed files listed below can be committed automatically:" msgstr "" "La directory /etc contiene dei file di cui non è stato ancora fatto il " "commit o altre modifiche. Si consiglia di effettuare il commit di tutti i " -"file in /etc a git prima di eseguire APT. È possibile fare automaticamente " +"file in /etc a ${VCS} prima di eseguire APT. È possibile fare automaticamente " "il commit dei file nuovi o modificati elencati in seguito:" #. Type: error @@ -43,8 +43,8 @@ msgstr "Commit fallito" #. Type: error #. Description #: ../templates:3001 -msgid "An attempt to commit /etc changes to git failed." -msgstr "Il tentativo di commit delle modifiche in /etc a git è fallito." +msgid "An attempt to commit /etc changes to ${VCS} failed." +msgstr "Il tentativo di commit delle modifiche in /etc a ${VCS} è fallito." #. Type: error #. Description diff --git a/debian/po/nl.po b/debian/po/nl.po index dafef37..a6eac26 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -19,19 +19,19 @@ msgstr "" #. Type: boolean #. Description #: ../templates:2001 -msgid "Commit changed files in /etc to git?" -msgstr "Wilt u aangepaste bestanden uit de map '/etc' vastleggen in git?" +msgid "Commit changed files in /etc to ${VCS}?" +msgstr "Wilt u aangepaste bestanden uit de map '/etc' vastleggen in ${VCS}?" #. Type: boolean #. Description #: ../templates:2001 msgid "" "The /etc directory contains uncommitted files or other changes. It's best " -"for all files in /etc to be committed to git before running APT. Added and " +"for all files in /etc to be committed to ${VCS} before running APT. Added and " "changed files listed below can be committed automatically:" msgstr "" "De map '/etc' bevat niet-vastgelegde bestanden of andere aanpassingen. Het " -"is sterk aan te raden om alle aanpassingen in '/etc/' vast te leggen in git " +"is sterk aan te raden om alle aanpassingen in '/etc/' vast te leggen in ${VCS} " "vooraleer u APT uitvoert. De hieronder aangegeven toegevoegde en veranderde " "bestanden worden automatisch opgeslagen." @@ -44,9 +44,9 @@ msgstr "Vastleggen is mislukt." #. Type: error #. Description #: ../templates:3001 -msgid "An attempt to commit /etc changes to git failed." +msgid "An attempt to commit /etc changes to ${VCS} failed." msgstr "" -"De poging om de aanpassingen in '/etc' vast te leggen in git is mislukt." +"De poging om de aanpassingen in '/etc' vast te leggen in ${VCS} is mislukt." #. Type: error #. Description diff --git a/debian/po/pt.po b/debian/po/pt.po index aaea57e..5c88dd5 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -19,19 +19,19 @@ msgstr "" #. Type: boolean #. Description #: ../templates:2001 -msgid "Commit changed files in /etc to git?" -msgstr "Submeter ficheiros alterados em /etc para o git?" +msgid "Commit changed files in /etc to ${VCS}?" +msgstr "Submeter ficheiros alterados em /etc para o ${VCS}?" #. Type: boolean #. Description #: ../templates:2001 msgid "" "The /etc directory contains uncommitted files or other changes. It's best " -"for all files in /etc to be committed to git before running APT. Added and " +"for all files in /etc to be committed to ${VCS} before running APT. Added and " "changed files listed below can be committed automatically:" msgstr "" "O directório /etc contém ficheiros não submetidos ou outras alterações. É " -"melhor que todos os ficheiros em /etc sejam submetidos ao git antes de " +"melhor que todos os ficheiros em /etc sejam submetidos ao ${VCS} antes de " "correr o APT. Os ficheiros adicionados e alterados da lista em baixo podem " "ser submetidos automaticamente:" @@ -44,8 +44,8 @@ msgstr "Submissão falhada" #. Type: error #. Description #: ../templates:3001 -msgid "An attempt to commit /etc changes to git failed." -msgstr "A tentativa de submeter as alterações de /etc ao git falhou." +msgid "An attempt to commit /etc changes to ${VCS} failed." +msgstr "A tentativa de submeter as alterações de /etc ao ${VCS} falhou." #. Type: error #. Description diff --git a/debian/po/ru.po b/debian/po/ru.po index 9255a6d..d85ec38 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -21,19 +21,19 @@ msgstr "" #. Type: boolean #. Description #: ../templates:2001 -msgid "Commit changed files in /etc to git?" -msgstr "Зафиксировать изменённые файлы /etc в git?" +msgid "Commit changed files in /etc to ${VCS}?" +msgstr "Зафиксировать изменённые файлы /etc в ${VCS}?" #. Type: boolean #. Description #: ../templates:2001 msgid "" "The /etc directory contains uncommitted files or other changes. It's best " -"for all files in /etc to be committed to git before running APT. Added and " +"for all files in /etc to be committed to ${VCS} before running APT. Added and " "changed files listed below can be committed automatically:" msgstr "" "Каталог /etc содержит незафиксированные файлы или другие изменения. Перед " -"работой APT лучше зафиксировать все файлы /etc в git. Перечисленные ниже " +"работой APT лучше зафиксировать все файлы /etc в ${VCS}. Перечисленные ниже " "добавленные и изменённые файлы могут быть зафиксированы автоматически:" #. Type: error @@ -45,8 +45,8 @@ msgstr "Фиксация завершилась неудачно" #. Type: error #. Description #: ../templates:3001 -msgid "An attempt to commit /etc changes to git failed." -msgstr "Попытка зафиксировать изменения /etc в git завершилась неудачно." +msgid "An attempt to commit /etc changes to ${VCS} failed." +msgstr "Попытка зафиксировать изменения /etc в ${VCS} завершилась неудачно." #. Type: error #. Description diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 6637bdf..756b2e2 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -19,7 +19,7 @@ msgstr "" #. Type: boolean #. Description #: ../templates:2001 -msgid "Commit changed files in /etc to git?" +msgid "Commit changed files in /etc to ${VCS}?" msgstr "" #. Type: boolean @@ -27,7 +27,7 @@ msgstr "" #: ../templates:2001 msgid "" "The /etc directory contains uncommitted files or other changes. It's best " -"for all files in /etc to be committed to git before running APT. Added and " +"for all files in /etc to be committed to ${VCS} before running APT. Added and " "changed files listed below can be committed automatically:" msgstr "" @@ -40,7 +40,7 @@ msgstr "" #. Type: error #. Description #: ../templates:3001 -msgid "An attempt to commit /etc changes to git failed." +msgid "An attempt to commit /etc changes to ${VCS} failed." msgstr "" #. Type: error diff --git a/debian/postinst b/debian/postinst index 33891dd..ef872b3 100644 --- a/debian/postinst +++ b/debian/postinst @@ -22,16 +22,34 @@ case "$1" in configure) if dpkg --compare-versions "$2" le "0.7"; then if [ -d /etc/etckeeper/pre-apt.d ]; then - for c in README 50uncommitted-changes; do - mv_conffile "/etc/etckeeper/pre-apt.d/$c" "/etc/etckeeper/pre-install.d/$c" - done + mv_conffile "/etc/etckeeper/pre-apt.d/README" \ + "/etc/etckeeper/pre-install.d/README" + mv_conffile "/etc/etckeeper/pre-apt.d/50uncommitted-changes" \ + "/etc/etckeeper/pre-install.d/50uncommitted-changes" rmdir --ignore-fail-on-non-empty /etc/etckeeper/pre-apt.d fi if [ -d /etc/etckeeper/post-apt.d ]; then - for c in README 10git-test 30git-add 40git-rm 50git-commit; do - mv_conffile "/etc/etckeeper/post-apt.d/$c" "/etc/etckeeper/post-install.d/$c" - done + mv_conffile "/etc/etckeeper/post-apt.d/README" \ + "/etc/etckeeper/post-install.d/README" + mv_conffile "/etc/etckeeper/post-apt.d/10git-test" \ + "/etc/etckeeper/post-install.d/10vcs-test" + mv_conffile "/etc/etckeeper/post-apt.d/30git-add" \ + "/etc/etckeeper/post-install.d/30git-add" + mv_conffile "/etc/etckeeper/post-apt.d/40git-rm" \ + "/etc/etckeeper/post-install.d/40git-rm" + mv_conffile "/etc/etckeeper/post-apt.d/50git-commit" \ + "/etc/etckeeper/post-install.d/50vcs-commit" rmdir --ignore-fail-on-non-empty /etc/etckeeper/post-apt.d fi + mv_conffile "/etc/etckeeper/init.d/40git-init" \ + "/etc/etckeeper/init.d/40vcs-init" + mv_conffile "/etc/etckeeper/init.d/50git-ignore" \ + "/etc/etckeeper/init.d/50vcs-ignore" + mv_conffile "/etc/etckeeper/init.d/50git-perm" \ + "/etc/etckeeper/init.d/50vcs-perm" + mv_conffile "/etc/etckeeper/init.d/50git-pre-commit-hook" \ + "/etc/etckeeper/init.d/50vcs-pre-commit-hook" + mv_conffile "/etc/etckeeper/init.d/70git-add" \ + "/etc/etckeeper/init.d/70git-add" fi esac diff --git a/debian/preinst b/debian/preinst index f4a086f..f1ce59a 100644 --- a/debian/preinst +++ b/debian/preinst @@ -25,5 +25,9 @@ install|upgrade) for c in README 10git-test 30git-add 40git-rm 50git-commit; do prep_mv_conffile "/etc/etckeeper/post-apt.d/$c" done + for c in 40git-init 50git-ignore 50git-prerm \ + 50git-pre-commit-hook 70git-add; do + prep_mv_conffile "/etc/etckeeper/init.d/$c" + done fi esac diff --git a/debian/rules b/debian/rules index b56b152..eb737a5 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ binary-indep: build dh_testdir dh_testroot dh_clean -k - $(MAKE) install PREFIX=debian/etckeeper + $(MAKE) install DESTDIR=debian/etckeeper dh_installdocs README TODO dh_installexamples dh_installchangelogs diff --git a/debian/templates b/debian/templates index 565c703..87f634b 100644 --- a/debian/templates +++ b/debian/templates @@ -11,10 +11,10 @@ Template: etckeeper/unclean Type: boolean Default: true #flag:translate!:3 -_Description: Commit changed files in /etc to git? +_Description: Commit changed files in /etc to ${VCS}? The /etc directory contains uncommitted files or other changes. It's best for all files in /etc to be committed - to git before running APT. Added and changed files listed below can + to ${VCS} before running APT. Added and changed files listed below can be committed automatically: . ${STATUS} @@ -22,7 +22,7 @@ _Description: Commit changed files in /etc to git? Template: etckeeper/commit_failed Type: error _Description: Commit failed - An attempt to commit /etc changes to git failed. + An attempt to commit /etc changes to ${VCS} failed. . You may manually resolve the issues with the uncommitted changes before continuing. |