>> On Fri, October 07, 2011, Rodolfo kix Garcia wrote:
>>> is possible to change
>>>
>>> # Don't store changes on autogenerated files
>>> 2 extend-diff-ignore =
>>> "(^|/)(config\.sub|config\.guess|Makefile|configure|Makefile\.in)$"
>>>
>>> for
>>>
>>> # Don't store changes on autogenerated files
>>> 2 extend-diff-ignore =
>>> "(^|/)(config\.sub|config\.guess|Makefile|configure|Makefile\.in|wconfig.h.in)$"
>>>
>>> in debian/source/options?
>>
>> This helps a bit, but not entirely:
>>
>> | dpkg-source --before-build wmaker-next
>> | dpkg-source: info: using options from
>> | wmaker-next/debian/source/options:
>> --extend-diff-ignore=(^|/)(config\.sub|config\.guess|Makefile|configure|Makefile\.in|wconfig.h.in)$
>> | dpkg-source: warning: patches have not been applied, applying
>> | them now (use --no-preparation to override)
>> | dpkg-source: info: applying 50_def_config_paths.diff
>> | dpkg-source: info: applying 51_wmaker_man.diff
>> | dpkg-source: info: applying 52_libwmaker0dev.diff
>> | dpkg-source: error: expected [ +-] at start of line 17 of diff
>> `wmaker-next/debian/patches/52_libwmaker0dev.diff'
>> | dpkg-buildpackage: error: dpkg-source --before-build wmaker-next gave
>> error exit status 9
>>
>
> [snip]
>
> Hi Martin,
>
> we found the problem. Patches must start every line with [ +-] (space,
> plus, minus), but some lines in the debian/patches/52_libwmaker0dev.diff
> do not start with space (starts with tab, but the space was removed).
>
> I checked the 0001-wmlib...patch and the lines are included, but in the
> source are removed.
>
> Please, try to return the line in debian/source/options to the git status
> (without wmconfig.h.in) and try to apply the patch attached to try if now
> is possible to compile the source.
>
[snip]
Hi,
forget the previous patch, is not complete. The new patch is attached.
Carlos, please, update the git with this file (be carefull with the spaces
in the diff file). Thanks!!
Martin, I found the problems with the autogenerated files. All are
included now in the options file. Thanks a lot for your testing. Please,
when the patch will be aplied, please, try to run the nigthly script.
Thanks!!
I will sent these files, with this patch applied, to debian.
Regards.
kix
--
Rodolfo García AKA kix
http://www.kix.es/
EA4ERH (@IN80ER)
>From cff0d597792e6dd76d2f6479fbab78c41f66f0d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <k...@kix.es>
Date: Sun, 9 Oct 2011 15:52:40 +0200
Subject: [PATCH] debian: problem with spaces and forget autogenerated files
---
debian/patches/52_libwmaker0dev.diff | 22 +++++++++++-----------
debian/source/options | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/debian/patches/52_libwmaker0dev.diff b/debian/patches/52_libwmaker0dev.diff
index 129bd28..8645325 100644
--- a/debian/patches/52_libwmaker0dev.diff
+++ b/debian/patches/52_libwmaker0dev.diff
@@ -6,7 +6,7 @@ Last-Update: 2011-10-05
@@ -636,6 +636,9 @@
fi
fi
-
+
+# for wmlib
+AC_SUBST(XCFLAGS)
+
@@ -14,14 +14,14 @@ Last-Update: 2011-10-05
AC_SUBST(XLIBS)
AC_SUBST(X_EXTRA_LIBS)
@@ -866,7 +869,7 @@
- WINGs/Makefile WINGs/WINGs/Makefile WINGs/Documentation/Makefile \
- WINGs/Examples/Makefile WINGs/Resources/Makefile WINGs/Tests/Makefile \
- WINGs/Extras/Makefile WINGs/po/Makefile \
+ WINGs/Makefile WINGs/WINGs/Makefile WINGs/Documentation/Makefile \
+ WINGs/Examples/Makefile WINGs/Resources/Makefile WINGs/Tests/Makefile \
+ WINGs/Extras/Makefile WINGs/po/Makefile \
- wrlib/Makefile wrlib/tests/Makefile \
+ wmlib/Makefile wrlib/Makefile wrlib/tests/Makefile \
- src/Makefile src/wconfig.h \
- doc/Makefile doc/sk/Makefile doc/cs/Makefile \
- doc/ru/Makefile \
+ src/Makefile src/wconfig.h \
+ doc/Makefile doc/sk/Makefile doc/cs/Makefile \
+ doc/ru/Makefile \
--- /dev/null
+++ b/wmlib/app.c
@@ -0,0 +1,79 @@
@@ -853,11 +853,11 @@ Last-Update: 2011-10-05
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@
-
+
ACLOCAL_AMFLAGS = -I m4
-
+
-SUBDIRS = wrlib WINGs src util po WindowMaker WPrefs.app doc
+SUBDIRS = wrlib WINGs src util po WindowMaker wmlib WPrefs.app doc
-
+
EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N INSTALL \
- INSTALL-WMAKER README.definable-cursor \
+ INSTALL-WMAKER README.definable-cursor \
diff --git a/debian/source/options b/debian/source/options
index 82379ee..aab38cd 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
# Don't store changes on autogenerated files
-extend-diff-ignore = "(^|/)(config\.sub|config\.guess|Makefile|configure|Makefile\.in)$"
+extend-diff-ignore = "(^|/)(config\.sub|config\.guess|Makefile|configure|Makefile\.in|aclocal.m4|config.h.in|depcomp|INSTALL|install-sh|ltmain.sh|missing||libtool.m4|lt~obsolete.m4|ltoptions.m4|ltsugar.m4|ltversion.m4|.Po)$"
--
1.7.5.4
