cvs commit: patches/dpkg dpkg-1.10.15-duplicates-1.patch

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sun Oct 5 14:49:35 PDT 2003


jim         03/10/05 15:49:35

  Added:       dpkg     dpkg-1.10.15-duplicates-1.patch
  Log:
  Added: dpkg-1.10.15-duplicates-1.patch
  
  Revision  Changes    Path
  1.1                  patches/dpkg/dpkg-1.10.15-duplicates-1.patch
  
  Index: dpkg-1.10.15-duplicates-1.patch
  ===================================================================
  Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
  Date: 2003-09-27
  Initial Package Version: 1.10.15
  Origin: Jim Gifford
  Description: Removes Programs that conflict with already installed programs
  	     md5sum install-info cleanup-info start-stop-daemon
  		
   
  --- dpkg-1.10.15/scripts/Makefile.in.orig	2003-09-28 05:37:00.000000000 +0000
  +++ dpkg-1.10.15/scripts/Makefile.in	2003-09-28 05:38:21.000000000 +0000
  @@ -11,13 +11,13 @@
   			  dpkg-scanpackages dpkg-scansources \
   			  dpkg-architecture dpkg-checkbuilddeps
   
  -SBIN_SCRIPTS		= update-alternatives install-info \
  -			  dpkg-divert dpkg-statoverride cleanup-info
  +SBIN_SCRIPTS		= update-alternatives \
  +			  dpkg-divert dpkg-statoverride
   
   MAN1PAGES		= dpkg-name.1 dpkg-source.1 822-date.1 \
   			  dpkg-checkbuilddeps.1
  -MAN8PAGES		= update-alternatives.8 install-info.8  \
  -			  cleanup-info.8 dpkg-scanpackages.8 dpkg-scansources.8 \
  +MAN8PAGES		= update-alternatives.8 \
  +			  dpkg-scanpackages.8 dpkg-scansources.8 \
   			  dpkg-divert.8 dpkg-statoverride.8
   
   CHANGELOG_PARSERS	= cl-debian
  --- dpkg-1.10.15/utils/Makefile.in.orig	2003-09-28 05:31:28.000000000 +0000
  +++ dpkg-1.10.15/utils/Makefile.in	2003-09-28 05:32:57.000000000 +0000
  @@ -52,13 +52,8 @@
   install-program:
   ifeq (@USE_START_STOP_DAEMON@, true)
   	$(mkinstalldirs) $(DESTDIR)/$(sbindir)
  -	$(INSTALL_PROGRAM) start-stop-daemon $(DESTDIR)/$(sbindir)
   endif
   	$(mkinstalldirs) $(DESTDIR)/$(bindir)
  -	$(INSTALL_PROGRAM) md5sum $(DESTDIR)/$(bindir)
  -ifdef ALSO_STATIC
  -	$(INSTALL_PROGRAM) md5sum-static $(DESTDIR)/$(bindir)
  -endif
   	$(mkinstalldirs) $(DESTDIR)/$(dpkglibdir)
   	$(INSTALL_PROGRAM) enoent $(DESTDIR)/$(dpkglibdir)
   
  @@ -68,8 +63,6 @@
   	$(mkinstalldirs) $(DESTDIR)/$(man8dir)
   	$(INSTALL_DATA) $(srcdir)/$(SSD_MANPAGES) $(DESTDIR)/$(man8dir)
   endif
  -	$(mkinstalldirs) $(DESTDIR)/$(man1dir)
  -	$(INSTALL_DATA) $(srcdir)/$(MD5_MANPAGES) $(DESTDIR)/$(man1dir)
   
   start-stop-daemon: $(SSD_OBJECTS) ../lib/libdpkg.a
   	$(CC) $(LDFLAGS) -o $@ $(SSD_OBJECTS) $(LIBS) $(SSD_LIBS)
  
  
  



More information about the patches mailing list