Code review comment for lp:~kalon33/ubuntu/natty/pcsc-lite/merge-from-unstable

Thanks for your contribution to Ubuntu!

This branch removes all the previous Ubuntu entries from debian/changelog. Please don't do this; you should keep them until such time as we can sync the package completely with Debian.

In several places, where there are colliding changes to the same few lines on the Debian side and the Ubuntu side, you have not resolved the conflict correctly. For instance, the previous Debian->Ubuntu diff had:

-Depends: libccid | pcsc-ifd-handler, ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6), hal
+Depends: libccid | pcsc-ifd-handler, ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6)
 Conflicts: libccid (<= 1.0.0-1)

Your new Debian->Ubuntu diff has:

-Depends: libccid (>= 1.4.1~) | pcsc-ifd-handler, ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6), hal
+Depends: libccid | pcsc-ifd-handler, ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6)
+Conflicts: libccid (<= 1.0.0-1)

This is definitely not how the merge conflict should be resolved. What you should end up with is the same as the Debian side but with ", hal" removed.

-Conflicts: libpcsclite-dev (<< ${binary:Version})
-Depends: ${shlibs:Depends}, ${misc:Depends}, pcscd (= ${binary:Version})
+Conflicts: libpcsclite-dev (<< ${binary:Version}), pcscd (<< ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, pcscd

Could you explain this new Debian->Ubuntu diff? It isn't mentioned in the changelog.

Your debian/rules merge completely reverts the new tiny dh rules, using the previous rules instead. We don't do this in Ubuntu - can you please figure out how to make the change corresponding to the previous Debian->Ubuntu diff using the new rules style? Feel free to ask if you need help with this.