Your message dated Sat, 25 Feb 2012 10:24:41 +0100
with message-id <20120225092441.gh8...@rivendell.home.ouaza.com>
and subject line Re: Bug#661218: dpkg: false positive - expected [ +-] at start
of line 45 of diff
has caused the Debian Bug report #661218,
regarding dpkg: false positive - expected [ +-] at start of line 45 of diff
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
661218: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661218
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: dpkg
Version: 1.16.1.2
Severity: normal
I've attached 90_fix_makefiles.patch for further study.
dpkg reports during build:
...
dpkg-source: info: patches are not applied, applying them now
dpkg-source: info: applying 01_fix_bug_380210_fix_buffer_overflow.patch
dpkg-source: info: applying 02_fix_locale_initialization.patch
dpkg-source: info: applying 03_fix_bond_and_arrow_fixes.patch
dpkg-source: info: applying
04_fix_bug_380210_fix_export_and_export_utils_detection.patch
dpkg-source: error: expected [ +-] at start of line 45 of diff
`easychem.git/debian/patches/90_fix_makefiles.patch'
dpkg-source: info: applying 90_fix_makefiles.patch
dpkg-buildpackage: error: dpkg-source -i --before-build easychem.git gave
error exit status 25
debuild: fatal error at line 1350:
dpkg-buildpackage -rfakeroot -D -us -uc -i failed
However everything works by applying patches in debian/patches
directory by hand with quilt:
Applying patch 01_fix_bug_380210_fix_buffer_overflow.patch
patching file export.c
Applying patch 02_fix_locale_initialization.patch
patching file easychem.c
Applying patch 03_fix_bond_and_arrow_fixes.patch
patching file bonds.c
patching file dialogs.c
Applying patch 04_fix_bug_380210_fix_export_and_export_utils_detection.patch
patching file bonds.c
patching file detect.c
patching file easychem.c
patching file export.c
patching file postscript/cm_common.ps
patching file postscript/preamble.ps
patching file postscript/times.ps
Applying patch 90_fix_makefiles.patch
patching file Makefile.linux
patching file po/Makefile
Applying patch 91_translation_updates_and_fixes.patch
patching file dialogs.c
patching file easychem.c
patching file po/easychem.pot
patching file po/fr.po
Applying patch 92_fix_bug_536388_fix_export_eps.patch
patching file postscript/preamble.ps
Now at patch 92_fix_bug_536388_fix_export_eps.patch
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (990, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-1-686-pae (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages dpkg depends on:
ii coreutils 8.13-3
ii libbz2-1.0 1.0.6-1
ii libc6 2.13-26
ii libselinux1 2.1.0-4.1
ii xz-utils 5.1.1alpha+20110809-3
ii zlib1g 1:1.2.6.dfsg-1
dpkg recommends no packages.
Versions of packages dpkg suggests:
ii apt 0.8.15.9
-- no debconf information
From: Daniel Leidert (dale) <daniel.leid...@wgdd.de>
Subject: Fix some directory values, correct binary and translation install
All installs are later done using dh_install. Respect the CFLAGS
set in debian/rules.
.
Also fix #436782 and respect/handle nostrip build option (policy 10.1).
See <URL:http://bugs.debian.org/436782>.
diff -urNad easychem~/Makefile.linux easychem/Makefile.linux
--- easychem~/Makefile.linux 2005-05-04 10:10:07.000000000 +0200
+++ easychem/Makefile.linux 2007-12-18 01:43:14.000000000 +0100
@@ -1,17 +1,18 @@
# The C compiler
CC=gcc
+C_FLAGS=
# The following line must be uncommented if you want to specify a place
# where the 'gs' (or 'pstoedit') program is.
-#C_FLAGS="$(C_FLAGS) -DGS_PATH=/opt/bin"
-#C_FLAGS="$(C_FLAGS) -DPSTOEDIT_PATH=/opt/bin"
+#C_FLAGS += -DGS_PATH=\"/usr/bin\" # don't enable this!
+#C_FLAGS += -DPSTOEDIT_PATH=\"/usr/bin\" # don't enable this!
# Here we define the prefix where EasyChem will be installed
-PREFIX=/usr/local
+PREFIX=/usr
# Optimisation and warning flags
-C_FLAGS=-Wall -W -Wpointer-arith -O2 -pedantic -std=c99 -DUNIX -DI18N -DPREFIX=\"$(PREFIX)\"
+C_FLAGS += -W -Wpointer-arith -pedantic -std=c99 -DUNIX -DI18N -DPREFIX=\"$(PREFIX)\"
# GTK flags and librairies
GTK_FLAGS=`pkg-config --cflags gtk+-2.0`
@@ -28,8 +29,8 @@
all: easychem po/
easychem: postscript/ graph/ $(OBJECTS)
- $(CC) -o easychem $(OBJECTS) $(GTK_LIBS) $(C_FLAGS)
- strip easychem
+ $(CC) $(LDFLAGS) -o easychem $(OBJECTS) $(GTK_LIBS) $(C_FLAGS) $(CFLAGS)
+ # strip easychem # don't strip, see bug #436782
clean: FORCE
-cd graph; make clean
@@ -38,21 +39,21 @@
-rm $(OBJECTS) easychem
export.o: export.c common.h bonds.h postscript/
- $(CC) $(GTK_FLAGS) $(C_FLAGS) -c export.c
+ $(CC) $(GTK_FLAGS) $(C_FLAGS) $(CFLAGS) -c export.c
bonds.o: bonds.c common.h bonds.h
- $(CC) $(GTK_FLAGS) $(C_FLAGS) -c bonds.c
+ $(CC) $(GTK_FLAGS) $(C_FLAGS) $(CFLAGS) -c bonds.c
easychem.o: easychem.c common.h bonds.h export.h library.h drawing.h
- $(CC) $(GTK_FLAGS) $(C_FLAGS) -c easychem.c
+ $(CC) $(GTK_FLAGS) $(C_FLAGS) $(CFLAGS) -c easychem.c
auxi.o: auxi.c common.h auxi.h
- $(CC) $(GTK_FLAGS) $(C_FLAGS) -c auxi.c
+ $(CC) $(GTK_FLAGS) $(C_FLAGS) $(CFLAGS) -c auxi.c
library.o: library.c common.h library.h
- $(CC) $(GTK_FLAGS) $(C_FLAGS) -c library.c
+ $(CC) $(GTK_FLAGS) $(C_FLAGS) $(CFLAGS) -c library.c
drawing.o: drawing.c common.h drawing.h
- $(CC) $(GTK_FLAGS) $(C_FLAGS) -c drawing.c
+ $(CC) $(GTK_FLAGS) $(C_FLAGS) $(CFLAGS) -c drawing.c
dialogs.o: dialogs.c common.h dialogs.h graph/
- $(CC) $(GTK_FLAGS) $(C_FLAGS) -c dialogs.c
+ $(CC) $(GTK_FLAGS) $(C_FLAGS) $(CFLAGS) -c dialogs.c
detect.o: detect.c common.h detect.h
- $(CC) $(GTK_FLAGS) $(C_FLAGS) -c detect.c
+ $(CC) $(GTK_FLAGS) $(C_FLAGS) $(CFLAGS) -c detect.c
# The rules for subdirectories
graph/: FORCE
diff -urNad easychem~/po/Makefile easychem/po/Makefile
--- easychem~/po/Makefile 2005-05-04 10:10:07.000000000 +0200
+++ easychem/po/Makefile 2007-12-18 01:41:57.000000000 +0100
@@ -1,7 +1,8 @@
-all: fr.mo
+all: fr/LC_MESSAGES/easychem.mo
-%.mo: %.po
- msgfmt -o $*.mo $*.po
+%/LC_MESSAGES/easychem.mo: %.po
+ mkdir -p $*/LC_MESSAGES
+ msgfmt -o $*/LC_MESSAGES/easychem.mo $*.po
clean:
- -rm *.mo
+ -rm -rf fr
--- End Message ---
--- Begin Message ---
Hello,
On Sat, 25 Feb 2012, Jari Aalto wrote:
> I've attached 90_fix_makefiles.patch for further study.
>
> dpkg reports during build:
[...]
> dpkg-source: info: applying
> 04_fix_bug_380210_fix_export_and_export_utils_detection.patch
> dpkg-source: error: expected [ +-] at start of line 45 of diff
> `easychem.git/debian/patches/90_fix_makefiles.patch'
> dpkg-source: info: applying 90_fix_makefiles.patch
> dpkg-buildpackage: error: dpkg-source -i --before-build easychem.git gave
> error exit status 25
> debuild: fatal error at line 1350:
> dpkg-buildpackage -rfakeroot -D -us -uc -i failed
>
> However everything works by applying patches in debian/patches
> directory by hand with quilt:
This doesn't mean anything (quilt/patch are lenient and accept slightly
incorrect input) and dpkg-source is right. Line 45 of the file starts
with a TAB instead of a space.
It should be space + TAB (since the TAB is the start of the content).
> clean: FORCE
> -cd graph; make clean
> @@ -38,21 +39,21 @@
> -rm $(OBJECTS) easychem
Those are the bad lines.
Cheers,
--
Raphaël Hertzog ◈ Debian Developer
Pre-order a copy of the Debian Administrator's Handbook and help
liberate it: http://debian-handbook.info/liberation/
--- End Message ---
