Please merge zerofree from debian unstable

Hello Vaibhav,

I'm looking at both the diff's and I got an impression that both the diffs were taken between the current ubuntu version and current debian version whereas it would ideally be against the latest version of ubuntu dsc that you generated by using debuild -S and latest debian dsc in the archives.

Secondly, Please make sure to wrap the d/changelog entry to 80 charecters/line as it looks a bit neat and clean then :)

Regards
Bhavi

@bhavi: I took the diff's from zerofree 1.0.1-2ubuntu1 (quantal) and zerofree 1.0.1-4 (sid)

Vibhav,
   I've taken a look at your diff (Revised Debdiff in comment 2 above).
   I have the following comments:
a.) Thank you for your work.
b.) as per IRC conversation [1], please do open a debian bug regarding the Ubuntu delta in debian/patches/01_fix-as-needed- linking.diff, and then link the resulting debian bug to this bug.
c.) it seems that you've re-named the debian patch in debian/patches/fillval to fillval.diff . I think it best to leave it as it is.
d.) In debian/patches/series, you have 01_fix-as-needed-linking.diff first. Generally, I think in ubuntu delta we usually apply the Ubuntu patches last.
e.) Keep the debian/changelog entries from debian as their own entries, rather than as sub-elements of the Ubuntu merge entry.

--
[1] http://irclogs.ubuntu.com/2012/06/06/%23ubuntu-devel.html#t16:44

Scott: Please advise me if I'm wrong here. Generally while sponsoring I look at preparing a diff between 1.0.1-4 in debian to the latest generated dsc i.e 1.0.1-4ubuntu1.

I saw the different way around this time and got confused

Thanks for your comments :)

Regards
Bhavi

Bhavani, I'm not the definitive guide, but what Vibhav provided was good enough for me.

Vibhav, for your future reference, I think that Bhavani was meaning that you can start the merge by doing:
  grab-merge zerofree

and working from there (see doc at https://wiki.ubuntu.com/UbuntuDevelopment/Merging)

This bug was fixed in the package zerofree - 1.0.1-4ubuntu1

---------------
zerofree (1.0.1-4ubuntu1) quantal; urgency=low

  * Merge from Debian Unstable (LP: #1009412). Remaining Changes:
    - debian/patches/01_fix-as-needed-linking.diff: Move -lext2fs to the end of the linker call.
 -- Vibhav Pant <email address hidden> Thu, 07 Jun 2012 21:35:06 +0530

Scott: Thanks! I always followed the method of patching the debian source. Looking at the final diff I got it that you patched the ubuntu package with the diff which looks fine to me

Thanks again this was the first case I saw like this.

Regards
Bhavi