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

Fwd: dpkg-source: error: expected [ +-] at start of line

Hi,
I have a problem with dpkg-buildpackage. I have three patches in the debian folder. All apply fine using quilt, but using dpkg-buildpackage I get an error:
dpkg-source: info: using options from wmaker-crm/debian/source/options: --extend-diff-ignore=(^|/)(config\.sub|config\.guess|Makefile|configure|Makefile\.in)$ dpkg-source: error: expected [ +-] at start of line 17 of diff `wmaker-crm/debian/patches/52_libwmaker0dev.diff' dpkg-buildpackage: error: dpkg-source --before-build wmaker-crm gave error exit status 25 

Any help?
This is the log of how I apply the quilt patches and trying to build using dpkg-buildpackage. 

The sources are at http://repo.or.cz/w/wmaker-crm.git
The patch with problems are at http://repo.or.cz/w/wmaker-crm.git/blob/8bc9a1dd195a2110984690a5aec0da15809347f9:/debian/patches/52_libwmaker0dev.diff 

The lines with problems:

13  AC_SUBST(XLFLAGS)
14  AC_SUBST(XLIBS)
15  AC_SUBST(X_EXTRA_LIBS)
16 @@ -866,7 +869,7 @@
17 WINGs/Makefile WINGs/WINGs/Makefile WINGs/Documentation/Makefile \ 18 WINGs/Examples/Makefile WINGs/Resources/Makefile WINGs/Tests/Makefile \ 
19         WINGs/Extras/Makefile WINGs/po/Makefile \
20 -       wrlib/Makefile wrlib/tests/Makefile \
21 +       wmlib/Makefile wrlib/Makefile wrlib/tests/Makefile \
22         src/Makefile src/wconfig.h \
23         doc/Makefile doc/sk/Makefile doc/cs/Makefile \
24         doc/ru/Makefile \
25 --- /dev/null

The log:

kix@macserver:~/src/wmaker-crm$ quilt applied
No patches applied
kix@macserver:~/src/wmaker-crm$ quilt push
Applying patch 50_def_config_paths.diff
patching file src/wconfig.h.in
Hunk #1 succeeded at 135 (offset 3 lines).

Now at patch 50_def_config_paths.diff
kix@macserver:~/src/wmaker-crm$ quilt push
Applying patch 51_wmaker_man.diff
patching file doc/wmaker.1x

Now at patch 51_wmaker_man.diff
kix@macserver:~/src/wmaker-crm$ quilt push
Applying patch 52_libwmaker0dev.diff
patching file configure.ac
patching file wmlib/app.c
patching file wmlib/app.h
patching file wmlib/command.c
patching file wmlib/event.c
patching file wmlib/Makefile.am
patching file wmlib/menu.c
patching file wmlib/menu.h
patching file wmlib/WMaker.h
patching file Makefile.am

Now at patch 52_libwmaker0dev.diff
kix@macserver:~/src/wmaker-crm$ quilt push
File series fully applied, ends at patch 52_libwmaker0dev.diff
kix@macserver:~/src/wmaker-crm$


kix@macserver:~/src/wmaker-crm$ LANG=C dpkg-buildpackage -tc
dpkg-buildpackage: dpkg-buildflags (origin: vendor): CFLAGS = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security 
dpkg-buildpackage: dpkg-buildflags (origin: vendor): CPPFLAGS =
dpkg-buildpackage: dpkg-buildflags (origin: vendor): CXXFLAGS = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security 
dpkg-buildpackage: dpkg-buildflags (origin: vendor): FFLAGS = -g -O2
dpkg-buildpackage: dpkg-buildflags (origin: vendor): LDFLAGS = -Wl,-z,relro 
dpkg-buildpackage: source package wmaker
dpkg-buildpackage: source version 0.94.0-1
dpkg-buildpackage: source changed by Rodolfo García Peñas (kix) <kix@kix.es> 
dpkg-buildpackage: host architecture amd64
 dpkg-source --before-build wmaker-crm
dpkg-source: info: using options from wmaker-crm/debian/source/options: --extend-diff-ignore=(^|/)(config\.sub|config\.guess|Makefile|configure|Makefile\.in)$ dpkg-source: error: expected [ +-] at start of line 17 of diff `wmaker-crm/debian/patches/52_libwmaker0dev.diff' dpkg-buildpackage: error: dpkg-source --before-build wmaker-crm gave error exit status 25 
kix@macserver:~/src/wmaker-crm$ quilt push
Applying patch 52_libwmaker0dev.diff
patching file configure.ac
patching file wmlib/app.c
patching file wmlib/app.h
patching file wmlib/command.c
patching file wmlib/event.c
patching file wmlib/Makefile.am
patching file wmlib/menu.c
patching file wmlib/menu.h
patching file wmlib/WMaker.h
patching file Makefile.am

Now at patch 52_libwmaker0dev.diff
kix@macserver:~/src/wmaker-crm$

Thanks a lot.

Best Regards.

kix
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
Reply to: