[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#41576: [PATCH] added --force-* options for conffile handling



On Sun, Oct 17, 1999 at 07:26:25PM +0200, Marcus Brinkmann wrote:
> On Thu, Oct 14, 1999 at 03:35:18AM +0200, Wichert Akkerman wrote:
> > > #41576:
> > 
> > That bugreport contains an evil patch. Not even a single hunk in there
> > succeeds..
> 
> Attached is a patch against dpkg 1.4.1.13. If the patches for Makefil.in
> fail, don't worry, just rerun automake instead.

As usual, attachments come in a different mail because of memory leaks.

Marcus

-- 
`Rhubarb is no Egyptian god.' Debian http://www.debian.org Check Key server 
Marcus Brinkmann              GNU    http://www.gnu.org    for public PGP Key 
Marcus.Brinkmann@ruhr-uni-bochum.de,     marcus@gnu.org    PGP Key ID 36E7CD09
http://homepage.ruhr-uni-bochum.de/Marcus.Brinkmann/       brinkmd@debian.org
diff -ru ../official/dpkg-1.4.1.13/dpkg-deb/Makefile.am dpkg-hurd-1.4.1.13/dpkg-deb/Makefile.am
--- ../official/dpkg-1.4.1.13/dpkg-deb/Makefile.am	Sun Nov  1 17:04:03 1998
+++ dpkg-hurd-1.4.1.13/dpkg-deb/Makefile.am	Wed Oct  6 02:39:40 1999
@@ -8,7 +8,7 @@
 
 ## Various options
 
-CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
 OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS			= @LDFLAGS@ $(XLDFLAGS)
 LIBS			= @INTLLIBS@ @LIBS@ $(XLIBS)
@@ -18,7 +18,8 @@
 
 DEFS			= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) \
 			  -I$(top_builddir) -I$(top_builddir)/include -I. \
-			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
+			  -I$(top_srcdir)/intl -I$(top_builddir)/intl \
+			  -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 ## Automake variables
 
diff -ru ../official/dpkg-1.4.1.13/dpkg-deb/Makefile.in dpkg-hurd-1.4.1.13/dpkg-deb/Makefile.in
--- ../official/dpkg-1.4.1.13/dpkg-deb/Makefile.in	Mon Sep 13 03:41:58 1999
+++ dpkg-hurd-1.4.1.13/dpkg-deb/Makefile.in	Wed Oct  6 02:40:47 1999
@@ -105,7 +105,7 @@
 
 localedir = $(datadir)/locale
 
-CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
 OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS = @LDFLAGS@ $(XLDFLAGS)
 LIBS = @INTLLIBS@ @LIBS@ $(XLIBS)
@@ -113,7 +113,7 @@
 CXXFLAGS = @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 OPTCXXFLAGS = @CXXFLAGS @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 
-DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
+DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl			   -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
diff -ru ../official/dpkg-1.4.1.13/dselect/Makefile.am dpkg-hurd-1.4.1.13/dselect/Makefile.am
--- ../official/dpkg-1.4.1.13/dselect/Makefile.am	Sun Nov  1 17:04:17 1998
+++ dpkg-hurd-1.4.1.13/dselect/Makefile.am	Wed Oct  6 02:41:31 1999
@@ -8,17 +8,18 @@
 
 ## Various options
 
-CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
+OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS			= @LDFLAGS@ $(XLDFLAGS)
 LIBS			= @INTLLIBS@ @LIBS@ $(XLIBS)
 
-CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS		= @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
+OPTCXXFLAGS		= @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 
 DEFS			= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) \
 			  -I$(top_builddir) -I$(top_builddir)/include -I. \
-			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
+			  -I$(top_srcdir)/intl -I$(top_builddir)/intl \
+			  -DLOCALEDIR=\"$(localedir)\" @DEFS@
 ## Automake variables
 
 bin_PROGRAMS		= dselect
diff -ru ../official/dpkg-1.4.1.13/dselect/Makefile.in dpkg-hurd-1.4.1.13/dselect/Makefile.in
--- ../official/dpkg-1.4.1.13/dselect/Makefile.in	Mon Sep 13 03:41:59 1999
+++ dpkg-hurd-1.4.1.13/dselect/Makefile.in	Wed Oct  6 02:42:28 1999
@@ -105,15 +105,15 @@
 
 localedir = $(datadir)/locale
 
-CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
+OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS = @LDFLAGS@ $(XLDFLAGS)
 LIBS = @INTLLIBS@ @LIBS@ $(XLIBS)
 
-CXXFLAGS = @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS = @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CXXFLAGS = @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
+OPTCXXFLAGS = @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 
-DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
+DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl			   -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 
 bin_PROGRAMS = dselect
diff -ru ../official/dpkg-1.4.1.13/main/Makefile.am dpkg-hurd-1.4.1.13/main/Makefile.am
--- ../official/dpkg-1.4.1.13/main/Makefile.am	Sun Nov  1 17:06:12 1998
+++ dpkg-hurd-1.4.1.13/main/Makefile.am	Wed Oct  6 03:00:59 1999
@@ -8,17 +8,18 @@
 
 ## Various options
 
-CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
+OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS			= @LDFLAGS@ $(XLDFLAGS)
 LIBS			= @INTLLIBS@ @LIBS@ $(XLIBS)
 
-CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS		= @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
+OPTCXXFLAGS		= @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 
 DEFS			= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) \
 			  -I$(top_builddir) -I$(top_builddir)/include -I. \
-			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
+			  -I$(top_srcdir)/intl -I$(top_builddir)/intl \
+			  -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 ## Automake variables
 
diff -ru ../official/dpkg-1.4.1.13/main/Makefile.in dpkg-hurd-1.4.1.13/main/Makefile.in
--- ../official/dpkg-1.4.1.13/main/Makefile.in	Mon Sep 13 03:41:59 1999
+++ dpkg-hurd-1.4.1.13/main/Makefile.in	Wed Oct  6 03:31:38 1999
@@ -105,15 +105,15 @@
 
 localedir = $(datadir)/locale
 
-CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
+OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS = @LDFLAGS@ $(XLDFLAGS)
 LIBS = @INTLLIBS@ @LIBS@ $(XLIBS)
 
-CXXFLAGS = @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS = @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CXXFLAGS = @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
+OPTCXXFLAGS = @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 
-DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
+DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl 			  -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 
 bin_PROGRAMS = dpkg
diff -ru ../official/dpkg-1.4.1.13/md5sum/Makefile.am dpkg-hurd-1.4.1.13/md5sum/Makefile.am
--- ../official/dpkg-1.4.1.13/md5sum/Makefile.am	Sun Nov  1 17:06:47 1998
+++ dpkg-hurd-1.4.1.13/md5sum/Makefile.am	Wed Oct  6 03:11:29 1999
@@ -8,17 +8,18 @@
 
 ## Various options
 
-CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
+OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS			= @LDFLAGS@ $(XLDFLAGS)
 LIBS			= @INTLLIBS@ @LIBS@ $(XLIBS)
 
-CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS		= @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
+OPTCXXFLAGS		= @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 
 DEFS			= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) \
 			  -I$(top_builddir) -I$(top_builddir)/include -I. \
-			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
+			  -I$(top_srcdir)/intl -I$(top_builddir)/intl \
+			  -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 MAINTAINERCLEANFILES	= $(srcdir)/Makefile.in
 
diff -ru ../official/dpkg-1.4.1.13/md5sum/Makefile.in dpkg-hurd-1.4.1.13/md5sum/Makefile.in
--- ../official/dpkg-1.4.1.13/md5sum/Makefile.in	Mon Sep 13 03:41:59 1999
+++ dpkg-hurd-1.4.1.13/md5sum/Makefile.in	Wed Oct  6 03:11:29 1999
@@ -105,15 +105,15 @@
 
 localedir = $(datadir)/locale
 
-CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
+OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS = @LDFLAGS@ $(XLDFLAGS)
 LIBS = @INTLLIBS@ @LIBS@ $(XLIBS)
 
-CXXFLAGS = @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS = @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CXXFLAGS = @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
+OPTCXXFLAGS = @CXXFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 
-DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@
+DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl 			  -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
diff -ru ../official/dpkg-1.4.1.13/split/Makefile.am dpkg-hurd-1.4.1.13/split/Makefile.am
--- ../official/dpkg-1.4.1.13/split/Makefile.am	Sun Nov  1 17:08:08 1998
+++ dpkg-hurd-1.4.1.13/split/Makefile.am	Wed Oct  6 03:24:12 1999
@@ -9,18 +9,19 @@
 
 ## Various options
 
-CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS			= @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
+OPTCFLAGS		= @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS			= @LDFLAGS@ $(XLDFLAGS)
 LIBS			= @INTLLIBS@ @LIBS@ $(XLIBS)
 
-CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS		= @CXXFLAGS @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CXXFLAGS		= @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
+OPTCXXFLAGS		= @CXXFLAGS @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 
 DEFS			= -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) \
 			  -I$(top_builddir) -I$(top_builddir)/include -I. \
 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@ \
-			  -DMKSPLITSCRIPT=\"$(pkglibdir)/mksplit\"
+			  -DMKSPLITSCRIPT=\"$(pkglibdir)/mksplit\" \
+			  -DLOCALEDIR=\"$(localedir)\"
 
 ## Automake variables
 
diff -ru ../official/dpkg-1.4.1.13/split/Makefile.in dpkg-hurd-1.4.1.13/split/Makefile.in
--- ../official/dpkg-1.4.1.13/split/Makefile.in	Mon Sep 13 03:41:59 1999
+++ dpkg-hurd-1.4.1.13/split/Makefile.in	Wed Oct  6 03:24:12 1999
@@ -105,15 +105,15 @@
 pkglibdir = $(libdir)/@PACKAGE@
 localedir = $(datadir)/locale
 
-CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS)
+OPTCFLAGS = @CFLAGS@ @OPTCFLAGS@ @CWARNS@ -g $(XCFLAGS)
 LDFLAGS = @LDFLAGS@ $(XLDFLAGS)
 LIBS = @INTLLIBS@ @LIBS@ $(XLIBS)
 
-CXXFLAGS = @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
-OPTCXXFLAGS = @CXXFLAGS @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS) -DLOCALEDIR=\"$(localedir)\"
+CXXFLAGS = @CXXFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
+OPTCXXFLAGS = @CXXFLAGS @OPTCFLAGS@ @CWARNS@ -g $(XCXXFLAGS)
 
-DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@ 			  -DMKSPLITSCRIPT=\"$(pkglibdir)/mksplit\"
+DEFS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) 			  -I$(top_builddir) -I$(top_builddir)/include -I. 			  -I$(top_srcdir)/intl -I$(top_builddir)/intl @DEFS@ 			  -DMKSPLITSCRIPT=\"$(pkglibdir)/mksplit\" 			  -DLOCALEDIR=\"$(localedir)\"
 
 
 bin_PROGRAMS = dpkg-split

Reply to: