Attachment #310437 for bug #216114

Lines 31-38 Link Here

(-)etckeeper.conf.old (-2 / +4 lines)
31		31
32	# The high-level package manager that's being used.	32	# The high-level package manager that's being used.
33	# (apt, pacman-g2, yum etc)	33	# (apt, pacman-g2, yum etc)
34	HIGHLEVEL_PACKAGE_MANAGER=apt	34	# For gentoo this is emerge
		35	HIGHLEVEL_PACKAGE_MANAGER=emerge
35		36
36	# The low-level package manager that's being used.	37	# The low-level package manager that's being used.
37	# (dpkg, rpm, pacman-g2, etc)	38	# (dpkg, rpm, pacman-g2, etc)
38	LOWLEVEL_PACKAGE_MANAGER=dpkg	39	# For gentoo this is qlist
		40	LOWLEVEL_PACKAGE_MANAGER=qlist

Lines 7-10 Link Here

(-)list-installed.d/50list-installed.old (+2 lines)
7	egrep '(ok installed\|ok config-files)' \| cut -f2,3	7	egrep '(ok installed\|ok config-files)' \| cut -f2,3
8	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then	8	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then
9	rpm -qa --qf "%\|epoch?{%{epoch}}:{0}\|:%{name}-%{version}-%{release}.%{arch}\n" \| sort	9	rpm -qa --qf "%\|epoch?{%{epoch}}:{0}\|:%{name}-%{version}-%{release}.%{arch}\n" \| sort
		10	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then
		11	qlist -ICv
10	fi	12	fi

Lines 99-104 Link Here

(-)update-ignore.d/01update-ignore.old (+4 lines)
99	ignore "*.pacorig"	99	ignore "*.pacorig"
100	ignore "*.pacsave"	100	ignore "*.pacsave"
101	nl	101	nl
		102	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" ]; then
		103	comment "new and old versions of conffiles, stored by emerge"
		104	ignore ".cfg_"
		105	nl
102	fi	106	fi
103		107
104	comment "old versions of files"	108	comment "old versions of files"

Return to bug 216114

Lines 23-29 Link Here

(-)Makefile.old (-2 lines)
23	$(INSTALL_DATA) $(CONFFILE) $(DESTDIR)$(etcdir)/etckeeper/etckeeper.conf	23	$(INSTALL_DATA) $(CONFFILE) $(DESTDIR)$(etcdir)/etckeeper/etckeeper.conf
24	$(INSTALL_EXE) etckeeper $(DESTDIR)$(bindir)/etckeeper	24	$(INSTALL_EXE) etckeeper $(DESTDIR)$(bindir)/etckeeper
25	$(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man8/etckeeper.8	25	$(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man8/etckeeper.8
26	$(INSTALL_DATA) bash_completion $(DESTDIR)$(etcdir)/bash_completion.d/etckeeper
27	ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt)	26	ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt)
28	$(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper	27	$(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper
29	mkdir -p $(DESTDIR)$(etcdir)/cruft/filters-unex	28	mkdir -p $(DESTDIR)$(etcdir)/cruft/filters-unex
Lines 36-42 Link Here
36	$(INSTALL_DATA) yum-etckeeper.py $(DESTDIR)$(prefix)/lib/yum-plugins/etckeeper.py	35	$(INSTALL_DATA) yum-etckeeper.py $(DESTDIR)$(prefix)/lib/yum-plugins/etckeeper.py
37	$(INSTALL_DATA) yum-etckeeper.conf $(DESTDIR)$(etcdir)/yum/pluginconf.d/etckeeper.conf	36	$(INSTALL_DATA) yum-etckeeper.conf $(DESTDIR)$(etcdir)/yum/pluginconf.d/etckeeper.conf
38	endif	37	endif
39	-./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} \|\| echo "** bzr support not installed"
40	echo "** installation successful"	38	echo "** installation successful"
41		39
42	clean: etckeeper.spec	40	clean: etckeeper.spec