lp:~logan/ubuntu/raring/uswsusp/debian-merge
- Get this branch:
- bzr branch lp:~logan/ubuntu/raring/uswsusp/debian-merge
Branch merges
- Ubuntu branches: Pending requested
-
Diff: 6126 lines (+2827/-2357)30 files modified.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
debian/changelog (+32/-0)
debian/control (+3/-3)
debian/po/cs.po (+25/-25)
debian/po/da.po (+24/-4)
debian/po/de.po (+31/-10)
debian/po/es.po (+551/-547)
debian/po/eu.po (+17/-1)
debian/po/fi.po (+17/-1)
debian/po/fr.po (+457/-434)
debian/po/gl.po (+17/-1)
debian/po/it.po (+25/-5)
debian/po/ja.po (+526/-506)
debian/po/nl.po (+319/-431)
debian/po/pl.po (+456/-0)
debian/po/pt.po (+35/-92)
debian/po/pt_BR.po (+17/-1)
debian/po/ro.po (+17/-1)
debian/po/ru.po (+34/-13)
debian/po/sk.po (+72/-185)
debian/po/sv.po (+109/-88)
debian/po/templates.pot (+18/-2)
debian/po/vi.po (+17/-1)
debian/s2disk.8 (+1/-1)
debian/s2ram.8 (+1/-1)
debian/suspend-keygen.8 (+1/-1)
debian/swap-offset.8 (+1/-1)
debian/uswsusp.conf.5 (+1/-1)
debian/uswsusp.templates (+1/-1)
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. - 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. - 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