~ubuntu-branches/ubuntu/trusty/xscreensaver/trusty

« back to all changes in this revision

Viewing changes to debian/patches/series

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2009-11-30 13:33:13 UTC
  • mfrom: (1.1.8 upstream) (2.1.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091130133313-3b5nz2e7hvbb8h3l
Tags: 5.10-3ubuntu1
* Merge with Debian unstable, remaining changes: (LP: #489062)
  - debian/control: add Build-Depends on ubuntu-artwork
  - debian/rules: use /usr/share/backgrounds
  - debian/control: Move xli | xloadimage recommends to suggests
  - debian/split-hacks.config: Use different set of default hacks to Debian
  - debian/source_xscreensaver.py: Add apport hook
  - debian/patches/53_XScreenSaver.ad.in.patch: Use Ubuntu branding

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
20_hacks_Makefile.patch
 
1
10_upstream_skip_retired_hacks.patch
 
2
11_upstream_flurry_man_name.patch
 
3
20_hacks_man_section.patch
 
4
20_hacks_maze_xpm_libs.patch
 
5
20_skip_install-pam.patch
2
6
21_driver_xscreensaver-getimage-video
3
7
22_hacks_barcode.patch
4
8
23_hacks_glx_glsnake.patch
5
 
24_hacks_xsublim_enable.patch
6
 
25_xsublim_missing_man_page.patch
7
 
 
8
 
28_rotate.patch
9
9
 
10
10
# These two go together
11
11
30_hacks_xanalogtv.patch
12
12
31_utils_images_logo-50-bad-xpm.patch
13
13
 
14
 
# Cosmetic, more modern style
15
 
#40_utils_images_logo-50-xpm.patch
16
 
#41_utils_images_logo-180-xpm.patch
17
 
 
18
14
50_driver_screensaver-properties-desktop.patch
19
 
 
20
 
# Needs clean-up before it will apply
21
 
#52_driver_XScreenSaver.ad.in
22
15
53_XScreenSaver.ad.in.patch
23
16
 
24
 
# overrule upstream 4.23 removal
25
 
#60_add-ant-hack.patch
26
 
 
27
 
# Fix random crashing in Phosphor
28
 
61_fix-phosphor-segfault.patch
29
 
 
30
 
# Maybe move upstream
31
 
91_ubuntu-no-pam-conf.patch
 
17
80_Makefile_in-clean-fix.patch