On Sun, 2013-09-15 at 15:46 +0200, Sam Geeraerts wrote: > Op Fri, 13 Sep 2013 17:59:33 -0500 > schreef Richard Hinojosa <[email protected]>: > > > I worked through the remaining instructions and I got a diff file. I > > am going to add as attachment for review. > > Great! Your diff applies nicely and it solves the issue. To take it to > perfection you can improve these points: > > - The changelog should have only 1 new entry; the only change to the > version string should be to add "gnewsense1". > - The Vcs-* entries in the control file should be just the source > package name, not including the version number. > - The name of the debian/patches file should give some indication of > what it does. > - Bonus points if you add a DEP-3 header to the patch (e.g. [1]), using > the Author field to give credit to Harry. > > [1] > http://bzr.savannah.gnu.org/lh/gnewsense/packages-parkes/claws-mail/annotate/head:/debian/patches/37889-remove_nonfree_browser.patch > > _______________________________________________ > gNewSense-dev mailing list > [email protected] > https://lists.nongnu.org/mailman/listinfo/gnewsense-dev
I made the changes to and attached the .diff file. I will be trying out the deb-3 header
diff -Nru irssi-0.8.15/debian/changelog irssi-0.8.15/debian/changelog --- irssi-0.8.15/debian/changelog 2013-09-17 23:00:48.000000000 -0500 +++ irssi-0.8.15/debian/changelog 2013-09-17 22:18:02.000000000 -0500 @@ -1,3 +1,10 @@ +irssi (0.8.15-2.1gnewsense1) parkes; urgency=low + + * Non-maintainer upload. + * changes debian reference in first run text. (Closes #39251) + + -- Richard Hinojosa <[email protected]> Tue, 17 Sep 2013 22:09:51 -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-17 23:00:48.000000000 -0500 +++ irssi-0.8.15/debian/control 2013-09-17 22:25:32.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: Vcs-Browser: http://bzr.savannah.gnu.org/lh/gnewsense/packages-parkes/irssi/ +Vcs-Bzr: bzr://bzr.savannah.gnu.org/gnewsense/packages-parkes/irssi/ Package: irssi Architecture: any diff -Nru irssi-0.8.15/debian/patches/18firsttimer_textfix_gnewsense irssi-0.8.15/debian/patches/18firsttimer_textfix_gnewsense --- irssi-0.8.15/debian/patches/18firsttimer_textfix_gnewsense 1969-12-31 18:00:00.000000000 -0600 +++ irssi-0.8.15/debian/patches/18firsttimer_textfix_gnewsense 2013-09-17 22:52:26.000000000 -0500 @@ -0,0 +1,13 @@ +--- a/src/fe-text/irssi.c ++++ b/src/fe-text/irssi.c +@@ -92,8 +92,8 @@ + "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" ++ "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/patches/debian-changes-0.8.15-2.1gnewsense1 irssi-0.8.15/debian/patches/debian-changes-0.8.15-2.1gnewsense1 --- irssi-0.8.15/debian/patches/debian-changes-0.8.15-2.1gnewsense1 1969-12-31 18:00:00.000000000 -0600 +++ irssi-0.8.15/debian/patches/debian-changes-0.8.15-2.1gnewsense1 2013-09-17 22:57:22.000000000 -0500 @@ -0,0 +1,32 @@ +Description: Upstream changes introduced in version 0.8.15-2.1gnewsense1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + irssi (0.8.15-2.1gnewsense1) parkes; urgency=low + . + * Non-maintainer upload. + * changes debian reference in first run text. (Closes #39251) + . + The person named in the Author field signed this changelog entry. +Author: Richard Hinojosa <[email protected]> + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- irssi-0.8.15.orig/irssi-version.h ++++ irssi-0.8.15/irssi-version.h +@@ -1,2 +1,2 @@ + #define IRSSI_VERSION_DATE 20100403 +-#define IRSSI_VERSION_TIME 1817 ++#define IRSSI_VERSION_TIME 1617 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-17 23:00:48.000000000 -0500 +++ irssi-0.8.15/debian/patches/series 2013-09-17 22:57:22.000000000 -0500 @@ -5,3 +5,5 @@ #06gnutls-support 12manpage-fix 17cumode_space-fix +18firsttimer_textfix_gnewsense +debian-changes-0.8.15-2.1gnewsense1 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-17 22:24:57.000000000 -0500 @@ -0,0 +1 @@ +Changed reference to debian's irc server and channel. \ No newline at end of file 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-17 22:06:55.000000000 -0500 @@ -0,0 +1 @@ +3.0 (quilt)
_______________________________________________ gNewSense-dev mailing list [email protected] https://lists.nongnu.org/mailman/listinfo/gnewsense-dev
