Attachment #180555 for bug #216114

Lines 17-24 Link Here

(-)etckeeper.conf (-3 / +9 lines)
17	# so you can commit the changes by hand.	17	# so you can commit the changes by hand.
18	#AVOID_COMMIT_BEFORE_INSTALL=1	18	#AVOID_COMMIT_BEFORE_INSTALL=1
19		19
20	# The high-level package manager that's being used.	20	# The high-level package manager that's being used.
21	HIGHLEVEL_PACKAGE_MANAGER=apt	21	# For gentoo this is emerge
		22	#HIGHLEVEL_PACKAGE_MANAGER=apt
		23
		24	HIGHLEVEL_PACKAGE_MANAGER=emerge
22		25
23	# The low-level package manager that's being used.	26	# The low-level package manager that's being used.
24	LOWLEVEL_PACKAGE_MANAGER=dpkg	27	# For gentoo this is equery
		28	#LOWLEVEL_PACKAGE_MANAGER=dpkg
		29
		30	LOWLEVEL_PACKAGE_MANAGER=equery

Lines 57-62 Link Here

(-)init.d/50vcs-ignore (+4 lines)
57	ignore "*.pacorig"	57	ignore "*.pacorig"
58	ignore "*.pacsave"	58	ignore "*.pacsave"
59	nl	59	nl
		60	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "equery" ]; then
		61	comment "new and old versions of conffiles, stored by emerge"
		62	ignore ".ebuild"
		63	nl
60	fi	64	fi
61		65
62	ignore "*~"	66	ignore "*~"

Lines 6-8 Link Here

(-)list-installed.d/50list-installed (+5 lines)
6	dpkg-query -W -f '${Status}\t${Package} ${Version}\n' \| \	6	dpkg-query -W -f '${Status}\t${Package} ${Version}\n' \| \
7	egrep '(ok installed\|ok config-files)' \| cut -f2,3	7	egrep '(ok installed\|ok config-files)' \| cut -f2,3
8	fi	8	fi
		9
		10	if [ "$LOWLEVEL_PACKAGE_MANAGER" = equery ]; then
		11	equery list \| cut -f1
		12	fi
		13




	$(INSTALL_DATA) $(CONFFILE) $(DESTDIR)$(etcdir)/etckeeper/etckeeper.conf
	$(INSTALL_EXE) etckeeper $(DESTDIR)$(sbindir)/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)
	$(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper
endif

ifeq ($(LOWLEVEL_PACKAGE_MANAGER),pacman-g2)
	$(INSTALL_DATA) pacman-g2.hook $(DESTDIR)$(etcdir)/pacman-g2/hooks/etckeeper
endif

	echo "** installation successful"

clean:

Return to bug 216114

Lines 23-36 Link Here

(-)Makefile (-2 / +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)$(sbindir)/etckeeper	24	$(INSTALL_EXE) etckeeper $(DESTDIR)$(sbindir)/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	endif	28	endif
		29
30	ifeq ($(LOWLEVEL_PACKAGE_MANAGER),pacman-g2)	30	ifeq ($(LOWLEVEL_PACKAGE_MANAGER),pacman-g2)
31	$(INSTALL_DATA) pacman-g2.hook $(DESTDIR)$(etcdir)/pacman-g2/hooks/etckeeper	31	$(INSTALL_DATA) pacman-g2.hook $(DESTDIR)$(etcdir)/pacman-g2/hooks/etckeeper
32	endif	32	endif
33	-./etckeeper-bzr/__init__.py install --root=$(DESTDIR) \|\| echo "** bzr support not installed"	33
34	echo "** installation successful"	34	echo "** installation successful"
35		35
36	clean:	36	clean: