Hello again, After reading many documents, I think I'd like to start gaining practical experience. So, naturally, I began trying to upgrade the blender package to the newest upstream version, 2.75a. It's proving a bit of a challenge, however; If you don't mind taking a moment, I have some questions regarding this package specifically:
- 'git tag' shows me that the various versions (upstream/<version> and debian/<version>) are maintained by tag, as opposed to by branch (as the git-buildpackage docs seem to be teaching me). 'gbp import-orig uscan' seems to read debian/watch fine, but demands an 'upstream' branch, which should obviously be an upstream/<version> tag as per the structure at the moment. *So my question is this*: What tools do I use/how do I maintain the current package structure, with tagged upstream/debian versions, ideally while still utilizing time-savers like debian/watch? - I did manage to update using uscan normally (do I, perhaps, simply tag this?), and ran 'while dquilt push; do dquilt refresh; done' (dquilt is an alias to quilt, except it points to ./debian/patches); all the patches seem to have (I don't *actually* know) applied correctly from what I can see with 'dquilt diff'. Then, using a tar'ed version of blender's upstream git repository (with v2.75a checked out), named 'blender_2.75a.orig.tar.gz', I tried to run 'dpkg-buildpackage -us -uc'. It ran fine, right until the patches. The error is below: patching file blender.thumbnailer > patching file release/bin/blender-thumbnailer.py > patching file source/creator/CMakeLists.txt > Hunk #1 FAILED at 484. > 1 out of 1 hunk FAILED > dpkg-source: info: the patch has fuzz which is not allowed, or is malformed > dpkg-source: info: if patch '0001-blender_thumbnailer.patch' is correctly > applied by quilt, use 'quilt refresh' to update it > dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -E -b -B > .pc/0001-blender_thumbnailer.patch/ --reject-file=- < > blender.orig.HjNuiS/debian/patches/0001-blender_thumbnailer.patch gave > error exit status 1 > dpkg-buildpackage: error: dpkg-source -b blender gave error exit status 2 > - ...Which is strange, considering the dquilt refresh I ran on all the packages. I have searched, and I have no idea what is going on. *So my question is this*: What is going on, and how do I fix it? - I noticed that a diff between CMakeLists.txt of the 'uscan' updated Debian version (before patches) and the original source was quite long... My question holds! - Finally, a bit of an etiquette question (which I couldn't locate in the Debian Policy manual): Say I wanted to add a Danish (my second language) translation to the package description in blender.desktop, which is part of the '0006-blender_desktop.patch' patch. How do I handle the patch header? Do I treat it like a changelog, putting my changes over, or do I make an entirely new header, inputting my changes? Most importantly, is there a tool that takes care of it for me (I noticed that there's a list of changes, insertions, and deletions in each header)? Thanks for your time! Sofus Rose www.sofusrose.com On Mon, Aug 3, 2015 at 5:12 PM, Sofus Rose <so...@sofusrose.com> wrote: > Hello, > > All right, so it seems like my task is to lean how everything works with > those three documents (a bit of light reading... :) ), along with picking > apart the git repository. I'll get back to you in a few days, once I get a > better grip on things! > > Thanks for the assistance, > Sofus Rose > > PS. His name is Kristoffer Rose. I think he only recently became active > again. > > > On Mon, Aug 3, 2015 at 3:11 PM, Matteo F. Vescovi <m...@debian.org> wrote: > >> Hi! >> >> On Mon, Aug 3, 2015 at 1:57 PM, Sofus Rose <so...@sofusrose.com> wrote: >> > Hello, >> > >> > I am an avid user of Debian, but more importantly a frequent user of the >> > blender package that you maintain. I am, however, looking to start >> > contributing to the Debian project. In short, I am interested in >> helping to >> > keep the blender package up to date with regards to upstream. >> > >> > Though I have no prior experience with Debian packaging, I build Blender >> > frequently from source. For my own development, I code mainly in Python >> and >> > C++. For general packaging, I have an in-house Debian Developer that can >> > assist me. >> > >> > For the specifics of Blender packaging, I hope you'll consider taking >> the >> > time to explain them to me! >> >> I'm very glad to see that there is someone interested in helping the >> Team (and me in particular) with the packaging of Blender. >> >> It's not particularly difficult, once you've learnt how it works. >> So, at this point, the better advice I could give you is to take some >> time and read the main packaging documents that are available on the >> Debian Developers' Corner, that is the Debian Policy, Developer >> Reference and New Maintainer's Guide. >> At the same time, you can clone the git repository of Blender in >> Debian and see if it makes sense how it's built, once you have the >> fundamentals of packaging. >> Feel free to ask me (or the team) about the package and to provide >> patches (or ideas) how to improve the setup. >> >> Hope to hear from you soon. >> >> Cheers. >> >> >> PS: out of curiosity, who's the in-house DD? ;-P >> >> -- >> Matteo F. Vescovi || Debian Developer >> GnuPG KeyID: 4096R/0x8062398983B2CF7A >> >> >
_______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers