lp:~logan/ubuntu/raring/uswsusp/debian-merge

Created by Logan Rosen and last modified
Get this branch:
bzr branch lp:~logan/ubuntu/raring/uswsusp/debian-merge
Only Logan Rosen can upload to this branch. If you are Logan Rosen please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Logan Rosen
Status:
Merged

Recent revisions

25. By Logan Rosen

* Merge from Debian unstable. Remaining changes:
  - debian/rules: Remove the SPLASHY_LIBS piece, it's useless since the
    splashy support has been disabled
* New maintainer.
* debian/control: Build-Depends, double "autotools-dev" dependency.
  Removing one of them.
* debian/uswsusp.templates: Solved small typo in one template.
  Patch from David Prévot <email address hidden> [Closes: #686258]
* Debconf translation updates:
  - cs: Michal Šimůnek <email address hidden> [Closes: #687194]
  - da: Joe Hansen <email address hidden> [Closes: #686458]
  - de: Holger Wansing <email address hidden> [Closes: #686732]
  - es: Javier Fernández-Sanguino Peña <email address hidden> [Closes: #686771]
  - fr: Christian Perrier <email address hidden> [Closes: #686911]
  - it: Luca Monducci <email address hidden> [Closes: #686486]
  - jp: Victory <email address hidden>
  - nl: Willem Kuyn <email address hidden>
  - pl: Michał Kułach <email address hidden> [Closes: #686599]
  - pt: Traduz <email address hidden> [Closes: #686734]
  - ru: Yuri Kozlov <email address hidden> [Closes: #686476]
  - sk: Ivan Masár <email address hidden> [Closes: #686532]
  - sv: Martin Bagge <email address hidden> [Closes: #688421]

24. By Leo Iannacone

* Merge from debian unstable (LP: #892306). Remaining changes:
  - debian/rules:
    + Remove the SPLASHY_LIBS piece, it's useless since the splashy support
      has been disabled

23. By Lorenzo De Liso

* Merge from debian unstable, remaining changes:
  - debian/rules:
    + Remove the SPLASHY_LIBS piece, it's useless since the splashy support
      has been disabled
    + Don't run debconf-updatepo in clean target

22. By Bilal Akhtar

* Merge from debian unstable. (LP: #604910) Remaining changes:
  - Remove splashy support from debian/rules.
  - Remove splashy from Suggests.
  - Remove libsplashy1-dev from Build-Depends.
  - debian/rules: don't run debconf-updatepo in clean target.

21. By Devid Antonio Filoni

Remove usplash support also from debian/rules.

20. By Devid Antonio Filoni

Remove usplash support, it doesn't work (LP: #241115, #331101).

19. By Devid Antonio Filoni

* Merge from Debian unstable (LP: #241115, #132603), remaining Ubuntu
  changes:
  - debian/control: modify libsplashy1-dev to libusplash-dev in Build-Depends
    field
  - debian/rules: don't run debconf-updatepo in clean target
  - add usplash support, I hope the patch is good
* s2ram is built in Ubuntu again (LP: #134238).
* debian/control: modify splashy (>= 0.3) to uspash in Suggests field.

18. By Scott James Remnant (Canonical)

No-change rebuild to shed strange libvolumeid0 dep.

17. By Matthew Garrett <email address hidden>

Don't build s2ram. It's not sensible on Ubuntu.

16. By Andrea Veri

* Merge from Debian unstable. Remaining Ubuntu changes:
  - Added usplash support.
  - Added libusplash-dev to Build-Depends.
  - Changed SUSPEND_DIR to /sbin.
  - Removed splashy-dev from Build-Depends.
  - Stop running debconf-updatepo in clean.
  - Modify Maintainer value to match Debian-Maintainer-Field Spec

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/raring/uswsusp
This branch contains Public information 
Everyone can see this information.

Subscribers