diff -Nru etckeeper-0.50ubuntu2/apt.conf etckeeper-0.51ubuntu1/apt.conf --- etckeeper-0.50ubuntu2/apt.conf 2010-12-15 10:45:08.000000000 +0100 +++ etckeeper-0.51ubuntu1/apt.conf 2011-01-01 07:01:05.000000000 +0100 @@ -1,5 +1,5 @@ -DPkg::Pre-Invoke { "if [ -x /usr/sbin/etckeeper ]; then etckeeper pre-install; fi"; }; -DPkg::Post-Invoke { "if [ -x /usr/sbin/etckeeper ]; then etckeeper post-install; fi"; }; +DPkg::Pre-Invoke { "if [ -x /usr/bin/etckeeper ]; then etckeeper pre-install; fi"; }; +DPkg::Post-Invoke { "if [ -x /usr/bin/etckeeper ]; then etckeeper post-install; fi"; }; -RPM::Pre-Invoke { "if [ -x /usr/sbin/etckeeper ]; then etckeeper pre-install; fi"; }; -RPM::Post-Invoke { "if [ -x /usr/sbin/etckeeper ]; then etckeeper post-install; fi"; }; +RPM::Pre-Invoke { "if [ -x /usr/bin/etckeeper ]; then etckeeper pre-install; fi"; }; +RPM::Post-Invoke { "if [ -x /usr/bin/etckeeper ]; then etckeeper post-install; fi"; }; diff -Nru etckeeper-0.50ubuntu2/debian/changelog etckeeper-0.51ubuntu1/debian/changelog --- etckeeper-0.50ubuntu2/debian/changelog 2010-12-15 11:19:18.000000000 +0100 +++ etckeeper-0.51ubuntu1/debian/changelog 2011-01-10 12:41:22.000000000 +0100 @@ -1,3 +1,23 @@ +etckeeper (0.51ubuntu1) natty; urgency=low + + * Merge from debian unstable. (LP: #700987) Remaining changes: + - etckeeper.conf, debian/control: default to bzr. + - etckeeper.spec: Change version to match Ubuntu version + - commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper + is not installed from a tty (like early during installation) + + -- Angel Abad Mon, 10 Jan 2011 12:32:59 +0100 + +etckeeper (0.51) unstable; urgency=low + + * Updated Vietnamese translation of debconf templates. Closes: #601921 + * Improve rpm version change detection. + * Move etckeeper out of sbin, to avoid needing to work around broken + root PATH settings in eg, crontab. Closes: #602438 + * Added Polish translation of debconf templates. Closes: #607563 + + -- Joey Hess Sat, 25 Dec 2010 14:39:57 -0400 + etckeeper (0.50ubuntu2) natty; urgency=low * commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper @@ -670,4 +690,3 @@ * First release. -- Joey Hess Sun, 11 Nov 2007 01:11:21 -0500 - diff -Nru etckeeper-0.50ubuntu2/debian/copyright etckeeper-0.51ubuntu1/debian/copyright --- etckeeper-0.50ubuntu2/debian/copyright 2010-12-15 10:45:08.000000000 +0100 +++ etckeeper-0.51ubuntu1/debian/copyright 2011-01-01 07:01:06.000000000 +0100 @@ -1,5 +1,5 @@ Files: * -Copyright: © 2007-2008 Joey Hess +Copyright: © 2007-2010 Joey Hess License: GPL-2+ The full text of the GPL is distributed as doc/GPL in etckeeper's source, and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems. diff -Nru etckeeper-0.50ubuntu2/debian/cron.daily etckeeper-0.51ubuntu1/debian/cron.daily --- etckeeper-0.50ubuntu2/debian/cron.daily 2010-12-15 10:45:08.000000000 +0100 +++ etckeeper-0.51ubuntu1/debian/cron.daily 2011-01-01 07:01:06.000000000 +0100 @@ -1,6 +1,6 @@ #!/bin/sh set -e -if [ -x /usr/sbin/etckeeper ] && [ -e /etc/etckeeper/etckeeper.conf ]; then +if [ -x /usr/bin/etckeeper ] && [ -e /etc/etckeeper/etckeeper.conf ]; then . /etc/etckeeper/etckeeper.conf if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then # avoid autocommit if an install run is in progress diff -Nru etckeeper-0.50ubuntu2/debian/po/pl.po etckeeper-0.51ubuntu1/debian/po/pl.po --- etckeeper-0.50ubuntu2/debian/po/pl.po 1970-01-01 01:00:00.000000000 +0100 +++ etckeeper-0.51ubuntu1/debian/po/pl.po 2010-12-20 20:07:27.000000000 +0100 @@ -0,0 +1,47 @@ +# Polish translation +# Copyright (C) 2010 +# This file is distributed under the same license as the etckeeper package. +# Artur R. Czechowski , 2010 +# +msgid "" +msgstr "" +"Project-Id-Version: etckeeper 0.50\n" +"Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" +"POT-Creation-Date: 2009-05-06 14:41-0400\n" +"PO-Revision-Date: 2010-12-19 20:07+0100\n" +"Last-Translator: Artur R. Czechowski \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../templates:2001 +msgid "Commit failed" +msgstr "Błąd zapisu." + +#. Type: error +#. Description +#: ../templates:2001 +msgid "An attempt to commit /etc changes to ${VCS} failed." +msgstr "Nieudana próba zapisania zmian przy użyciu ${VCS}" + +#. Type: error +#. Description +#: ../templates:2001 +msgid "You may manually resolve the issues with the uncommitted changes before continuing." +msgstr "Przed kontynuacją możesz ręcznie rozwiązać problemy z niezapisanymi zmianami." + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Remove etckeeper ${VCS} repository and associated files?" +msgstr "Usunąć repozytorium etckeeper ${VCS} i powiązane pliki?" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Etckeeper is being purged from the system, and was used to store /etc in a ${VCS} repository. If you choose to remove the repository, this will DESTROY all history etckeeper has recorded for /etc." +msgstr "Etckeeper jest usuwany z systemu, ale był używany do przechowywania zawartości katalogu /etc w repozytorium ${VCS}. Jeśli wybierzesz usunięcie repozytorium, historia zmian zapisana dla katalogu /etc zostanie BEZPOWROTNIE USUNIĘTA." + diff -Nru etckeeper-0.50ubuntu2/debian/po/vi.po etckeeper-0.51ubuntu1/debian/po/vi.po --- etckeeper-0.50ubuntu2/debian/po/vi.po 2010-12-15 10:45:08.000000000 +0100 +++ etckeeper-0.51ubuntu1/debian/po/vi.po 2010-10-31 04:53:05.000000000 +0100 @@ -1,76 +1,54 @@ # Vietnamese translation for ETC Keeper. -# Copyright © 2007 Free Software Foundation, Inc. -# Clytie Siddall , 2007 +# Copyright © 2010 Free Software Foundation, Inc. +# Clytie Siddall , 2007-2010. # msgid "" msgstr "" -"Project-Id-Version: etckeeper 0.3\n" +"Project-Id-Version: etckeeper 0.50\n" "Report-Msgid-Bugs-To: etckeeper@packages.debian.org\n" "POT-Creation-Date: 2009-05-06 14:41-0400\n" -"PO-Revision-Date: 2007-12-21 22:43+1030\n" +"PO-Revision-Date: 2010-10-31 13:59+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LocFactoryEditor 1.7b1\n" +"X-Generator: LocFactoryEditor 1.8\n" +#: ../templates:2001 #. Type: error #. Description -#: ../templates:2001 msgid "Commit failed" msgstr "Lỗi ghi chép" +#: ../templates:2001 #. Type: error #. Description -#: ../templates:2001 -#, fuzzy #| msgid "An attempt to commit /etc changes to git failed." msgid "An attempt to commit /etc changes to ${VCS} failed." -msgstr "Gặp lỗi khi thử ghi vào git các thay đổi trong « /etc »." +msgstr "Gặp lỗi khi thử ghi chép vào ${VCS} các thay đổi trong « /etc »." +#: ../templates:2001 #. Type: error #. Description -#: ../templates:2001 msgid "" "You may manually resolve the issues with the uncommitted changes before " "continuing." msgstr "" -"Bạn vẫn có thể tự giải quyết các vấn đề về các thay đổi chưa ghi chép, trước " -"khi tiếp tục." +"Bạn cũng có thể tự giải quyết vấn đề về các thay đổi chưa ghi chép, trước khi tiếp tục." +#: ../templates:3001 #. Type: boolean #. Description -#: ../templates:3001 msgid "Remove etckeeper ${VCS} repository and associated files?" -msgstr "" +msgstr "Gỡ bỏ kho lưu ${VCS} etckeeper và các tập tin tương ứng ?" +#: ../templates:3001 #. Type: boolean #. Description -#: ../templates:3001 msgid "" "Etckeeper is being purged from the system, and was used to store /etc in a " "${VCS} repository. If you choose to remove the repository, this will DESTROY " "all history etckeeper has recorded for /etc." -msgstr "" - -#, fuzzy -#~| msgid "Commit changed files in /etc to git?" -#~ msgid "Commit changed files in /etc to ${VCS}?" -#~ msgstr "Ghi vào git các tập tin bị thay đổi trong « /etc » không?" - -#, fuzzy -#~| 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 changed files listed below can be committed automatically:" -#~ msgid "" -#~ "The /etc directory contains uncommitted files or other changes. It's best " -#~ "for all files in /etc to be committed to ${VCS} before running APT. Added " -#~ "and changed files listed below can be committed automatically:" -#~ msgstr "" -#~ "Thư mục « /etc » chứa các tập tin hay thay đổi khác mà chưa ghi chép. Tốt " -#~ "nhất nếu mọi tập tin trong « /etc » được ghi chép, trước khi chạy APT. Có " -#~ "thể tự động ghi chép các tập tin được thêm và bị thay đổi trong danh sách " -#~ "bên dưới:" +msgstr "Gói etckeeper đang bị tẩy khỏi hệ thống: nó từng được sử dụng để lưu trữ « /etc » vào một kho ${VCS}. Sự chọn gỡ bỏ kho lưu này thì HỦY toàn bộ lịch sử được etckeeper giữ đối với « /etc »." diff -Nru etckeeper-0.50ubuntu2/debian/prerm etckeeper-0.51ubuntu1/debian/prerm --- etckeeper-0.50ubuntu2/debian/prerm 2010-12-15 10:45:08.000000000 +0100 +++ etckeeper-0.51ubuntu1/debian/prerm 2011-01-01 07:01:06.000000000 +0100 @@ -13,7 +13,7 @@ if [ -d /etc/etckeeper/uninit.d ]; then cp -a /etc/etckeeper/uninit.d /var/cache/etckeeper/stash fi - if [ -x /usr/sbin/etckeeper ]; then - cp -a /usr/sbin/etckeeper /var/cache/etckeeper/stash + if [ -x /usr/bin/etckeeper ]; then + cp -a /usr/bin/etckeeper /var/cache/etckeeper/stash fi fi diff -Nru etckeeper-0.50ubuntu2/etckeeper.spec etckeeper-0.51ubuntu1/etckeeper.spec --- etckeeper-0.50ubuntu2/etckeeper.spec 2010-12-15 11:19:22.000000000 +0100 +++ etckeeper-0.51ubuntu1/etckeeper.spec 2011-01-10 12:41:25.000000000 +0100 @@ -1,5 +1,5 @@ Name: etckeeper -Version: 0.50ubuntu2 +Version: 0.51ubuntu1 Release: 4%{?dist} Summary: store /etc in git, mercurial, bzr or darcs @@ -43,13 +43,13 @@ rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/etckeeper init -d /etc/ +%{_bindir}/etckeeper init -d /etc/ mkdir -p %{_var}/cache/etckeeper %files %defattr(-,root,root,-) %doc GPL INSTALL TODO README -%{_sbindir}/* +%{_bindir}/* %{_mandir}/* # this isn't very clever and its a manual process update. # but it works diff -Nru etckeeper-0.50ubuntu2/list-installed.d/50list-installed etckeeper-0.51ubuntu1/list-installed.d/50list-installed --- etckeeper-0.50ubuntu2/list-installed.d/50list-installed 2010-12-15 10:45:08.000000000 +0100 +++ etckeeper-0.51ubuntu1/list-installed.d/50list-installed 2011-01-01 07:01:06.000000000 +0100 @@ -6,5 +6,5 @@ dpkg-query -W -f '${Status}\t${Package} ${Version}\n' | \ egrep '(ok installed|ok config-files)' | cut -f2,3 elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then - rpm -qa --queryformat "%{name} %{version} %{arch}\n" | sort + rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort fi diff -Nru etckeeper-0.50ubuntu2/Makefile etckeeper-0.51ubuntu1/Makefile --- etckeeper-0.50ubuntu2/Makefile 2010-12-15 10:45:08.000000000 +0100 +++ etckeeper-0.51ubuntu1/Makefile 2011-01-01 07:01:05.000000000 +0100 @@ -5,7 +5,7 @@ DESTDIR?= prefix=/usr -sbindir=${prefix}/sbin +bindir=${prefix}/bin etcdir=/etc mandir=${prefix}/share/man vardir=/var @@ -21,7 +21,7 @@ mkdir -p $(DESTDIR)$(etcdir)/etckeeper/ $(DESTDIR)$(vardir)/cache/etckeeper/ cp -dR *.d $(DESTDIR)$(etcdir)/etckeeper/ $(INSTALL_DATA) $(CONFFILE) $(DESTDIR)$(etcdir)/etckeeper/etckeeper.conf - $(INSTALL_EXE) etckeeper $(DESTDIR)$(sbindir)/etckeeper + $(INSTALL_EXE) etckeeper $(DESTDIR)$(bindir)/etckeeper $(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man8/etckeeper.8 $(INSTALL_DATA) bash_completion $(DESTDIR)$(etcdir)/bash_completion.d/etckeeper ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt) diff -Nru etckeeper-0.50ubuntu2/pacman-g2.hook etckeeper-0.51ubuntu1/pacman-g2.hook --- etckeeper-0.50ubuntu2/pacman-g2.hook 2010-12-15 10:45:08.000000000 +0100 +++ etckeeper-0.51ubuntu1/pacman-g2.hook 2011-01-01 07:01:05.000000000 +0100 @@ -1,13 +1,13 @@ #!/bin/sh pre_sysupgrade() { - if [ -x /usr/sbin/etckeeper ]; then + if [ -x /usr/bin/etckeeper ]; then etckeeper pre-install fi } post_sysupgrade() { - if [ -x /usr/sbin/etckeeper ]; then + if [ -x /usr/bin/etckeeper ]; then etckeeper post-install fi } diff -Nru etckeeper-0.50ubuntu2/yum-etckeeper.py etckeeper-0.51ubuntu1/yum-etckeeper.py --- etckeeper-0.50ubuntu2/yum-etckeeper.py 2010-12-15 10:45:08.000000000 +0100 +++ etckeeper-0.51ubuntu1/yum-etckeeper.py 2011-01-01 07:01:05.000000000 +0100 @@ -25,12 +25,12 @@ def pretrans_hook(conduit): conduit.info(2, 'etckeeper: pre transaction commit') - servicecmd = conduit.confString('main', 'servicecmd', '/usr/sbin/etckeeper') + servicecmd = conduit.confString('main', 'servicecmd', '/usr/bin/etckeeper') command = '%s %s' % (servicecmd, " pre-install") os.system(command) def posttrans_hook(conduit): conduit.info(2, 'etckeeper: post transaction commit') - servicecmd = conduit.confString('main', 'servicecmd', '/usr/sbin/etckeeper') + servicecmd = conduit.confString('main', 'servicecmd', '/usr/bin/etckeeper') command = '%s %s' % (servicecmd, "post-install") os.system(command)