pd-zexy review (was Re: [SCM] pd-zexy/master: preserve autom4te.cache)
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 2011-09-29 18:36, Jonas Smedegaard wrote: > > Debian Policy requires documenting in changelog all packaging changes > that affect the final installation at the user end - i.e. no need to > document spelling changes to comments in build scripts, or to document > changes that got rolled back again or superceded by later changes. > > So in this case, you are supposed to document that you added this > build-dependency. Yes, CDBS added it automagically for you, but it does > not mess with changelog for you: that's your responsibility. > > autotools-dev is used to pull in up-to-date config.* files at build > time. thanks for this info. documentation is probably cdbs's greatest showstopper... > You committed changes to copyright and copyright_hints together. i did. i usually try to avoid that, but sometimes it happens... > A license shortname must be a single word. "MIT/X11 (BSD like)" is not a > single word. i couldn't actually see this from DEP5 description, but nevertheless it makes sense. the name was suggested by licensecheck. > Also, Public Domain is not a real license nor an ownership, so (in my > understanding) should only be listed when the sole "license" for a work. well, given that FSF added a notice that their amendments are "public-domain", should we simply ignore this? (i'm fine with that too) > > Also, I recommend wrapping at 72 chars (not important, just nitpicking). applied. > > Also, a trailing space has crept in at "Files: ./configure " (not > important, just nitpicking). applied. (i like nitpicking as it is usually easy to fix) > > I therefore suggest using Expat~X as license shortname, and move the > last paragraph up as part of the file listing, like this: > > Files: install-sh > Copyright: 1994, X Consortium > License: Expat~X with X exception > Except as contained in this notice, the name of the X Consortium shall > not be used in advertising or otherwise to promote the sale, use or > other dealings in this Software without prior written authorization > from the X Consortium. applied. > config.guess, config.sub and some other files do not exactly use GPL-2+ > as licensing, but adds an Autoconf exception. hopefully fixed. fgmasdr IOhannes -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk6EsFcACgkQkX2Xpv6ydvTkjACfQPwACqIOPwrm907CwClgXoTZ PwkAnRHtaBuvz6DC/ihe3EVmmuk0Oo7F =ZnLz -END PGP SIGNATURE- smime.p7s Description: S/MIME Cryptographic Signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] pd-zexy/master: preserve autom4te.cache
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 2011-09-29 18:36, Jonas Smedegaard wrote: > On 11-09-29 at 05:45pm, IOhannes m zmoelnig wrote: >> if my packages start to be releasable without too much discussion, >> i'll probably start handing out "unstable" tags :-) > > Seems you are confusing two things here: > > PET uses debian/changelog suite hint as indication if a package in VCS > is considered ready to be released. If ready it is set to a sensible > suite, if not ready it should be set to UNRELEASED. > > Then, when actually releasing, we add a git tag. > oh, sorry; i used the word "tag" rather carelessly, not alluding to git-tags at all, but just to a "label" that i can stick to something. so the "tag" is was referring to is the 3rd entry in the header-line of a debian/changelog entry, that denotes the suite or UNRELEASED if not-yet-ready-to-be-included-in-a-suite fgmasdr IOhannes -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk6Epr4ACgkQkX2Xpv6ydvSIUgCdGKXy+BbB4VZWjV8DpMtbCUnl ziQAoKfZLoffD4PL/rqY+COhDbv+n/p9 =d3eE -END PGP SIGNATURE- smime.p7s Description: S/MIME Cryptographic Signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] pd-zexy/master: preserve autom4te.cache
On 11-09-29 at 05:45pm, IOhannes m zmoelnig wrote: > On 2011-09-29 17:06, Reinhard Tartler wrote: > > On Do, Sep 29, 2011 at 16:45:08 (CEST), IOhannes m zmoelnig wrote: > >> feel free to review, comment and upload :-) > > > > Still says UNRELEASED in debian/changelog ;-) > > > > at least that would make it appear in pet's "to upload" list. > > huh? > it seems like i missed something, like "pet" (who? what?) monitoring > the state in debian/changelog. I am surprised too that this team uses PET. Nice! > apart from that, i thought that given i am still a "junior packager" > i'd rather have a "senior packager", who does the actual upload, > change the line from UNRELEASED to unstable. > > if my packages start to be releasable without too much discussion, > i'll probably start handing out "unstable" tags :-) Seems you are confusing two things here: PET uses debian/changelog suite hint as indication if a package in VCS is considered ready to be released. If ready it is set to a sensible suite, if not ready it should be set to UNRELEASED. Then, when actually releasing, we add a git tag. So you are right that you should not git-tag before actually releasing, but it makes good sense that you change the hinting in changelog when you believe the package is ready for release (by someone else, if you can or will not do it yourself). > > As for the other changes, seems there is some CDBS black magic > > involved, other > > let's wait for jonas then :-) I guess the "voodoo" referred to this time around is the added build-dependency on autotools-dev. Debian Policy requires documenting in changelog all packaging changes that affect the final installation at the user end - i.e. no need to document spelling changes to comments in build scripts, or to document changes that got rolled back again or superceded by later changes. So in this case, you are supposed to document that you added this build-dependency. Yes, CDBS added it automagically for you, but it does not mess with changelog for you: that's your responsibility. autotools-dev is used to pull in up-to-date config.* files at build time. You committed changes to copyright and copyright_hints together. I recommend to commit auto-generated and manual changes separately. That eases eventual later revert or cherry-picking across suites. A license shortname must be a single word. "MIT/X11 (BSD like)" is not a single word. Also, Public Domain is not a real license nor an ownership, so (in my understanding) should only be listed when the sole "license" for a work. Also, it is recommended to use "Expat" for that license to avoid ambiguity: There are multiple licenses labelled MIT. Also, that license isn't exactly Expat but rather a) a derivation with "X Consortium" embedded in it and b) an exception. Also, I recommend wrapping at 72 chars (not important, just nitpicking). Also, a trailing space has crept in at "Files: ./configure " (not important, just nitpicking). I therefore suggest using Expat~X as license shortname, and move the last paragraph up as part of the file listing, like this: Files: install-sh Copyright: 1994, X Consortium License: Expat~X with X exception Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. config.guess, config.sub and some other files do not exactly use GPL-2+ as licensing, but adds an Autoconf exception. Regards, - Jonas -- * Jonas Smedegaard - idealist & Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private signature.asc Description: Digital signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] pd-zexy/master: preserve autom4te.cache
On Do, Sep 29, 2011 at 17:45:46 (CEST), IOhannes m zmoelnig wrote: > On 2011-09-29 17:06, Reinhard Tartler wrote: >> On Do, Sep 29, 2011 at 16:45:08 (CEST), IOhannes m zmoelnig wrote: >>> feel free to review, comment and upload :-) >> >> Still says UNRELEASED in debian/changelog ;-) >> >> at least that would make it appear in pet's "to upload" list. > > huh? > it seems like i missed something, like "pet" (who? what?) monitoring the > state in debian/changelog. Yes, see my past mails, our PET instance can be found at http://pet.debian.net/pkg-multimedia/pet.cgi I've installed repository hooks to keep PET's database in sync with our repositories each time a team member pushes fresh commits. Among others, it inspects debian/changelog of the 'HEAD' branch to determine if a package is ready for upload or not. Note that we do team-work, so I encourage every team member to also look at other packages. PET greatly assists with highlighting what package needs work. > apart from that, i thought that given i am still a "junior packager" i'd > rather have a "senior packager", who does the actual upload, change the > line from UNRELEASED to unstable. > > if my packages start to be releasable without too much discussion, i'll > probably start handing out "unstable" tags :-) Ah, in that case you actually ask for additional reviewers and testers instead of only an uploader (often called 'sponsor'). That's great! >> As for the >> other changes, seems there is some CDBS black magic involved, other > > let's wait for jonas then :-) Agreed :-) Cheers, Reinhard. -- Gruesse/greetings, Reinhard Tartler, KeyID 945348A4 ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] pd-zexy/master: preserve autom4te.cache
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 2011-09-29 17:06, Reinhard Tartler wrote: > On Do, Sep 29, 2011 at 16:45:08 (CEST), IOhannes m zmoelnig wrote: >> feel free to review, comment and upload :-) > > Still says UNRELEASED in debian/changelog ;-) > > at least that would make it appear in pet's "to upload" list. huh? it seems like i missed something, like "pet" (who? what?) monitoring the state in debian/changelog. apart from that, i thought that given i am still a "junior packager" i'd rather have a "senior packager", who does the actual upload, change the line from UNRELEASED to unstable. if my packages start to be releasable without too much discussion, i'll probably start handing out "unstable" tags :-) > As for the > other changes, seems there is some CDBS black magic involved, other let's wait for jonas then :-) fgmasdr IOhannes -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk6EkqoACgkQkX2Xpv6ydvSTowCfe0MJKjL6WIivKuH3MEu+Z1Ni 9/4AoOvWUN53H3lFyI9evRIBBmOaCvN3 =zylw -END PGP SIGNATURE- smime.p7s Description: S/MIME Cryptographic Signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] pd-zexy/master: preserve autom4te.cache
On Do, Sep 29, 2011 at 16:45:08 (CEST), IOhannes m zmoelnig wrote: > On 2011-09-28 09:33, IOhannes m zmoelnig wrote: >> >> so i am unsure how to proceed... >> > > it seems that the problem has found a solution: > upstream released a new version (2.2.5), which no longer includes those > files. > i have prepared a new package (new upstream comes with proper autotools > build system, which makes debian/rules less convoluted) and pushed it. > > feel free to review, comment and upload :-) Still says UNRELEASED in debian/changelog ;-) at least that would make it appear in pet's "to upload" list. As for the other changes, seems there is some CDBS black magic involved, other changes look fine on the first look. Cheers, -- Gruesse/greetings, Reinhard Tartler, KeyID 945348A4 ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] pd-zexy/master: preserve autom4te.cache
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 2011-09-28 09:33, IOhannes m zmoelnig wrote: > > so i am unsure how to proceed... > it seems that the problem has found a solution: upstream released a new version (2.2.5), which no longer includes those files. i have prepared a new package (new upstream comes with proper autotools build system, which makes debian/rules less convoluted) and pushed it. feel free to review, comment and upload :-) fgamsdr IOhannes ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk6EhG0ACgkQkX2Xpv6ydvTTIgCgqOO2jxloslA24vZqa+3/r1zD blwAoJo+Bk9aUu0FaBCvuh8F6BOfNvch =5DuM -END PGP SIGNATURE- smime.p7s Description: S/MIME Cryptographic Signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] pd-zexy/master: preserve autom4te.cache
On Mi, Sep 28, 2011 at 09:33:17 (CEST), IOhannes m zmoelnig wrote: > On 2011-09-27 20:34, Reinhard Tartler wrote: >>> deleting is probably the best thing, the question is how to achieve that >>> here: >>> - strip the autom4te.cache from the pristine-tar import? > > what i meant is to do a re-import with "git-import-orig --filter > autom4te.cache" Hm, I haven't done this before, but this should work as well. >> pristine-tar imports the 'upstream' branch, not master. Don't delete >> from 'upstream', only from 'master'. > > i was hesitant to do that, as i thought one was not supposed to do > _anything_ outside of debian/. > > for modification of the upstream sources, we have patch systems like quilt. Indeed, that's the general rule. Still, plain removals outside of debian/ are IME okay, as dpkg will just ignore them. At least it used to do in the past. > >>> - patch the offending sources away? >> >> I don't understand this? please elaborate. > > following my argumentation above, that one is not supposed to change the > contents of the sources (outside the debian/ directory), my (somewhat > clumsy) suggestion was to add a > debian/patches/remove_autom4te.patch that would remove the offending > files (and hopefully restore them after the build). That seems gross to me. -- Gruesse/greetings, Reinhard Tartler, KeyID 945348A4 ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] pd-zexy/master: preserve autom4te.cache
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 2011-09-27 20:34, Reinhard Tartler wrote: >> deleting is probably the best thing, the question is how to achieve that >> here: >> - strip the autom4te.cache from the pristine-tar import? what i meant is to do a re-import with "git-import-orig --filter autom4te.cache" > pristine-tar imports the 'upstream' branch, not master. Don't delete > from 'upstream', only from 'master'. i was hesitant to do that, as i thought one was not supposed to do _anything_ outside of debian/. for modification of the upstream sources, we have patch systems like quilt. >> - patch the offending sources away? > > I don't understand this? please elaborate. following my argumentation above, that one is not supposed to change the contents of the sources (outside the debian/ directory), my (somewhat clumsy) suggestion was to add a debian/patches/remove_autom4te.patch that would remove the offending files (and hopefully restore them after the build). so i am unsure how to proceed... fgmasdr IOhannes -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk6CzboACgkQkX2Xpv6ydvTkmwCbBioV19M5AM/4V0xmEjMdGlND 0xgAn2xJ+e6PDGEFabtWyjE0yxC5dtv8 =Dzfr -END PGP SIGNATURE- smime.p7s Description: S/MIME Cryptographic Signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] pd-zexy/master: preserve autom4te.cache
On 11-09-27 at 09:55pm, Reinhard Tartler wrote: > On Di, Sep 27, 2011 at 20:50:01 (CEST), Jonas Smedegaard wrote: > > > On 11-09-27 at 08:33pm, Reinhard Tartler wrote: > >> On Di, Sep 27, 2011 at 18:57:14 (CEST), Jonas Smedegaard wrote: > >> > >> > On 11-09-27 at 06:49pm, Reinhard Tartler wrote: > >> >> On Di, Sep 27, 2011 at 17:30:51 (CEST), > >> >> zmoelnig-gu...@users.alioth.debian.org wrote: > >> >> > >> >> > The following commit has been merged in the master branch: > >> >> > commit ce6b55f7d5eaed7c6d805e920cc93607a33e408c > >> >> > Author: IOhannes m zmölnig > >> >> > Date: Tue Sep 27 17:13:52 2011 +0200 > >> >> > > >> >> > preserve autom4te.cache > >> >> > > >> >> > which is in the upstream tarball though it never should > >> >> > have gone there... > >> > > >> > [snip] > >> > > >> >> Why not deleting it in the clean target and remove it from the > >> >> packaging (i.e., 'master') branch? > >> > > >> > IMO a noble ideal to preserve upstream sources as pristine as > >> > possible. > >> > >> we do that in the upstream branch, and use pristine-tar. > >> > >> Deleting it from the branch worked best for me in the past and > >> avoids annoying warnings from git. > > > > "branch" is a VCS term. > > > > What I am talking about is not (only) to preserve (when possible) > > pristine upstream source in VCS, but also as shipped source package. > > > > I.e. to not "remove it from the packaging" as you explicitly seem to > > suggest. > > Ah, you are splitting hairs. No, that's not what I've meant with that. Ah, when we disagree on tiny details, _I_ am the one splitting hair?!? > At least, we seem to agree on what to do. :-) Oh, we do? Great! :-) - Jonas -- * Jonas Smedegaard - idealist & Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private signature.asc Description: Digital signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] pd-zexy/master: preserve autom4te.cache
On Di, Sep 27, 2011 at 20:50:01 (CEST), Jonas Smedegaard wrote: > On 11-09-27 at 08:33pm, Reinhard Tartler wrote: >> On Di, Sep 27, 2011 at 18:57:14 (CEST), Jonas Smedegaard wrote: >> >> > On 11-09-27 at 06:49pm, Reinhard Tartler wrote: >> >> On Di, Sep 27, 2011 at 17:30:51 (CEST), >> >> zmoelnig-gu...@users.alioth.debian.org wrote: >> >> >> >> > The following commit has been merged in the master branch: >> >> > commit ce6b55f7d5eaed7c6d805e920cc93607a33e408c >> >> > Author: IOhannes m zmölnig >> >> > Date: Tue Sep 27 17:13:52 2011 +0200 >> >> > >> >> > preserve autom4te.cache >> >> > >> >> > which is in the upstream tarball though it never should have >> >> > gone there... >> > >> > [snip] >> > >> >> Why not deleting it in the clean target and remove it from the >> >> packaging (i.e., 'master') branch? >> > >> > IMO a noble ideal to preserve upstream sources as pristine as possible. >> >> we do that in the upstream branch, and use pristine-tar. >> >> Deleting it from the branch worked best for me in the past and avoids >> annoying warnings from git. > > "branch" is a VCS term. > > What I am talking about is not (only) to preserve (when possible) > pristine upstream source in VCS, but also as shipped source package. > > I.e. to not "remove it from the packaging" as you explicitly seem to > suggest. Ah, you are splitting hairs. No, that's not what I've meant with that. At least, we seem to agree on what to do. :-) -- Gruesse/greetings, Reinhard Tartler, KeyID 945348A4 ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] pd-zexy/master: preserve autom4te.cache
On 11-09-27 at 08:33pm, Reinhard Tartler wrote: > On Di, Sep 27, 2011 at 18:57:14 (CEST), Jonas Smedegaard wrote: > > > On 11-09-27 at 06:49pm, Reinhard Tartler wrote: > >> On Di, Sep 27, 2011 at 17:30:51 (CEST), > >> zmoelnig-gu...@users.alioth.debian.org wrote: > >> > >> > The following commit has been merged in the master branch: > >> > commit ce6b55f7d5eaed7c6d805e920cc93607a33e408c > >> > Author: IOhannes m zmölnig > >> > Date: Tue Sep 27 17:13:52 2011 +0200 > >> > > >> > preserve autom4te.cache > >> > > >> > which is in the upstream tarball though it never should have > >> > gone there... > > > > [snip] > > > >> Why not deleting it in the clean target and remove it from the > >> packaging (i.e., 'master') branch? > > > > IMO a noble ideal to preserve upstream sources as pristine as possible. > > we do that in the upstream branch, and use pristine-tar. > > Deleting it from the branch worked best for me in the past and avoids > annoying warnings from git. "branch" is a VCS term. What I am talking about is not (only) to preserve (when possible) pristine upstream source in VCS, but also as shipped source package. I.e. to not "remove it from the packaging" as you explicitly seem to suggest. Regards, - Jonas -- * Jonas Smedegaard - idealist & Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private signature.asc Description: Digital signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] pd-zexy/master: preserve autom4te.cache
On Di, Sep 27, 2011 at 18:59:44 (CEST), IOhannes m zmoelnig wrote: > On 2011-09-27 18:49, Reinhard Tartler wrote: >> On Di, Sep 27, 2011 at 17:30:51 (CEST), >> zmoelnig-gu...@users.alioth.debian.org wrote: >> >>> The following commit has been merged in the master branch: >>> commit ce6b55f7d5eaed7c6d805e920cc93607a33e408c >>> Author: IOhannes m zmölnig >>> Date: Tue Sep 27 17:13:52 2011 +0200 >>> >>> preserve autom4te.cache >>> >>> which is in the upstream tarball though it never should have gone >>> there... >>> >> >> Why not deleting it in the clean target and remove it from the packaging >> (i.e., 'master') branch? > > it get's deleted by dh_clean > > deleting is probably the best thing, the question is how to achieve that > here: > - strip the autom4te.cache from the pristine-tar import? pristine-tar imports the 'upstream' branch, not master. Don't delete from 'upstream', only from 'master'. > - patch the offending sources away? I don't understand this? please elaborate. -- Gruesse/greetings, Reinhard Tartler, KeyID 945348A4 ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] pd-zexy/master: preserve autom4te.cache
On Di, Sep 27, 2011 at 18:57:14 (CEST), Jonas Smedegaard wrote: > On 11-09-27 at 06:49pm, Reinhard Tartler wrote: >> On Di, Sep 27, 2011 at 17:30:51 (CEST), >> zmoelnig-gu...@users.alioth.debian.org wrote: >> >> > The following commit has been merged in the master branch: >> > commit ce6b55f7d5eaed7c6d805e920cc93607a33e408c >> > Author: IOhannes m zmölnig >> > Date: Tue Sep 27 17:13:52 2011 +0200 >> > >> > preserve autom4te.cache >> > >> > which is in the upstream tarball though it never should have gone >> > there... > > [snip] > >> Why not deleting it in the clean target and remove it from the >> packaging (i.e., 'master') branch? > > IMO a noble ideal to preserve upstream sources as pristine as possible. we do that in the upstream branch, and use pristine-tar. Deleting it from the branch worked best for me in the past and avoids annoying warnings from git. -- Gruesse/greetings, Reinhard Tartler, KeyID 945348A4 ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] pd-zexy/master: preserve autom4te.cache
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 2011-09-27 18:49, Reinhard Tartler wrote: > On Di, Sep 27, 2011 at 17:30:51 (CEST), > zmoelnig-gu...@users.alioth.debian.org wrote: > >> The following commit has been merged in the master branch: >> commit ce6b55f7d5eaed7c6d805e920cc93607a33e408c >> Author: IOhannes m zmölnig >> Date: Tue Sep 27 17:13:52 2011 +0200 >> >> preserve autom4te.cache >> >> which is in the upstream tarball though it never should have gone >> there... >> > > Why not deleting it in the clean target and remove it from the packaging > (i.e., 'master') branch? it get's deleted by dh_clean deleting is probably the best thing, the question is how to achieve that here: - - strip the autom4te.cache from the pristine-tar import? - - patch the offending sources away? - - ... fmdarf IOhannes -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk6CAQAACgkQkX2Xpv6ydvTXbACeOmtG5pNCWpY8nKY3+9DMulvp A+cAmwVEYGgG8Z39/eOCEXgudfksWrw1 =MbPK -END PGP SIGNATURE- smime.p7s Description: S/MIME Cryptographic Signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] pd-zexy/master: preserve autom4te.cache
On 11-09-27 at 06:49pm, Reinhard Tartler wrote: > On Di, Sep 27, 2011 at 17:30:51 (CEST), > zmoelnig-gu...@users.alioth.debian.org wrote: > > > The following commit has been merged in the master branch: > > commit ce6b55f7d5eaed7c6d805e920cc93607a33e408c > > Author: IOhannes m zmölnig > > Date: Tue Sep 27 17:13:52 2011 +0200 > > > > preserve autom4te.cache > > > > which is in the upstream tarball though it never should have gone > > there... [snip] > Why not deleting it in the clean target and remove it from the > packaging (i.e., 'master') branch? IMO a noble ideal to preserve upstream sources as pristine as possible. - Jonas -- * Jonas Smedegaard - idealist & Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private signature.asc Description: Digital signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] pd-zexy/master: preserve autom4te.cache
On Di, Sep 27, 2011 at 17:30:51 (CEST), zmoelnig-gu...@users.alioth.debian.org wrote: > The following commit has been merged in the master branch: > commit ce6b55f7d5eaed7c6d805e920cc93607a33e408c > Author: IOhannes m zmölnig > Date: Tue Sep 27 17:13:52 2011 +0200 > > preserve autom4te.cache > > which is in the upstream tarball though it never should have gone there... > > diff --git a/src/autom4te.cache/output.0 b/debian/pristine/autom4te/output.0 > similarity index 100% > copy from src/autom4te.cache/output.0 > copy to debian/pristine/autom4te/output.0 > diff --git a/src/autom4te.cache/output.1 b/debian/pristine/autom4te/output.1 > similarity index 100% > copy from src/autom4te.cache/output.1 > copy to debian/pristine/autom4te/output.1 > diff --git a/src/autom4te.cache/requests b/debian/pristine/autom4te/requests > similarity index 100% > copy from src/autom4te.cache/requests > copy to debian/pristine/autom4te/requests > diff --git a/src/autom4te.cache/traces.0 b/debian/pristine/autom4te/traces.0 > similarity index 100% > copy from src/autom4te.cache/traces.0 > copy to debian/pristine/autom4te/traces.0 > diff --git a/src/autom4te.cache/traces.1 b/debian/pristine/autom4te/traces.1 > similarity index 100% > copy from src/autom4te.cache/traces.1 > copy to debian/pristine/autom4te/traces.1 > diff --git a/debian/rules b/debian/rules > index b98ef2e..cfc88d6 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -44,3 +44,4 @@ DEB_PHONY_RULES += pristine-revert > clean:: pristine-revert > pristine-revert: makefile-clean > cp -f debian/pristine/configure src/ > + cp -rf debian/pristine/autom4te src/autom4te.cache Why not deleting it in the clean target and remove it from the packaging (i.e., 'master') branch? -- Gruesse/greetings, Reinhard Tartler, KeyID 945348A4 ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
