- Committer: Bazaar Package Importer
- Date: 2011-06-09 22:10:56 UTC
- mfrom: (1.1.12 upstream) (2.1.13 sid)
- Revision ID: james.westby@ubuntu.com-20110609221056-01ikv0cvs0g1hhxd
* Merge with Debian unstable, remaining Ubuntu changes (LP: #795251):
- 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/patches/61_fix_tube_memleak.patch: dropped, applied upstream.
* debian/xscreensaver.desktop: drop file left over from previous merge.
* debian/control: drop Build-Depends on ubuntu-artwork. This was only pulled
in to create /usr/share/backgrounds to use as a location for screensavers
that look for images.
* debian/changelog: reinstate old changelog entries that were dropped in
previous commits.
- 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/patches/61_fix_tube_memleak.patch: dropped, applied upstream.
* debian/xscreensaver.desktop: drop file left over from previous merge.
* debian/control: drop Build-Depends on ubuntu-artwork. This was only pulled
in to create /usr/share/backgrounds to use as a location for screensavers
that look for images.
* debian/changelog: reinstate old changelog entries that were dropped in
previous commits.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
debian
|
2 | 22 years ago | Bazaar Package Importer | add build-dep on libgnome-dev. closes: #128953, # |
|
||
|
driver
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 3.34 |
|
||
|
hacks
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 3.34 |
|
||
|
OSX
|
1.1.4 | 16 years ago | Bazaar Package Importer | Import upstream version 5.04 |
|
||
|
po
|
1.1.1 | 19 years ago | Bazaar Package Importer | Import upstream version 4.21 |
|
||
|
utils
|
1 | 22 years ago | Bazaar Package Importer | Import upstream version 3.34 |
|
||
|
xscreensaver.xcodeproj
|
1.1.4 | 16 years ago | Bazaar Package Importer | Import upstream version 5.04 |
|
||
aclocal.m4 |
1.2.1 | 14 years ago | Bazaar Package Importer | Import upstream version 5.10 | 15.6 KB |
|
|
config.guess |
24 | 15 years ago | Bazaar Package Importer | * Upgrade upstream version * debian/control: Remov | 43.5 KB |
|
|
|
config.h-vms |
1.1.1 | 19 years ago | Bazaar Package Importer | Import upstream version 4.21 | 10.3 KB |
|
|
|
config.h.in |
1.1.11 | 12 years ago | Bazaar Package Importer | Import upstream version 5.13 | 15.9 KB |
|
|
|
config.sub |
24 | 15 years ago | Bazaar Package Importer | * Upgrade upstream version * debian/control: Remov | 31.9 KB |
|
|
|
configure |
42 | 12 years ago | Bazaar Package Importer | * Merge with Debian unstable, remaining Ubuntu cha | 641 KB |
|
|
|
configure.in |
41 | 12 years ago | Bazaar Package Importer | * Merge with Debian unstable, remaining Ubuntu cha | 138 KB |
|
|
|
INSTALL |
1 | 22 years ago | Bazaar Package Importer | Import upstream version 3.34 | 7.6 KB |
|
|
|
install-sh |
1.1.2 | 18 years ago | Bazaar Package Importer | Import upstream version 4.23 | 5.4 KB |
|
|
|
intltool-extract.in |
1.1.1 | 19 years ago | Bazaar Package Importer | Import upstream version 4.21 | 7 KB |
|
|
|
intltool-merge.in |
1.1.1 | 19 years ago | Bazaar Package Importer | Import upstream version 4.21 | 13.3 KB |
|
|
|
intltool-update.in |
1.1.4 | 16 years ago | Bazaar Package Importer | Import upstream version 5.04 | 15.2 KB |
|
|
|
Makefile.in |
1.1.9 | 13 years ago | Bazaar Package Importer | Import upstream version 5.11 | 12.4 KB |
|
|
|
makevms.com |
1 | 22 years ago | Bazaar Package Importer | Import upstream version 3.34 | 912 bytes |
|
|
|
README |
1.1.12 | 12 years ago | Bazaar Package Importer | Import upstream version 5.14 | 83.2 KB |
|
|
|
README.hacking |
1.2.3 | 13 years ago | Bazaar Package Importer | Import upstream version 5.13 | 8 KB |
|
|
|
README.VMS |
1 | 22 years ago | Bazaar Package Importer | Import upstream version 3.34 | 2.2 KB |
|
|
|
setup.com |
1.1.8 | 14 years ago | Bazaar Package Importer | Import upstream version 5.10 | 3.7 KB |
|
|
|
xscreensaver.spec |
1.1.12 | 12 years ago | Bazaar Package Importer | Import upstream version 5.14 | 5.9 KB |
|
|