Всем привет! Имеется icewm версии из squeeze (1.3.7pre2). Имеется патч к более старому icewm, полученный из этой же рассылки.
После некоторой обработки напильником патч успешно накладывается и снимается вручную. $ debian/patches/net-wm-name-support -patch patching file src/yxapp.cc Hunk #1 succeeded at 91 with fuzz 1. Hunk #2 succeeded at 311 with fuzz 1. patching file src/wmclient.h Hunk #1 succeeded at 228 (offset 7 lines). patching file src/wmclient.cc Hunk #2 succeeded at 496 with fuzz 2. Hunk #3 succeeded at 791 (offset 10 lines). Hunk #4 succeeded at 820 (offset 10 lines). Hunk #5 succeeded at 1746 (offset 107 lines). $ debian/patches/net-wm-name-support -unpatch patching file src/yxapp.cc Hunk #1 succeeded at 91 with fuzz 1. Hunk #2 succeeded at 310 with fuzz 1. patching file src/wmclient.h Hunk #1 succeeded at 228 (offset 7 lines). patching file src/wmclient.cc Hunk #2 succeeded at 488 with fuzz 2. Hunk #3 succeeded at 775 (offset 10 lines). Hunk #4 succeeded at 797 (offset 10 lines). Hunk #5 succeeded at 1716 (offset 107 lines). К сожалению, собрать пакет всё равно не удаётся, и облом выглядит вот так: dpkg-source: info: using source format `3.0 (quilt)' dpkg-source: info: building icewm using existing ./icewm_1.3.7~pre2.orig.tar.bz2 2 out of 2 hunks FAILED -- saving rejects to file src/yxapp.cc.rej 1 out of 5 hunks FAILED -- saving rejects to file src/wmclient.cc.rej dpkg-source: failure: patch -s -t -F 0 -N -p1 -u -V never -g0 -E -b -B .pc/net-wm-name-support/ gave error exit status 1 dpkg-buildpackage: failure: dpkg-source -b icewm-1.3.7pre2 gave error exit status 2 debuild: fatal error at line 1319: dpkg-buildpackage -rfakeroot -D -us -uc failed Попробовал убрать патч из debian/patches (и из series тоже) и сгенерировать новый правильный вариант - не получается: $ dpatch-edit-patch netwm-name-137 dpatch-edit-patch: * /home/irisha/source/icewm/1.3.7/icewm-1.3.7pre2/debian/patches/netwm-name-137.dpatch does not exist, it will be created as a new dpatch [...] # Extra clean ups /usr/bin/make -C po clean || true make[1]: Entering directory `/tmp/dpep-ref.UverlA/icewm-1.3.7pre2/po' rm -f be.mo bg.mo ca.mo cs.mo da.mo de.mo el.mo en.mo es.mo fi.mo fr.mo hr.mo hu.mo id.mo it.mo ja.mo ko.mo lt.mo lv.mo mk.mo nb.mo nl.mo pl.mo pt_BR.mo ro.mo ru.mo sk.mo sl.mo sv.mo tr.mo uk.mo vi.mo zh_CN.mo zh_TW.mo *~ make[1]: Leaving directory `/tmp/dpep-ref.UverlA/icewm-1.3.7pre2/po' rm -f stamp* `find . -name "*~"` Makefile icewm.lsm icewm.spec src/icesound-* config.log dh_clean make: *** No rule to make target `unpatch'. Stop. -- Yours, Mikhail Ramendik Unless explicitly stated, all opinions in my mail are my own and do not reflect the views of any organization -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
