ubuntu/+source/xscreensaver:applied/ubuntu/hardy

Last commit made on 2008-04-11
Get this branch:
git clone -b applied/ubuntu/hardy https://git.launchpad.net/ubuntu/+source/xscreensaver
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
applied/ubuntu/hardy
Repository:
lp:ubuntu/+source/xscreensaver

Recent commits

cf6ff1e... by Tormod Volden on 2008-03-06

Import patches-applied version 5.04-4ubuntu1 to applied/ubuntu/hardy

Imported using git-ubuntu import.

Changelog parent: a4e1a3a3b386adadb430c9ceddc60286a1086670
Unapplied parent: bb7c2198bf5dcf4f8a47fd695a1068560a09a0c5

New changelog entries:
  * Merge from debian unstable, remaining changes: (LP: #201626)
    - debian/control: add Build-Depends on ubuntu-artwork
    - debian/rules: use /usr/share/backgrounds
    - 82_ubuntu-texturl-fridge.patch: use Ubuntu fridge for rss
    - 91_ubuntu-no-pam-conf: don't ship pam.conf
    - 70_ubuntu-xscreensaver-desktop.patch: name the xscreensaver desktop
      file for what it is to not confuse it with gnome-screensaver
    - debian/rules: don't hide the xscreensaver desktop icon if the
      user insists on installing xscreensaver (LP: #86416)
    - 54_drivers_demogtk.patch: Patching a compile failure with
      GTK+ in Hardy
    - 28_rotate.patch: Add in the gdk pixbuf function to rotate JPEGs and
      TIFFs so that they're the right direction
    - debian/control: Increasing the GTK+ version to 2.12 for the patch
      28_rotate.patch
    - glslideshow.desktop: Changing so that it shows only one image, one
      time and no extra black on the edges.
  * Fixed upstream:
    - install xscreensaver-properties.desktop to right place (LP: #201481)
    - remove planetary-gears screensaver (LP: #196360)
  * debian/control: Add replaces/conflicts to fix upgrades (Closes: #468899)
  * corrected previous changelog entry on xscreensaver-gl-extra
  [ Tormod Volden ]
  * (From Ubuntu) Include .desktop files for hacks (Closes: #410095)
  * debian/xscreensaver-data.files: Skip .desktop file for popsquares
    for now until conflict is sorted out with gnome-screensaver that
    also ships it
  * dropped planetary_gears.desktop (gears goes planetary randomly
    and has no command option for it)
  * 60_add-ant-hack.patch: restore "ant" (disabled upstream in 4.23)
  * Add .desktop description for "ant"
  * (From Ubuntu) Split xscreensaver package into:
    - xscreensaver (core backend without hacks)
    - xscreensaver-data (standard hacks)
    - xscreensaver-data-extra (hacks not installed by default)
  * (From Ubuntu) Split xscreensaver-gl package into:
    - xscreensaver-gl (standard GL hacks)
    - xscreensaver-gl-extra (GL hacks not installed by default)
  * 70_fade_oversleep.patch: don't hang on resume (Closes: #454523)
  * 71_endgame_whiter_colour.patch: better contrast (Closes: #463345)
  [ Jose Luis Rivas ]
  * debian/xscreensaver-gl.files: Deleted interplanetary-gears.desktop since
  it's not shipped.

bb7c219... by Tormod Volden on 2008-03-06

Import patches-unapplied version 5.04-4ubuntu1 to ubuntu/hardy

Imported using git-ubuntu import.

Changelog parent: b20f2d9ab5574a2c7b89be96d2b3936eeba6147c

New changelog entries:
  * Merge from debian unstable, remaining changes: (LP: #201626)
    - debian/control: add Build-Depends on ubuntu-artwork
    - debian/rules: use /usr/share/backgrounds
    - 82_ubuntu-texturl-fridge.patch: use Ubuntu fridge for rss
    - 91_ubuntu-no-pam-conf: don't ship pam.conf
    - 70_ubuntu-xscreensaver-desktop.patch: name the xscreensaver desktop
      file for what it is to not confuse it with gnome-screensaver
    - debian/rules: don't hide the xscreensaver desktop icon if the
      user insists on installing xscreensaver (LP: #86416)
    - 54_drivers_demogtk.patch: Patching a compile failure with
      GTK+ in Hardy
    - 28_rotate.patch: Add in the gdk pixbuf function to rotate JPEGs and
      TIFFs so that they're the right direction
    - debian/control: Increasing the GTK+ version to 2.12 for the patch
      28_rotate.patch
    - glslideshow.desktop: Changing so that it shows only one image, one
      time and no extra black on the edges.
  * Fixed upstream:
    - install xscreensaver-properties.desktop to right place (LP: #201481)
    - remove planetary-gears screensaver (LP: #196360)
  * debian/control: Add replaces/conflicts to fix upgrades (Closes: #468899)
  * corrected previous changelog entry on xscreensaver-gl-extra
  [ Tormod Volden ]
  * (From Ubuntu) Include .desktop files for hacks (Closes: #410095)
  * debian/xscreensaver-data.files: Skip .desktop file for popsquares
    for now until conflict is sorted out with gnome-screensaver that
    also ships it
  * dropped planetary_gears.desktop (gears goes planetary randomly
    and has no command option for it)
  * 60_add-ant-hack.patch: restore "ant" (disabled upstream in 4.23)
  * Add .desktop description for "ant"
  * (From Ubuntu) Split xscreensaver package into:
    - xscreensaver (core backend without hacks)
    - xscreensaver-data (standard hacks)
    - xscreensaver-data-extra (hacks not installed by default)
  * (From Ubuntu) Split xscreensaver-gl package into:
    - xscreensaver-gl (standard GL hacks)
    - xscreensaver-gl-extra (GL hacks not installed by default)
  * 70_fade_oversleep.patch: don't hang on resume (Closes: #454523)
  * 71_endgame_whiter_colour.patch: better contrast (Closes: #463345)
  [ Jose Luis Rivas ]
  * debian/xscreensaver-gl.files: Deleted interplanetary-gears.desktop since
  it's not shipped.

a4e1a3a... by Ted Gould on 2008-01-23

Import patches-applied version 5.04-2ubuntu2 to applied/ubuntu/hardy

Imported using git-ubuntu import.

Changelog parent: b6a3429296c3fa041b275fe1d9ce32bcb0052ae4
Unapplied parent: b20f2d9ab5574a2c7b89be96d2b3936eeba6147c

New changelog entries:
  * 54_drivers_demogtk.patch: Patching a compile failure with
     GTK+ in Hardy
  * 28_rotate.patch: Add in the gdk pixbuf function to rotate JPEGs and
     TIFFs so that they're the right direction
  * debian/control: Increasing the GTK+ version to 2.12 for the patch
     28_rotate.patch
  * glslideshow.desktop: Changing so that it shows only one image, one
     time and no extra black on the edges.
  * Merge from debian unstable, remaining changes: (LP: #177126)
    - Split xscreensaver into xscreensaver, xscreensaver-data
      (hacks we ship), xscreensaver-data-extra (hacks in universe).
      Split out GL hacks for universe to xscreensaver-gl-extra
    - create and install .desktop files for gnome-screensaver
    - debian/control: add Build-Depends on ubuntu-artwork
    - debian/rules: use /usr/share/backgrounds
    - 60_ubuntu-add-ant-hack.patch: bring back ant hack
    - 62_ubuntu-texturl-fridge.patch: use Ubuntu fridge for rss
    - 65_ubuntu-no-pam-conf: don't ship pam.conf
  * 70_ubuntu-xscreensaver-desktop.patch: name the xscreensaver desktop
    file for what it is to not confuse it with gnome-screensaver
  * debian/control: warn about gnome-screensaver conflict in
    xscreensaver package description (LP: #74727)
  * debian/rules: don't hide the xscreensaver desktop icon if the
    user insists on installing xscreensaver (LP: #86416)
  * 60_ubuntu-add-ant-hack.patch refreshed to include "ant" in
    application defaults (LP: #160669)
  * Fixed upstream: glhanoi assertion failure (LP: #71795)
  [Tormod Volden]
  * debian/rules:
   + Moved POT generation from clean to build.
   + Now xscreensaver.svg is copied from `debian/` at build time.
  * po/xscreensaver.pot:
   + Is now deleted since it is autogenerated.
  * debian/control:
   + Added libxss-dev, libxtst-dev, libxxf86misc-dev and x-dev as
   build depends.
   + Added quilt and removed dpatch from build-depends.
  * debian/patches/00_maindiffwithorig.patch got split up in:
    - 20_hacks_Makefile.patch: add xpm libs for "maze" hack
    - 22_hacks_barcode.patch: make family-friendly
    - 23_hacks_glx_glsnake.patch: make family-friendly
    - 30_hacks_xanalogtv.patch: use logo-50-bad.xpm
    - 31_utils_images_logo-50-bad-xpm.patch: less colours
    - 50_driver_screensaver-properties-desktop.patch: use svg icon
  [Jose Luis Rivas]
  * debian/xscreensaver.files:
   + Added m6502 (without manpage at the moment) and abstractile
   hacks.
  * debian/xscreensaver-gl.files:
   + Added moebiusgears and lockward hacks. (Closes: #454601)
  * debian/control:
   + Added Tormod Volden as Uploader.
   + Updated to 3.7.3 Standards-Version, no modification needed.
  * debian/xscreensaver.install:
   + Now xscreensaver.svg is in `debian/`.

b20f2d9... by Ted Gould on 2008-01-23

Import patches-unapplied version 5.04-2ubuntu2 to ubuntu/hardy

Imported using git-ubuntu import.

Changelog parent: 2b7dcd32f9a37e2e93cf99c64f28ba60b4db384e

New changelog entries:
  * 54_drivers_demogtk.patch: Patching a compile failure with
     GTK+ in Hardy
  * 28_rotate.patch: Add in the gdk pixbuf function to rotate JPEGs and
     TIFFs so that they're the right direction
  * debian/control: Increasing the GTK+ version to 2.12 for the patch
     28_rotate.patch
  * glslideshow.desktop: Changing so that it shows only one image, one
     time and no extra black on the edges.
  * Merge from debian unstable, remaining changes: (LP: #177126)
    - Split xscreensaver into xscreensaver, xscreensaver-data
      (hacks we ship), xscreensaver-data-extra (hacks in universe).
      Split out GL hacks for universe to xscreensaver-gl-extra
    - create and install .desktop files for gnome-screensaver
    - debian/control: add Build-Depends on ubuntu-artwork
    - debian/rules: use /usr/share/backgrounds
    - 60_ubuntu-add-ant-hack.patch: bring back ant hack
    - 62_ubuntu-texturl-fridge.patch: use Ubuntu fridge for rss
    - 65_ubuntu-no-pam-conf: don't ship pam.conf
  * 70_ubuntu-xscreensaver-desktop.patch: name the xscreensaver desktop
    file for what it is to not confuse it with gnome-screensaver
  * debian/control: warn about gnome-screensaver conflict in
    xscreensaver package description (LP: #74727)
  * debian/rules: don't hide the xscreensaver desktop icon if the
    user insists on installing xscreensaver (LP: #86416)
  * 60_ubuntu-add-ant-hack.patch refreshed to include "ant" in
    application defaults (LP: #160669)
  * Fixed upstream: glhanoi assertion failure (LP: #71795)
  [Tormod Volden]
  * debian/rules:
   + Moved POT generation from clean to build.
   + Now xscreensaver.svg is copied from `debian/` at build time.
  * po/xscreensaver.pot:
   + Is now deleted since it is autogenerated.
  * debian/control:
   + Added libxss-dev, libxtst-dev, libxxf86misc-dev and x-dev as
   build depends.
   + Added quilt and removed dpatch from build-depends.
  * debian/patches/00_maindiffwithorig.patch got split up in:
    - 20_hacks_Makefile.patch: add xpm libs for "maze" hack
    - 22_hacks_barcode.patch: make family-friendly
    - 23_hacks_glx_glsnake.patch: make family-friendly
    - 30_hacks_xanalogtv.patch: use logo-50-bad.xpm
    - 31_utils_images_logo-50-bad-xpm.patch: less colours
    - 50_driver_screensaver-properties-desktop.patch: use svg icon
  [Jose Luis Rivas]
  * debian/xscreensaver.files:
   + Added m6502 (without manpage at the moment) and abstractile
   hacks.
  * debian/xscreensaver-gl.files:
   + Added moebiusgears and lockward hacks. (Closes: #454601)
  * debian/control:
   + Added Tormod Volden as Uploader.
   + Updated to 3.7.3 Standards-Version, no modification needed.
  * debian/xscreensaver.install:
   + Now xscreensaver.svg is in `debian/`.

b6a3429... by Matthias Klose on 2008-01-31

Import patches-applied version 5.04-1ubuntu2 to applied/ubuntu/hardy

Imported using git-ubuntu import.

Changelog parent: 0bb8fc9adba30e3222d89ec9e5750b5e450ff428
Unapplied parent: 2b7dcd32f9a37e2e93cf99c64f28ba60b4db384e

New changelog entries:
  * Fix build failure with new glib2.0.

2b7dcd3... by Matthias Klose on 2008-01-31

Import patches-unapplied version 5.04-1ubuntu2 to ubuntu/hardy

Imported using git-ubuntu import.

Changelog parent: 703b6358b5c7080a3a11eb1427437d1c0730d6c5

New changelog entries:
  * Fix build failure with new glib2.0.

0bb8fc9... by Oliver Grawert on 2007-12-06

Import patches-applied version 5.04-1ubuntu1 to applied/ubuntu/hardy

Imported using git-ubuntu import.

Changelog parent: aab030eaf3d895019a91269bb69b3f67a59682de
Unapplied parent: 703b6358b5c7080a3a11eb1427437d1c0730d6c5

New changelog entries:
  * Merge from debian unstable, remaining changes:
    - split xscreensaver into xscreensaver, xscreensaver-data (hacks we ship),
      xscreensaver-data-extra (hacks in universe). split out gl hacks for
      universe to xscreensaver-gl-extra
    - use fridge for rss screensavers
    - create and install .desktop files for gnome-screensaver
  * New upstream release
  * David Moreno Garza (damog) removed from Uploaders field.
  * Fixed authentication bypass (CVE-2007-5585) by upstream (closes: #448157)
  * Non-maintainer upload by the testing-security team
  * Include upstream patch to fix crash with gl screensavers, which
    leads to an authentication bypass (Closes: #448157)
    Fixes: CVE-2007-5585
  * Added `gdm' to the Build-Depends field since is needed to build with
  gdmflexiserver support. (Closes: #436010)
  * The config problems doesn't exists anymore since there's now the original
  XML file, so no changes needed. (Closes: #367791, #405266).
  * debian/rules:
   + Added a line that adds "NoDisplay=true" to
   gnome-screensaver-properties.desktop. (Closes: #435446)
  * debian/rules, debian/xscreensaver.files, debian/xscreensaver-gl.files:
   + Adding again the `x` at the end of each manpage.
   (Closes: #435035)
  * New maintainer and uploader (Closes: #428813, #428798)
  * New upstream version packaged (Closes: #407886)
  * No error during authentication (Closes: #180063)
  * No more waiting until mouse moves for starting. (Closes: #257092)
  * Flurry now runs OK. (Closes: #296552)
  * No more crashes during exit of `xscreensaver' (Closes: #273180)
  * Xscreensaver has changed a lot how works with the pam_module and it seems
  as does not ask for password anymore if is not required. (Closes: #303368)
  * XScreensaver turns off both screens if is used with Dual-head on laptops
  tested on a HP and a Siragon notebook. (Closes: #337100)
  * Currently XScreensaver request password everytime, even if Power management
  is enabled. (Closes: #330971)
  * XScreensaver does not longer ignores settings on ~/.xscreensaver anymore
  and modifying settings with `xscreensaver-demo' will save your settings as
  should and will not be restarted. (Closes: #316931)
  * xscreensaver does properly requests passwords and proccess them as should
  if that's the case. (Closes: #368600)
  * Now images are rotated as should when using carousel with the EXIF data of
  each JPEG archive. (Closes: #375488)
  * Fontglide is running OK without fonts issues. (Closes: #393140)
  * The apple2 hack was tested and there's no problem. (Closes: #423560)
  * Webcollage renders properly and add images to the collage without emptying
  the screen (tested with nv, nvidia and vesa drivers). (Closes: #317383)
  * Added the `unlock' button to login box. (Closes: #326733)
  * debian/control:
    + Deleted `Uploaders' field.
    + Changed `Maintainer' name and email.
    + Replaced build-depend on `xlibs-data' with `xbitmaps'. (Closes: #419022)
    + Updated `Standard-Versions' to 3.7.2, no changes needed.
    + Added Build-Depend on `dpatch'.
    + Updated `xscreensaver-gl' description with `X.Org' instead of `XFree'.
    + Moved `netpbm' to Depends from Suggests of xscreensaver since it's used by
    packages on `xscreensaver'. (Closes: #376982)
  * debian/rules:
    + Included `dpatch.make' for patching.
    + Changed targets to fits `dpatch' functioning.
    + Changed the way as config.{sub|guess} is deleted, now is moved so isn't
    showed in the final `diff.gz'.
  * debian/xscreensaver.files:
    + Removed line for adding `gnome-screensaver-properties.desktop' since
    GNOME ships their own screensaver and the menu entrie in preferences should
    not be added, users should use the another menu entrie. (Closes: #390672)
    + Added new hack `cwaves'.
    + Removed the `x's at the end of every manpage line.
  * debian/xscreensaver-gl.files:
    + Removed the `x's at the end of every manpage line.
    + Added new hacks: `glcells', `glschool', `topblock' and `voronoi'.
  * debian/changelog:
    + Version created and no data modified, was modified in a NMU (4.23-1.1)
    changed to 4.23-0.1 according to debian dev-reference. (Was lintian
    warning).
    + Double date on version 1.27-1, removed the old one, I left the october
    one since is the most obvious (Was lintian warning).
  * debian/patches:
    + Created!
  * debian/patches/00_maindiffwithorig.patch:
    + Created! This patch was created with the end to avoid editing original
    tarball as was before, instead patch's should been used.

703b635... by Oliver Grawert on 2007-12-06

Import patches-unapplied version 5.04-1ubuntu1 to ubuntu/hardy

Imported using git-ubuntu import.

Changelog parent: 4d474ff2d25eeb7cd150fad000990b863436147f

New changelog entries:
  * Merge from debian unstable, remaining changes:
    - split xscreensaver into xscreensaver, xscreensaver-data (hacks we ship),
      xscreensaver-data-extra (hacks in universe). split out gl hacks for
      universe to xscreensaver-gl-extra
    - use fridge for rss screensavers
    - create and install .desktop files for gnome-screensaver
  * New upstream release
  * David Moreno Garza (damog) removed from Uploaders field.
  * Fixed authentication bypass (CVE-2007-5585) by upstream (closes: #448157)
  * Non-maintainer upload by the testing-security team
  * Include upstream patch to fix crash with gl screensavers, which
    leads to an authentication bypass (Closes: #448157)
    Fixes: CVE-2007-5585
  * Added `gdm' to the Build-Depends field since is needed to build with
  gdmflexiserver support. (Closes: #436010)
  * The config problems doesn't exists anymore since there's now the original
  XML file, so no changes needed. (Closes: #367791, #405266).
  * debian/rules:
   + Added a line that adds "NoDisplay=true" to
   gnome-screensaver-properties.desktop. (Closes: #435446)
  * debian/rules, debian/xscreensaver.files, debian/xscreensaver-gl.files:
   + Adding again the `x` at the end of each manpage.
   (Closes: #435035)
  * New maintainer and uploader (Closes: #428813, #428798)
  * New upstream version packaged (Closes: #407886)
  * No error during authentication (Closes: #180063)
  * No more waiting until mouse moves for starting. (Closes: #257092)
  * Flurry now runs OK. (Closes: #296552)
  * No more crashes during exit of `xscreensaver' (Closes: #273180)
  * Xscreensaver has changed a lot how works with the pam_module and it seems
  as does not ask for password anymore if is not required. (Closes: #303368)
  * XScreensaver turns off both screens if is used with Dual-head on laptops
  tested on a HP and a Siragon notebook. (Closes: #337100)
  * Currently XScreensaver request password everytime, even if Power management
  is enabled. (Closes: #330971)
  * XScreensaver does not longer ignores settings on ~/.xscreensaver anymore
  and modifying settings with `xscreensaver-demo' will save your settings as
  should and will not be restarted. (Closes: #316931)
  * xscreensaver does properly requests passwords and proccess them as should
  if that's the case. (Closes: #368600)
  * Now images are rotated as should when using carousel with the EXIF data of
  each JPEG archive. (Closes: #375488)
  * Fontglide is running OK without fonts issues. (Closes: #393140)
  * The apple2 hack was tested and there's no problem. (Closes: #423560)
  * Webcollage renders properly and add images to the collage without emptying
  the screen (tested with nv, nvidia and vesa drivers). (Closes: #317383)
  * Added the `unlock' button to login box. (Closes: #326733)
  * debian/control:
    + Deleted `Uploaders' field.
    + Changed `Maintainer' name and email.
    + Replaced build-depend on `xlibs-data' with `xbitmaps'. (Closes: #419022)
    + Updated `Standard-Versions' to 3.7.2, no changes needed.
    + Added Build-Depend on `dpatch'.
    + Updated `xscreensaver-gl' description with `X.Org' instead of `XFree'.
    + Moved `netpbm' to Depends from Suggests of xscreensaver since it's used by
    packages on `xscreensaver'. (Closes: #376982)
  * debian/rules:
    + Included `dpatch.make' for patching.
    + Changed targets to fits `dpatch' functioning.
    + Changed the way as config.{sub|guess} is deleted, now is moved so isn't
    showed in the final `diff.gz'.
  * debian/xscreensaver.files:
    + Removed line for adding `gnome-screensaver-properties.desktop' since
    GNOME ships their own screensaver and the menu entrie in preferences should
    not be added, users should use the another menu entrie. (Closes: #390672)
    + Added new hack `cwaves'.
    + Removed the `x's at the end of every manpage line.
  * debian/xscreensaver-gl.files:
    + Removed the `x's at the end of every manpage line.
    + Added new hacks: `glcells', `glschool', `topblock' and `voronoi'.
  * debian/changelog:
    + Version created and no data modified, was modified in a NMU (4.23-1.1)
    changed to 4.23-0.1 according to debian dev-reference. (Was lintian
    warning).
    + Double date on version 1.27-1, removed the old one, I left the october
    one since is the most obvious (Was lintian warning).
  * debian/patches:
    + Created!
  * debian/patches/00_maindiffwithorig.patch:
    + Created! This patch was created with the end to avoid editing original
    tarball as was before, instead patch's should been used.

aab030e... by Kees Cook on 2007-06-11

Import patches-applied version 4.24-5ubuntu3 to applied/ubuntu/gutsy

Imported using git-ubuntu import.

Changelog parent: d0ed08e9f3fa605b8543461275be701b78d004eb
Unapplied parent: 4d474ff2d25eeb7cd150fad000990b863436147f

New changelog entries:
  * SECURITY UPDATE: password bypass when using network authentication.
  * driver/lock.c: upstream fixes applied inline.
  * References
    CVE-2007-1859

4d474ff... by Kees Cook on 2007-06-11

Import patches-unapplied version 4.24-5ubuntu3 to ubuntu/gutsy

Imported using git-ubuntu import.

Changelog parent: eb02f70772c880f3cc55b03bc580e3594145c8ff

New changelog entries:
  * SECURITY UPDATE: password bypass when using network authentication.
  * driver/lock.c: upstream fixes applied inline.
  * References
    CVE-2007-1859