- Committer: Jamie Strandboge
- Date: 2012-01-30 23:21:11 UTC
- Revision ID: jamie@canonical.com-20120130232111-eu6ryx01f1ynscj7
* Merge with Debian testing, remaining Ubuntu changes:
- debian/control:
+ Add Vcs-Bzr link
+ Add/Update replaces with Ubuntu versions
+ Update package descriptions to list Ubuntu screensavers
- debian/rules:
+ Use /usr/share/backgrounds as image directory
+ Add translation domain to .desktop files
- debian/source_xscreensaver.py:
+ Add apport hook
- debian/split-hacks.config:
+ Use different set of default hacks than Debian
- debian/xscreensaver.dirs
+ Install /usr/share/backgrounds. By default, settings search in
/usr/share/backgrounds and without it, it displays an error
- debian/patches/53_XScreenSaver.ad.in.patch:
+ Use Ubuntu branding
- debian/patches/60_sequential_glslideshow.patch:
+ Allow going through images sequentially rather than just at random in
the GLSlideshow hack.
* debian/changelog: really clean up changelog, some entries were still out of
place.
* Build-dep on libjpeg-dev instead of libjpeg62-dev (Closes: #647110)
[ Tormod Volden ]
* New upstream version 5.15
- New hacks: hilbert, companioncube and tronbit
- Turned on LC_CTYPE on Linux (LP: #671923)
* debian/rules: Add build-arch and build-indep targets
[ Jose Luis Rivas ]
* postrm: Kill xscreensaver after removal (Closes: #558024)
* Bump Standards-Version to 3.9.2 (no changes needed)
* Non-maintainer upload by the security team.
* Fix local screen lock bypass vulnerability (closes: #539699).
[ Tormod Volden ]
* New Upstream Version
* driver/XScreensaver.ad.in:
+ Use ISO time/date format in password dialog
+ Use url as default text method
+ remove dnalogo and flurry which are not installed
* remove xsublim hack since upstream no more installs it
* add desktop file comment to cubicgrid, hypnowheel and lcdscrub
* debian/patches: renamed, commented, refreshed patches and series
* debian/control: use Suggests xscreensaver instead of Enhances
for -data and -gl packages
* Fixed Exec and TryExec entries in desktop files.
* Fixed manpages warnings and bad-formatting.
* Fixed Vcs-Browser URI.
* Drop xli | xloadimage recommends to universe. Both are in universe, and
xli is orphaned in Debian.
* Restore the fix from 5.05-1ubuntu2, which was lost in the latest
merge:
* xscreensaver-gl and xscreensaver-gl-extras Recommend xscreensaver |
gnome-screensaver rather than merely xscreensaver, so that germinate
won't pull xscreensaver into the desktop (LP: #242495).
* Upgrade upstream version
* debian/control: Remove suggest xdaliclock as it is no longer
included
* Remove 10_jwz-screensaver-randr-patch-3.patch as it has been merged
upstream.
* Add 24_hacks_xsublim_enable.patch as it seems that xsublim was dropped
from the build files. There is nothing in the Changelog about it
so I believe it was accidental.
* Updating the .desktop files from the XML files using gnome-screensaver's
utility to do so. Lots of text updates. Also:
* Added: abstractile.desktop
* Added: cwaves.desktop
* Added: m6502.desktop
* Added: skytentacles.desktop
* Removed: xteevee.desktop
* xscreensaver-gl-extra.files: Added skytentacles
* xscreensaver-data-extra.files: Added abstractile, cwaves and m6502
* xscreensaver-data.files: Remove partial abstractile, m6502 and cwaves
[ Jose Luis Rivas ]
* New upstream release
* debian/patches:
+ delete patch for xinerama, is now merged upstream
+ add patch for hacks/Makefile.in
[ Tormod Volden ]
* debian/control: let the hacks packages "enhance" xscreensaver
and gnome-screensaver since they can be used independently
* use upstream xscreensaver-properties.desktop instead of our own
* move man pages to section 6x in a consistent way
* ship the lcdscrub man page
* factor out common stuff from hacks desktop files into one stub
file for easier mass modification
* add OnlyShowIn=GNOME to desktop files (fixes lintian warnings)
* add -randomize to truchet and xlyap desktop files
* add desktop file for m6502, abstractile and cwaves
* fixed up names in several desktop files
* use yelp to display man pages in Preferences dialog if available,
and do the right thing in a terminal window if not
* NMU.
* should not kill running xscreensavers (Close: #334193)
- debian/control:
+ Add Vcs-Bzr link
+ Add/Update replaces with Ubuntu versions
+ Update package descriptions to list Ubuntu screensavers
- debian/rules:
+ Use /usr/share/backgrounds as image directory
+ Add translation domain to .desktop files
- debian/source_xscreensaver.py:
+ Add apport hook
- debian/split-hacks.config:
+ Use different set of default hacks than Debian
- debian/xscreensaver.dirs
+ Install /usr/share/backgrounds. By default, settings search in
/usr/share/backgrounds and without it, it displays an error
- debian/patches/53_XScreenSaver.ad.in.patch:
+ Use Ubuntu branding
- debian/patches/60_sequential_glslideshow.patch:
+ Allow going through images sequentially rather than just at random in
the GLSlideshow hack.
* debian/changelog: really clean up changelog, some entries were still out of
place.
* Build-dep on libjpeg-dev instead of libjpeg62-dev (Closes: #647110)
[ Tormod Volden ]
* New upstream version 5.15
- New hacks: hilbert, companioncube and tronbit
- Turned on LC_CTYPE on Linux (LP: #671923)
* debian/rules: Add build-arch and build-indep targets
[ Jose Luis Rivas ]
* postrm: Kill xscreensaver after removal (Closes: #558024)
* Bump Standards-Version to 3.9.2 (no changes needed)
* Non-maintainer upload by the security team.
* Fix local screen lock bypass vulnerability (closes: #539699).
[ Tormod Volden ]
* New Upstream Version
* driver/XScreensaver.ad.in:
+ Use ISO time/date format in password dialog
+ Use url as default text method
+ remove dnalogo and flurry which are not installed
* remove xsublim hack since upstream no more installs it
* add desktop file comment to cubicgrid, hypnowheel and lcdscrub
* debian/patches: renamed, commented, refreshed patches and series
* debian/control: use Suggests xscreensaver instead of Enhances
for -data and -gl packages
* Fixed Exec and TryExec entries in desktop files.
* Fixed manpages warnings and bad-formatting.
* Fixed Vcs-Browser URI.
* Drop xli | xloadimage recommends to universe. Both are in universe, and
xli is orphaned in Debian.
* Restore the fix from 5.05-1ubuntu2, which was lost in the latest
merge:
* xscreensaver-gl and xscreensaver-gl-extras Recommend xscreensaver |
gnome-screensaver rather than merely xscreensaver, so that germinate
won't pull xscreensaver into the desktop (LP: #242495).
* Upgrade upstream version
* debian/control: Remove suggest xdaliclock as it is no longer
included
* Remove 10_jwz-screensaver-randr-patch-3.patch as it has been merged
upstream.
* Add 24_hacks_xsublim_enable.patch as it seems that xsublim was dropped
from the build files. There is nothing in the Changelog about it
so I believe it was accidental.
* Updating the .desktop files from the XML files using gnome-screensaver's
utility to do so. Lots of text updates. Also:
* Added: abstractile.desktop
* Added: cwaves.desktop
* Added: m6502.desktop
* Added: skytentacles.desktop
* Removed: xteevee.desktop
* xscreensaver-gl-extra.files: Added skytentacles
* xscreensaver-data-extra.files: Added abstractile, cwaves and m6502
* xscreensaver-data.files: Remove partial abstractile, m6502 and cwaves
[ Jose Luis Rivas ]
* New upstream release
* debian/patches:
+ delete patch for xinerama, is now merged upstream
+ add patch for hacks/Makefile.in
[ Tormod Volden ]
* debian/control: let the hacks packages "enhance" xscreensaver
and gnome-screensaver since they can be used independently
* use upstream xscreensaver-properties.desktop instead of our own
* move man pages to section 6x in a consistent way
* ship the lcdscrub man page
* factor out common stuff from hacks desktop files into one stub
file for easier mass modification
* add OnlyShowIn=GNOME to desktop files (fixes lintian warnings)
* add -randomize to truchet and xlyap desktop files
* add desktop file for m6502, abstractile and cwaves
* fixed up names in several desktop files
* use yelp to display man pages in Preferences dialog if available,
and do the right thing in a terminal window if not
* NMU.
* should not kill running xscreensavers (Close: #334193)
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
ca.po |
20 | 16 years ago | Bazaar Package Importer | * 54_drivers_demogtk.patch: Patching a compile fai | 216 KB |
|
|
|
ChangeLog |
1.1.1 | 19 years ago | Bazaar Package Importer | Import upstream version 4.21 | 7.6 KB |
|
|
|
da.po |
20 | 16 years ago | Bazaar Package Importer | * 54_drivers_demogtk.patch: Patching a compile fai | 292 KB |
|
|
|
de.po |
41 | 12 years ago | Bazaar Package Importer | * Merge with Debian unstable, remaining Ubuntu cha | 288 KB |
|
|
|
es.po |
20 | 16 years ago | Bazaar Package Importer | * 54_drivers_demogtk.patch: Patching a compile fai | 279 KB |
|
|
|
et.po |
20 | 16 years ago | Bazaar Package Importer | * 54_drivers_demogtk.patch: Patching a compile fai | 219 KB |
|
|
|
fi.po |
20 | 16 years ago | Bazaar Package Importer | * 54_drivers_demogtk.patch: Patching a compile fai | 220 KB |
|
|
|
fr.po |
24 | 15 years ago | Bazaar Package Importer | * Upgrade upstream version * debian/control: Remov | 260 KB |
|
|
|
hu.po |
20 | 16 years ago | Bazaar Package Importer | * 54_drivers_demogtk.patch: Patching a compile fai | 292 KB |
|
|
|
it.po |
20 | 16 years ago | Bazaar Package Importer | * 54_drivers_demogtk.patch: Patching a compile fai | 221 KB |
|
|
|
ja.po |
32 | 14 years ago | Bazaar Package Importer | * Merge with Debian unstable, remaining changes: ( | 236 KB |
|
|
|
ko.po |
20 | 16 years ago | Bazaar Package Importer | * 54_drivers_demogtk.patch: Patching a compile fai | 231 KB |
|
|
|
Makefile.in.in |
1.2.1 | 14 years ago | Bazaar Package Importer | Import upstream version 5.10 | 11.6 KB |
|
|
|
nb.po |
32 | 14 years ago | Bazaar Package Importer | * Merge with Debian unstable, remaining changes: ( | 229 KB |
|
|
|
nl.po |
42 | 12 years ago | Bazaar Package Importer | * Merge with Debian unstable, remaining Ubuntu cha | 342 KB |
|
|
|
pl.po |
20 | 16 years ago | Bazaar Package Importer | * 54_drivers_demogtk.patch: Patching a compile fai | 233 KB |
|
|
|
POTFILES.in |
43 | 12 years ago | Jamie Strandboge | * Merge with Debian testing, remaining Ubuntu chan | 5.7 KB |
|
|
|
pt.po |
20 | 16 years ago | Bazaar Package Importer | * 54_drivers_demogtk.patch: Patching a compile fai | 273 KB |
|
|
|
pt_BR.po |
43 | 12 years ago | Jamie Strandboge | * Merge with Debian testing, remaining Ubuntu chan | 277 KB |
|
|
|
ru.po |
20 | 16 years ago | Bazaar Package Importer | * 54_drivers_demogtk.patch: Patching a compile fai | 232 KB |
|
|
|
sk.po |
20 | 16 years ago | Bazaar Package Importer | * 54_drivers_demogtk.patch: Patching a compile fai | 228 KB |
|
|
|
sv.po |
20 | 16 years ago | Bazaar Package Importer | * 54_drivers_demogtk.patch: Patching a compile fai | 282 KB |
|
|
update.sh |
1.1.1 | 19 years ago | Bazaar Package Importer | Import upstream version 4.21 | 477 bytes |
|
|
|
vi.po |
20 | 16 years ago | Bazaar Package Importer | * 54_drivers_demogtk.patch: Patching a compile fai | 238 KB |
|
|
|
wa.po |
20 | 16 years ago | Bazaar Package Importer | * 54_drivers_demogtk.patch: Patching a compile fai | 225 KB |
|
|
|
zh_CN.po |
20 | 16 years ago | Bazaar Package Importer | * 54_drivers_demogtk.patch: Patching a compile fai | 239 KB |
|
|
|
zh_TW.po |
20 | 16 years ago | Bazaar Package Importer | * 54_drivers_demogtk.patch: Patching a compile fai | 233 KB |
|
|