Ubuntu
pcsc-lite package

Merge lp://staging/~kalon33/ubuntu/natty/pcsc-lite/merge-1.7.0-2-from-unstable into lp://staging/ubuntu/natty/pcsc-lite

  1. Natty (11.04)
  2. merge-1.7.0-2-from-unstable
  3. Merge into natty
Proposed by Nicolas DERIVE
Status: Merged
Merged at revision: 27
Proposed branch: lp://staging/~kalon33/ubuntu/natty/pcsc-lite/merge-1.7.0-2-from-unstable
Merge into: lp://staging/ubuntu/natty/pcsc-lite
Diff against target: 54050 lines
To merge this branch: bzr merge lp://staging/~kalon33/ubuntu/natty/pcsc-lite/merge-1.7.0-2-from-unstable
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+54102@code.staging.launchpad.net

This proposal supersedes a proposal from 2011-03-17.

Description of the change

New branch merging latest 1.7.0-2 version from Debian Unstable, as requested by Ludovic Rousseau (the upstream maintainer)

Builds fine, see:

https://launchpad.net/~kalon33/+archive/rfid/+buildjob/2331027 (With new packaging rules)

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote : Posted in a previous version of this proposal

Note that this merge moves libpcsclite.so.1.0.0 back from /lib/ to /usr/lib/, which we shouldn't do yet (before we also get a new wpasupplicant).

Also, why does this introduce all the flag mangling in debian/rules? The standard debhelper rules should handle nostrip, noopt, and parallel options just fine.

review: Needs Fixing
Revision history for this message
Nicolas DERIVE (kalon33) wrote : Posted in a previous version of this proposal

@pitti: the libpcsclite1.install file is here, where should I change this?
For debian/rules: so there is no need to keep any change in our rules or I keep usbdrop, confdir and prefix?

Thanks for your help.

Revision history for this message
Martin Pitt (pitti) wrote : Posted in a previous version of this proposal

> @pitti: the libpcsclite1.install file is here, where should I change this?

Same way as it was done before? The previous version did the moving in debian/rules:

       # move runtime libraries to /lib
       mv debian/libpcsclite1/usr/lib/libpcsclite.so.1* \
               debian/libpcsclite1/lib/
       rmdir -p --ignore-fail-on-non-empty debian/libpcsclite1/usr/lib
       ln -sf /lib/$$(readlink debian/libpcsclite-dev/usr/lib/libpcsclite.so) \
               debian/libpcsclite-dev/usr/lib/libpcsclite.so

So you might just do the same in an override_dh_install rule?

> For debian/rules: so there is no need to keep any change in our rules or I keep usbdrop, confdir and prefix?

If debian doesn't explicitly specify --enable-confdir=/var/lib/pcscd, then this might just be the default value? Likewise, --enable-usbdropdir=/usr/lib/pcsc/drivers might be the default as well?

The rest is not necessary.

Revision history for this message
Nicolas DERIVE (kalon33) wrote : Posted in a previous version of this proposal

> > @pitti: the libpcsclite1.install file is here, where should I change this?
>
> Same way as it was done before? The previous version did the moving in
> debian/rules:
>
> # move runtime libraries to /lib
> mv debian/libpcsclite1/usr/lib/libpcsclite.so.1* \
> debian/libpcsclite1/lib/
> rmdir -p --ignore-fail-on-non-empty debian/libpcsclite1/usr/lib
> ln -sf /lib/$$(readlink debian/libpcsclite-dev/usr/lib/libpcsclite.so)
> \
> debian/libpcsclite-dev/usr/lib/libpcsclite.so
>
> So you might just do the same in an override_dh_install rule?

I think it's done, what do you think?
>
> > For debian/rules: so there is no need to keep any change in our rules or I
> keep usbdrop, confdir and prefix?
>
> If debian doesn't explicitly specify --enable-confdir=/var/lib/pcscd, then
> this might just be the default value? Likewise, --enable-
> usbdropdir=/usr/lib/pcsc/drivers might be the default as well?

It seems that it was the case indeed.
>
> The rest is not necessary.
 I dropped the rest.

Should I change other things?

Thanks for your help.

Revision history for this message
Martin Pitt (pitti) wrote :

Looks fine now, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches