lp:~vibhavp/ubuntu/saucy/aufs-tools/merge-from-debian

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:ubuntu/saucy/aufs-tools

Bhavani Shankar (community): Needs Information on 2013-05-01

Ubuntu branches: Pending requested 2013-05-01

Diff: 570 lines (+152/-196)

16 files modified

.pc/01-static.patch/Makefile (+0/-118)
.pc/applied-patches (+0/-2)
.pc/fix-ftbfs-with-rc-kernel.patch/ver.c (+0/-39)
Makefile (+1/-0)
aufs.in.5 (+20/-0)
debian/changelog (+54/-15)
debian/control (+2/-1)
debian/copyright (+2/-2)
debian/patches/0001-static.patch (+14/-0)
debian/patches/0002-manpage.patch (+26/-0)
debian/patches/0003-shebang.patch (+27/-0)
debian/patches/01-static.patch (+0/-14)
debian/patches/series (+4/-2)
debian/rules (+1/-1)
debian/source/options (+0/-1)
ver.c (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

13. By Vibhav Pant on 2013-05-01

* Merge from Debian unstable. Remaining changes:
  - Build for both 3.x-rcN & 3.0+ kernels. Fixes FTBFS.
* Taking over with maintainer's consent.
* Removing all references to my old email address.
* Merging upstream version 3.0+20130111.
* Prefixing patches with four digits.
* Updating year in copyright file.
* Setting shebang for the time being to bash in included shell scripts
  (Closes: #701552).
* Trimming diff header in static.patch.
* Correcting manpage example syntax, thanks to Dan Greene <dan-
  <email address hidden>> (Closes: #700111).
* Dropping dpkg-source compression levels.
* Updating year in copyright file.

12. By Vibhav Pant on 2013-05-01

Merging shared upstream rev into target branch.

11. By Dimitri John Ledkov on 2012-12-31

Build for both 3.x-rcN & 3.0+ kernels. Fixes FTBFS.

10. By Daniel Baumann <email address hidden> on 2012-12-11

* Adding dpkg-source local options.
* Updating to standards version 3.9.4.
* Making build-depends on linux-libc-dev unversioned again for jessie.

9. By Daniel Baumann <email address hidden> on 2012-06-29

* Updating GPL boilerplate in copyright file.
* Trimming lintian overrides.
* Switching to xz compression.

8. By Daniel Baumann <email address hidden> on 2012-05-18

* Updating package to standards version 3.9.3.
* Updating package to debhelper version 9.
* Updating copyright file to machine-readable format version 1.0.
* Merging upstream version 3.0+20120411.

7. By Ben Collins on 2012-01-18

Fix regex that checks version of aufs_type.h (failed on 3.x-rcN...)

6. By Daniel Baumann <email address hidden> on 2011-12-10

* Merging upstream version 3.0+20111101.
* Updating build-depends to linux-libc-dev (Closes: #649051).

5. By Daniel Baumann <email address hidden> on 2011-11-03

* Merging upstream version 3.0+20111022.
* Switching architecture fields to linux-any.
* Adding versioned build-depends on linux-libc-dev.
* Using compression level 9 also for binary packages.
* Sorting overrides in rules alphabetically.
* Updating lintian overrides.

4. By Daniel Baumann <email address hidden> on 2011-08-28

* Merging upstream version 20110410.
* Updating maintainer and uploaders fields.
* Removing vcs fields.
* Removing references to my old email address.
* Makging packaging distribution neutral.
* Updating years in copyright file.
* Updating to standards version 3.9.2.
* Compacting copyright file.
* Updating build and install targets in rules for new upstream
  version.
* Rediffing static.patch.
* Correcting spelling mistake in package description.
* Adding manpage symlinks for aubusy and auibusy.
* Updating lintian overrides.