Please merge aufs 0+20071211-1 (universe) from Debian unstable (main)

debdiff attached. Package also at http://revu.tauware.de/details.py?package=aufs

Thanks a lot for maintaining your package in both distributions. I've uploaded your candidate. It may make your updates easier if you can determine a way to apply the Ubuntu server patch based on lsb-release info in debian/rules so that you only have one source to maintain.

aufs (0+20071211-1ubuntu1) hardy; urgency=low

  * Merge from debian unstable (LP: #175705), remaining changes:
    - Fix for Ubuntu Kernels (updated)
  * patches/01_vserver.dpatch: Removed
  * patches/06_ubuntu.dpatch: Added (update of ubuntu patch)

aufs (0+20071211-1) unstable; urgency=low

  * New upstream release
  * Upgrade to policy 3.7.3
  * control: Make use of the new Homepage field.
  * patches/05_no_tmpfs.dpatch: Do not define TMPFS_MAGIC, so it compiles again
  * patches/00list: Use 00list for dpatch instead of PATCHLIST in rules

aufs (0+20071105-1) unstable; urgency=low

  * New upstream snapshot, fixes 2.6.23 compatibility (Closes: #445413)
  * Enable Real-Readonly mode for SquashFS (faster!)
  * 02_patches: Updated, patches moved to patch/
  * 03_fix_ftbfs_on_ia64: Removed, merged upstream
  * kpatches: Patches are now inside patch/

aufs (0+20070924-2) unstable; urgency=low

  * Acknowledge NMU by dann frazier (Closes: #444246)
  * 04_grml.dpatch: Fix problems with grml kernel

aufs (0+20070924-1.1) unstable; urgency=low

  * Non-maintainer upload.
  * Fix namespace collision that resulted in a FTBFS on ia64

aufs (0+20070924-1) unstable; urgency=low

  * New upstream snapshot
  * patches/01_vserver.dpatch: Added an updated version (Closes: #441307)
  * Kernel 2.6.23 support - added patches to linux-patch-aufs:
   - splice: Export do_splice_from, do_splice_to
   - sysfs_get_dentry: Export sysfs_get_dentry
   - put_filp: Export put_filp
  * aufs-modules: Depend on linux-modules-_KVERS_ | linux-image-_KVERS_

aufs (0+20070904-1) unstable; urgency=low

  * New upstream snapshot
  * patches/01_vserver.dpatch: Removed

aufs (0+20070806-1) unstable; urgency=low

  * New upstream snapshot
  * Add linux-patch-aufs (Closes: #435549)
    - Patch for lhash
    - Patch for ksize (linux (<< 2.6.20))
    - b-d on dh-kpatches
  * Redesign configuration
    - debian/conf.mk: All configuration variables
    - debian/rules: Include conf.mk and copy it to aufs-source
    - debian/modules.mk: Include conf.mk
  * debian/control: Correct usage of Homepage:

aufs (0+20070716-1) unstable; urgency=low

  * New upstream snapshot

aufs (0+20070709-1) unstable; urgency=low

  * New upstream snapshot
  * debian/rules: Don't ignore error from make clean
  * VServer Support
    - debian/patches/01_vserver.dpatch: Patch based on vserver.patch

aufs (0+20070702-3) unstable; urgency=low

  * Re-organized aufs-source
    - Copy fs/aufs/* into modules/aufs/ (not modules/aufs/fs/aufs)
    - rename upstream's Makefile to Makefile.upstream
    - Rewrite Makefile to define the variables and include Makefile.upstream

aufs (0+20070702-2) unstable; urgency=low

  * Added toplevel Makefile to aufs-source (Closes: #431772)
  * no upstream changes

aufs (0+20070702-1) unstable; urgency=low

  * New upstram snapshot

 -- Julian Andres Klode <email address hidden> Sat, 15 Dec 2007 23:32:51 +0100