lp:~vibhavp/ubuntu/raring/spl/merge-from-debian

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/raring/spl

Daniel T Chen: Approve on 2013-03-26

Andrew Starr-Bochicchio (community): Needs Information on 2013-01-15

Ubuntu branches: Pending requested 2012-12-20

Diff: 99 lines (+67/-1)

4 files modified

debian/changelog (+16/-0)
debian/control (+1/-1)
debian/patches/03_fix-hurd-ftbfs (+49/-0)
debian/patches/series (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

24. By Vibhav Pant on 2013-03-26

Remove unnecessary changelog entry.

23. By Vibhav Pant on 2012-12-20

* Merge from Debian unstable. Remaining changes:
  + Add 03_ubuntu_multiarch:
    debian/rules: Use multiarch locations. Fixes FTBFS. (LP: #852606)
  - Prefer Debian's 02_fix-ld---as-needed-ftbfs, which means we need
    to reverse-apply it in the actual source so that the patch will
    apply upon `quilt push -a'.

22. By Felix Geyer on 2012-07-26

* Merge from Debian unstable. Remaining changes:
  + Add 03_ubuntu_multiarch:
    debian/rules: Use multiarch locations. Fixes FTBFS. (LP: #852606)
  - Prefer Debian's 02_fix-ld---as-needed-ftbfs, which means we need
    to reverse-apply it in the actual source so that the patch will
    apply upon `quilt push -a'.

21. By Clint Byrum on 2011-11-24

Rebuild for libmysqlclient transition

20. By Daniel T Chen on 2011-09-22

* Merge from Debian unstable. Remaining changes:
  + Add 03_ubuntu_multiarch:
    debian/rules: Use multiarch locations. Fixes FTBFS. (LP: #852606)
  - Prefer Debian's 02_fix-ld---as-needed-ftbfs, which means we need
    to reverse-apply it in the actual source so that the patch will
    apply upon `quilt push -a'.

19. By Matthias Klose on 2011-09-13

Fix FTBFS with ld --as-needed. LP: #832785.

18. By Rhonda D'Vine on 2010-07-02

Brown paper bag release. Really change Build-Depends from libreadline5-dev
to libreadline-dev.

17. By Rhonda D'Vine on 2009-08-23

* Apply patch from Cyril Brulebois to make spl build on kFreeBSD
  (closes: #542438)
* Bump Standards-Version to 3.8.3.
* Replace Build-Depends on libmysqlclient15-dev with libmysqlclient-dev as
  suggested in #538530.
* Changed debianization licensing to BSD style, added two more noticed
  upstream copyright informations.
* Added Build-Conflicts: libsmokeqt4-dev just to be on the save side and not
  run into a FTBFS because it's installed.

16. By Steve Langasek on 2009-09-10

No-change rebuild to drop unneeded dependency on libkrb53

15. By Rhonda D'Vine on 2009-04-20

* Disable spl-kde package for the time being until libsmokeqt returns and
  spl gets changed for it. Thanks to Ana Guerrero for telling me about the
  issue, some others didn't (closes: #522574)
* Bump Standards-Version to 3.8.1.