Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   Debian User (http://www.linux-archive.org/debian-user/)
-   -   build from source, patch does not remove cleanly (http://www.linux-archive.org/debian-user/317622-build-source-patch-does-not-remove-cleanly.html)

Sven Joachim 01-30-2010 06:14 PM

build from source, patch does not remove cleanly
 
On 2010-01-30 19:33 +0100, T o n g wrote:

> I'm trying to build uswsusp from source. It builds fine with
>
> debuild -us -uc
>
> provided that I don't change anything. But having made my modification, I
> got the following error:
>
> ----------------------------------------------------------
> [...]
> debconf-updatepo
> dh_clean
> QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null pop -a -R || test
> $? = 2
> Removing patch compress_ratio.patch
> Restoring suspend.c
>
> Patch whitelist.patch does not remove cleanly (refresh it or enforce with
> -f)

You edited a file (here whitelist.c) directly that is modified by the
patch, so that it can no longer be unapplied. You should instead add a
new patch on top of the existing ones.

> make: *** [unpatch] Error 1
> dpkg-buildpackage: error: fakeroot debian/rules clean gave error exit
> status 2
> debuild: fatal error at line 1330:
> dpkg-buildpackage -rfakeroot -D -us -uc failed
> ----------------------------------------------------------
>
> How should I fix it?

Read /usr/share/doc/quilt/README.source for information how to work with
packages that use quilt.

BTW, the new format 3.0 (quilt) that several packages have already
adopted will solve this problem, you can then directly hack files again,
and dpkg-source will automatically create an additional patch with your
changes.

Sven


--
To UNSUBSCRIBE, email to debian-user-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org

T o n g 01-31-2010 02:43 AM

build from source, patch does not remove cleanly
 
On Sat, 30 Jan 2010 20:14:56 +0100, Sven Joachim wrote:

> Read /usr/share/doc/quilt/README.source for information how to work with
> packages that use quilt.

Thanks. It compiles fine now.

How would I submit patch? Would my hacked debian/patches/Acer_Aspire_5536
alone be fine?

Thanks

--
Tong (remove underscore(s) to reply)
http://xpt.sourceforge.net/techdocs/
http://xpt.sourceforge.net/tools/


--
To UNSUBSCRIBE, email to debian-user-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org

Sven Joachim 01-31-2010 06:07 AM

build from source, patch does not remove cleanly
 
On 2010-01-31 04:43 +0100, T o n g wrote:

> How would I submit patch? Would my hacked debian/patches/Acer_Aspire_5536
> alone be fine?

I think so, the maintainer can apply that easily enough. Or rather he
could, if the package were actually maintained. :-(

Sven


--
To UNSUBSCRIBE, email to debian-user-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org

Osamu Aoki 01-31-2010 07:51 AM

build from source, patch does not remove cleanly
 
On Sun, Jan 31, 2010 at 03:43:53AM +0000, T o n g wrote:
> On Sat, 30 Jan 2010 20:14:56 +0100, Sven Joachim wrote:
>
> > Read /usr/share/doc/quilt/README.source for information how to work with
> > packages that use quilt.
>
> Thanks. It compiles fine now.
>
> How would I submit patch? Would my hacked debian/patches/Acer_Aspire_5536
> alone be fine?

File a bug report on the uswsusp package using reportbug command.
* Indicate the bug report to be with "patch".
* attach patch or Acer_Aspire_5536 file.

Osamu
PS: I see some patches:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549118


--
To UNSUBSCRIBE, email to debian-user-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org


All times are GMT. The time now is 01:05 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.