--- rpm-4.3.3/tools/Makefile.in.debug	2005-08-25 17:01:22.000000000 +0400
+++ rpm-4.3.3/tools/Makefile.in	2005-08-25 17:10:41.000000000 +0400
@@ -16,7 +16,7 @@
 
 # Makefile for rpm tools.
 
-SOURCES = $(convertdb1_SOURCES) $(debugedit_SOURCES) dump.c dumpdb.c $(javadeps_SOURCES) rpmarchive.c $(rpmcache_SOURCES) $(rpmdeps_SOURCES) $(rpmfile_SOURCES) $(rpmgraph_SOURCES) rpmheader.c $(rpminject_SOURCES) rpmlead.c rpmsignature.c $(rpmsort_SOURCES)
+SOURCES = $(convertdb1_SOURCES) dump.c dumpdb.c $(javadeps_SOURCES) rpmarchive.c $(rpmcache_SOURCES) $(rpmdeps_SOURCES) $(rpmfile_SOURCES) $(rpmgraph_SOURCES) rpmheader.c $(rpminject_SOURCES) rpmlead.c rpmsignature.c $(rpmsort_SOURCES)
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -45,7 +45,7 @@
 noinst_PROGRAMS = convertdb1$(EXEEXT) dump$(EXEEXT) dumpdb$(EXEEXT) \
 	rpmarchive$(EXEEXT) rpmheader$(EXEEXT) rpmlead$(EXEEXT) \
 	rpmsignature$(EXEEXT)
-pkgbin_PROGRAMS = debugedit$(EXEEXT) javadeps$(EXEEXT) \
+pkgbin_PROGRAMS = javadeps$(EXEEXT) \
 	rpmcache$(EXEEXT) rpmdeps$(EXEEXT) rpmfile$(EXEEXT)
 bin_PROGRAMS = rpmgraph$(EXEEXT)
 subdir = tools
@@ -65,9 +65,6 @@
 convertdb1_OBJECTS = $(am_convertdb1_OBJECTS)
 convertdb1_LDADD = $(LDADD)
 convertdb1_DEPENDENCIES = $(top_builddir)/lib/librpm.la
-am_debugedit_OBJECTS = debugedit.$(OBJEXT) hashtab.$(OBJEXT)
-debugedit_OBJECTS = $(am_debugedit_OBJECTS)
-debugedit_DEPENDENCIES = $(top_builddir)/popt/libpopt.la
 dump_SOURCES = dump.c
 dump_OBJECTS = dump.$(OBJEXT)
 dump_LDADD = $(LDADD)
@@ -129,12 +126,12 @@
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(convertdb1_SOURCES) $(debugedit_SOURCES) dump.c dumpdb.c \
+SOURCES = $(convertdb1_SOURCES) dump.c dumpdb.c \
 	$(javadeps_SOURCES) rpmarchive.c $(rpmcache_SOURCES) \
 	$(rpmdeps_SOURCES) $(rpmfile_SOURCES) $(rpmgraph_SOURCES) \
 	rpmheader.c $(rpminject_SOURCES) rpmlead.c rpmsignature.c \
 	$(rpmsort_SOURCES)
-DIST_SOURCES = $(convertdb1_SOURCES) $(debugedit_SOURCES) dump.c \
+DIST_SOURCES = $(convertdb1_SOURCES) dump.c \
 	dumpdb.c $(javadeps_SOURCES) rpmarchive.c $(rpmcache_SOURCES) \
 	$(rpmdeps_SOURCES) $(rpmfile_SOURCES) $(rpmgraph_SOURCES) \
 	rpmheader.c $(rpminject_SOURCES) rpmlead.c rpmsignature.c \
@@ -386,9 +383,6 @@
 staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
 pkgbindir = @RPMCONFIGDIR@
 convertdb1_SOURCES = convertdb1.c
-debugedit_SOURCES = debugedit.c hashtab.c
-debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \
-	$(top_builddir)/popt/libpopt.la
 
 javadeps_SOURCES = javadeps.c
 rpmcache_SOURCES = rpmcache.c
@@ -502,9 +496,6 @@
 convertdb1$(EXEEXT): $(convertdb1_OBJECTS) $(convertdb1_DEPENDENCIES) 
 	@rm -f convertdb1$(EXEEXT)
 	$(LINK) $(convertdb1_LDFLAGS) $(convertdb1_OBJECTS) $(convertdb1_LDADD) $(LIBS)
-debugedit$(EXEEXT): $(debugedit_OBJECTS) $(debugedit_DEPENDENCIES) 
-	@rm -f debugedit$(EXEEXT)
-	$(LINK) $(debugedit_LDFLAGS) $(debugedit_OBJECTS) $(debugedit_LDADD) $(LIBS)
 dump$(EXEEXT): $(dump_OBJECTS) $(dump_DEPENDENCIES) 
 	@rm -f dump$(EXEEXT)
 	$(LINK) $(dump_LDFLAGS) $(dump_OBJECTS) $(dump_LDADD) $(LIBS)
@@ -552,7 +543,6 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convertdb1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debugedit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dumpdb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hashtab.Po@am__quote@