On Fri, 2013-09-13 at 21:37 +0200, Sam Geeraerts wrote: > Op Thu, 12 Sep 2013 21:23:06 -0500 > schreef Richard Hinojosa <[email protected]>: > > > I get this error when applying 03firsttimer_text.patch: > > > > patching file patches/03firsttimer_text-gnewsense > > Hunk #1 FAILED at 21. > > 1 out of 1 hunk FAILED -- rejects in file > > patches/03firsttimer_text-gnewsense > > Patch 03firsttimer_text.patch does not apply (enforce with -f) > > I hadn't looked closely at the provided patch. It's a patch on Debian's > patch file instead of the source. Quilt only handles patches on the > source. The patch from the bug report is meant to be applied using the > patch command straight up. > > While that is an option, I prefer to leave Debian's patch files > untouched and instead add our own patch files that may overwrite some > of Debian's changes to the source. So you should do (on the unmodified > source package): > > quilt push -a > quilt new name-of-patch > quilt edit src/fe-text/irssi.c > etc. > > Edit irssi.c in such a way as the provided patch would do. In the end > you'll have 2 patches (1 from Debian and 1 for gNewSense) that operate > on the same piece of code. > > _______________________________________________ > gNewSense-dev mailing list > [email protected] > https://lists.nongnu.org/mailman/listinfo/gnewsense-dev
I worked through the remaining instructions and I got a diff file. I am going to add as attachment for review.
diff -Nru irssi-0.8.15/debian/changelog irssi-0.8.15/debian/changelog --- irssi-0.8.15/debian/changelog 2013-09-13 17:52:09.000000000 -0500 +++ irssi-0.8.15/debian/changelog 2013-09-13 16:20:05.000000000 -0500 @@ -1,3 +1,16 @@ +irssi (0.8.15-3gnewsense1) parkes; urgency=low + + *fixes debian reference. (Closes #39251) + + -- Richard Hinojosa <[email protected]> Fri, 13 Sep 2013 16:11:42 -0500 + +irssi (0.8.15-2.1) unstable; urgency=low + + * Non-maintainer upload. + * =i + + -- Richard Hinojosa <[email protected]> Fri, 13 Sep 2013 16:11:39 -0500 + irssi (0.8.15-2) unstable; urgency=low * Switch Vcs-* field values to git.deb.at. diff -Nru irssi-0.8.15/debian/control irssi-0.8.15/debian/control --- irssi-0.8.15/debian/control 2013-09-13 17:52:09.000000000 -0500 +++ irssi-0.8.15/debian/control 2013-09-13 17:15:12.000000000 -0500 @@ -1,12 +1,12 @@ Source: irssi Section: net Priority: optional -Maintainer: Gerfried Fuchs <[email protected]> +Maintainer: gNewSense Hackers <[email protected]> Build-Depends: debhelper (>= 5), autotools-dev, libglib2.0-dev, perl (>= 5.8.1), libperl-dev (>= 5.8.1), libncurses5-dev, libssl-dev, openssl, quilt Standards-Version: 3.8.4 Homepage: http://irssi.org/ -Vcs-Browser: http://git.deb.at/w/pkg/irssi.git -Vcs-Git: git://git.deb.at/pkg/irssi.git +Vcs-Browser: http://bzr.savannah.gnu.org/lh/gnewsense/packages-parkes/irssi-0.8.15/ +Vcs-Bzr: bzr://bzr.savannah.gnu.org/gnewsense/packages-parkes/irssi-0.8.15/ Package: irssi Architecture: any diff -Nru irssi-0.8.15/debian/patches/series irssi-0.8.15/debian/patches/series --- irssi-0.8.15/debian/patches/series 2013-09-13 17:52:09.000000000 -0500 +++ irssi-0.8.15/debian/patches/series 2013-09-13 17:15:14.000000000 -0500 @@ -5,3 +5,4 @@ #06gnutls-support 12manpage-fix 17cumode_space-fix +test.patch diff -Nru irssi-0.8.15/debian/patches/test.patch irssi-0.8.15/debian/patches/test.patch --- irssi-0.8.15/debian/patches/test.patch 1969-12-31 18:00:00.000000000 -0600 +++ irssi-0.8.15/debian/patches/test.patch 2013-09-13 16:09:19.000000000 -0500 @@ -0,0 +1,15 @@ +--- a/src/fe-text/irssi.c ++++ b/src/fe-text/irssi.c +@@ -92,9 +92,9 @@ + "For the truly impatient people who don't like any automatic\n" + "window creation or closing, just type: /MANUAL-WINDOWS\n" + "\n" +- "For Debian specific help type \"/connect irc.debian.org\"\n" +- "and \"/join #debian\" (without the quotes) and ask your\n" +- "question."; ++ "For gNewSense specific help type \"/connect irc.freenode.net\"\n" ++ "and \"/join #gnewsense\" (without the quotes) and ask your\n" ++ "question."; + static int display_firsttimer = FALSE; + + diff -Nru irssi-0.8.15/debian/README.gNewSense irssi-0.8.15/debian/README.gNewSense --- irssi-0.8.15/debian/README.gNewSense 1969-12-31 18:00:00.000000000 -0600 +++ irssi-0.8.15/debian/README.gNewSense 2013-09-13 17:17:23.000000000 -0500 @@ -0,0 +1 @@ +Package needed to be modidified becasue it referred to debian. diff -Nru irssi-0.8.15/debian/source/format irssi-0.8.15/debian/source/format --- irssi-0.8.15/debian/source/format 1969-12-31 18:00:00.000000000 -0600 +++ irssi-0.8.15/debian/source/format 2013-09-12 21:09:39.000000000 -0500 @@ -0,0 +1 @@ +3.0 (quilt)
_______________________________________________ gNewSense-dev mailing list [email protected] https://lists.nongnu.org/mailman/listinfo/gnewsense-dev
