Help getting started -- trying to build csound package

[Forrest Cahoon]

On Thu, Jun 7, 2012 at 9:06 AM, Felipe Sateler <fsateler at debian.org> wrote:
> [ ... ]
> 1. Go to sourceforge and get the md5 sum of the new tarball. No need
> to download it yet.
> 2. Edit debian/rules and change the md5 there for the one of the new tarball.
> 3. Run dch -v 1:5.17.11~dfsg-1 "Import new upstream version" . This
> will update the changelog to reflect the new version
> 4. Run debian/rules get-orig-source
>
> CDBS will then proceed to fetch the source, compare md5 sums,
> repackage the source (because there are some files which are not quite
> compliant with the DFSG) and leave a nice tarball in ../tarballs.
>  If all this works, then proceed to:
>
> 5. Commit the changes in debian/rules and debian/changelog
> 6. Run git-import-orig ../tarballs/csound_5.17.11.dfsg.orig.gz (note
> the dfsg in the name)
>
> The tool will import the new sources into git, and merge them into the
> master branch.
>
>
> And now comes the non-mechanic part:
> 1. Check that any new files and copyrights are documented in debian/copyright
> 2. Check that there are no new files that violate the DFSG.
> 3. Adapt debian/* for any changes in upstream sources (new opcodes,
> new build options, etc)
> 4. Test and make sure stuff works

Getting the new upstream sources worked fine, but I ran into trouble
when I ran git-buildpackage with the new sources.  Here's where it ran
into trouble:

 dpkg-source -i -I -b csound
dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building csound using existing
./csound_5.17.11~dfsg.orig.tar.gz
patching file CMakeLists.txt
Reversed (or previously applied) patch detected!  Skipping patch.
8 out of 8 hunks ignored -- saving rejects to file CMakeLists.txt.rej
patching file Opcodes/CMakeLists.txt
patching file interfaces/CMakeLists.txt
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file interfaces/CMakeLists.txt.rej
dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -g0 -E
-b -B .pc/0000-backported-cmake-additions.diff/ <
csound.orig.QchOrw/debian/patches/0000-backported-cmake-additions.diff
gave error exit status 1
dpkg-buildpackage: error: dpkg-source -i -I -b csound gave error exit status 2
debuild: fatal error at line 1357:
dpkg-buildpackage -rfakeroot -D -us -uc -i -I failed
gbp:error: Couldn't run 'debuild -i -I -us -uc': debuild -i -I returned 29


It looks like one of the debian patches didn't apply. I didn't find
the file interfaces/CMakeLists.txt.rej mentioned in the output, so I
guess that gets cleaned up.

It looks like I get to fix up the patch so it applies now. Any advice
on how to do this?

Forrest