| 1 |
hasufell 13/05/31 19:35:02 |
| 2 |
|
| 3 |
Added: etckeeper-1.3-gentoo.patch |
| 4 |
Log: |
| 5 |
version bump wrt #469370 by Manuel Rüger |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-apps/etckeeper/files/etckeeper-1.3-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/etckeeper/files/etckeeper-1.3-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/etckeeper/files/etckeeper-1.3-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: etckeeper-1.3-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
Original patch by Luke-Jr (luke-jr+gentoobugs@×××××××.org) |
| 18 |
Minor fixes by Manuel Rueger (mrueg@××××.eu) |
| 19 |
|
| 20 |
https://bugs.gentoo.org/show_bug.cgi?id=216114 |
| 21 |
Gentoo specific additions |
| 22 |
|
| 23 |
--- Makefile |
| 24 |
+++ Makefile |
| 25 |
@@ -23,7 +23,6 @@ |
| 26 |
$(INSTALL_DATA) $(CONFFILE) $(DESTDIR)$(etcdir)/etckeeper/etckeeper.conf |
| 27 |
$(INSTALL_EXE) etckeeper $(DESTDIR)$(bindir)/etckeeper |
| 28 |
$(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man8/etckeeper.8 |
| 29 |
- $(INSTALL_DATA) bash_completion $(DESTDIR)$(etcdir)/bash_completion.d/etckeeper |
| 30 |
ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt) |
| 31 |
$(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper |
| 32 |
mkdir -p $(DESTDIR)$(etcdir)/cruft/filters-unex |
| 33 |
@@ -39,7 +37,6 @@ |
| 34 |
ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper) |
| 35 |
$(INSTALL_DATA) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py |
| 36 |
endif |
| 37 |
- -./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed" |
| 38 |
echo "** installation successful" |
| 39 |
|
| 40 |
clean: etckeeper.spec |
| 41 |
--- etckeeper.conf |
| 42 |
+++ etckeeper.conf |
| 43 |
@@ -31,11 +31,13 @@ |
| 44 |
|
| 45 |
# The high-level package manager that's being used. |
| 46 |
# (apt, pacman-g2, yum, zypper etc) |
| 47 |
-HIGHLEVEL_PACKAGE_MANAGER=apt |
| 48 |
+# For gentoo this is emerge |
| 49 |
+HIGHLEVEL_PACKAGE_MANAGER=emerge |
| 50 |
|
| 51 |
# The low-level package manager that's being used. |
| 52 |
# (dpkg, rpm, pacman-g2, etc) |
| 53 |
-LOWLEVEL_PACKAGE_MANAGER=dpkg |
| 54 |
+# For gentoo this is qlist |
| 55 |
+LOWLEVEL_PACKAGE_MANAGER=qlist |
| 56 |
|
| 57 |
# To push each commit to a remote, put the name of the remote here. |
| 58 |
# (eg, "origin" for git). |
| 59 |
--- list-installed.d/50list-installed |
| 60 |
+++ list-installed.d/50list-installed |
| 61 |
@@ -7,4 +7,6 @@ |
| 62 |
egrep '(ok installed|ok config-files)' | cut -f2,3 |
| 63 |
elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then |
| 64 |
rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort |
| 65 |
+elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then |
| 66 |
+ qlist -ICv |
| 67 |
fi |
| 68 |
--- update-ignore.d/01update-ignore |
| 69 |
+++ update-ignore.d/01update-ignore |
| 70 |
@@ -99,6 +99,10 @@ |
| 71 |
ignore "*.pacorig" |
| 72 |
ignore "*.pacsave" |
| 73 |
nl |
| 74 |
+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" ]; then |
| 75 |
+ comment "new and old versions of conffiles, stored by emerge" |
| 76 |
+ ignore "*.cfg_*" |
| 77 |
+ nl |
| 78 |
fi |
| 79 |
|
| 80 |
comment "old versions of files" |
Archives