xsf-tools: Changes to 'master'
mrconfig| 239 mrconfig-update | 38 mrconfig.README | 63 ++ mrconfig.head | 19 4 files changed, 359 insertions(+) New commits: commit ae470a2cfebcab05d2d33c8de2012cde8e398839 Author: Cyril Brulebois Date: Thu Nov 18 02:43:59 2010 +0100 Adapt syntax for better output through markdown. diff --git a/mrconfig.README b/mrconfig.README index 586cc8c..bc8e24f 100644 --- a/mrconfig.README +++ b/mrconfig.README @@ -2,7 +2,7 @@ ## Foreword -Although it's not required to maintain any package, "mr" is recommended so +Although it's not required to maintain any package, `mr` is recommended so that one can clone all packages at once. It also helps keeping up-to-date, by fetching everything through a single command. @@ -10,7 +10,7 @@ by fetching everything through a single command. ## Bootstrap Go to the directory where you want to clone all XSF packages (let's -call it ~/debian-x) and run this: +call it `~/debian-x`) and run this: # Get XSF tools: git clone git://git.debian.org/pkg-xorg/debian/xsf-tools.git debian/xsf-tools.git @@ -19,45 +19,45 @@ call it ~/debian-x) and run this: # Needed to get custom commands to work: echo $(pwd)/.mrconfig >> ~/.mrtrust -You're now ready to fetch everything. By calling "mr up", if a local +You're now ready to fetch everything. By calling `mr up`, if a local repository is missing, cloning happens, fetching otherwise: mr -c .mrconfig up -To speed things up, you can pass --jobs to fetch in parallel: +To speed things up, you can pass `--jobs` to fetch in parallel: mr -c .mrconfig --jobs 4 up ## Further configuration -To avoid passing "-c .mrconfig" every time, you can add the following stanza -to ~/.mrconfig: +To avoid passing `-c .mrconfig` every time, you can add the following stanza +to `~/.mrconfig`: [~/debian-x] chain = true update = echo "Updating XSF packages." -It's now sufficient to call "mr up" in any directory in the ~/debian-x +It's now sufficient to call `mr up` in any directory in the `~/debian-x` directory to update all repositories the former contains. ## But I want to commit! By default all repositories are cloned anonymously through the git protocol. -To be able to push, you can just perform an s,git://,ssh://, substitution in -the appropriate .git/config file. An alias is available in our mrconfig file: +To be able to push, you can just perform an `s,git://,ssh://`, substitution in +the appropriate `.git/config` file. An alias is available in our mrconfig file: mr git2ssh -It should only fail on the top-level directory (in our case: ~/debian-x) for -which the alias is not defined (in ~/.mrconfig), but since that should only be -one-shot, that's probably not a big deal. +It should only fail on the top-level directory (in our case: `~/debian-x`) for +which the alias is not defined (in `~/.mrconfig`), but since that should only +be one-shot, that's probably not a big deal. ## I want to update that file! -The mrconfig-update script is what you want. As long as you have an -account on git.debian.org, it's going to run a find command there to -fetch an updated list of all repositories, and generate an updated -mrconfig file accordingly, using mrconfig.head as header. +The `mrconfig-update` script is what you want. As long as you have an account +on `git.debian.org`, it's going to run a find command there to fetch an +updated list of all repositories, and generate an updated mrconfig file +accordingly, using `mrconfig.head` as header. commit 0c14b8d1fecb78773e742d276488382bd0d9b1bf Author: Cyril Brulebois Date: Thu Nov 18 02:28:26 2010 +0100 Add some words about mrconfig-update. diff --git a/mrconfig.README b/mrconfig.README index 217b99c..586cc8c 100644 --- a/mrconfig.README +++ b/mrconfig.README @@ -53,3 +53,11 @@ the appropriate .git/config file. An alias is available in our mrconfig file: It should only fail on the top-level directory (in our case: ~/debian-x) for which the alias is not defined (in ~/.mrconfig), but since that should only be one-shot, that's probably not a big deal. + + +## I want to update that file! + +The mrconfig-update script is what you want. As long as you have an +account on git.debian.org, it's going to run a find command there to +fetch an updated list of all repositories, and generate an updated +mrconfig file accordingly, using mrconfig.head as header. commit a44df22ff1f8040c6c07a3d4d43aa910838e3dfb Author: Cyril Brulebois Date: Thu Nov 18 02:22:34 2010 +0100 Avoid duplicating hostname and home directory. diff --git a/mrconfig-update b/mrconfig-update index b9c6d9e..f03d638 100755 --- a/mrconfig-update +++ b/mrconfig-update @@ -11,7 +11,10 @@ tools_repo=debian/xsf-tools.git mrconfig=mrconfig # Some blurb to make everything work: -cp mrconfig.head $mrconfig +sed \ + -e "s,@@host@@,$host,g" \ + -e "s,@@
Bug#603808: xterm: reverseVideo resource inverts reverse video logic instead of setting the default
On Wed, 17 Nov 2010, Sascha Silbe wrote: Package: xterm Version: 261-1 Severity: normal The reverseVideo X resource and the +rv/-rv command line options affect the reverse video feature in strange ways. It seems to get inverted rather than set, though even that doesn't explain why there is a mark for the menu option if the reverseVideo resource is true and no CLI option is given, but no mark in all other cases. The interaction is strange because the +rv/-rv options are processed in the X libraries, and xterm can only infer what's happened. I'll review this to see if I can improve the manner in which the menu-checkmark is set, etc. - that seems to be the intent of the report. thanks -- Thomas E. Dickey http://invisible-island.net ftp://invisible-island.net -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20101118064515.x15...@mail101.his.com
xsf-tools: Changes to 'master'
mrconfig.README |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5e0533734c07f049445bb6551aff3354909179c7 Author: Cyril Brulebois Date: Thu Nov 18 13:28:02 2010 +0100 Fix typo. diff --git a/mrconfig.README b/mrconfig.README index bc8e24f..2508856 100644 --- a/mrconfig.README +++ b/mrconfig.README @@ -34,7 +34,7 @@ To speed things up, you can pass `--jobs` to fetch in parallel: To avoid passing `-c .mrconfig` every time, you can add the following stanza to `~/.mrconfig`: -[~/debian-x] +[debian-x] chain = true update = echo "Updating XSF packages." -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pj3ay-000206...@alioth.debian.org
Bug#600405: xserver-xorg-video-intel: changing to a non-native mode dims backlight
On Wed, Nov 17, 2010 at 18:25:32 +, Simon McVittie wrote: > tags 600405 + fixed-upstream > thanks > > On Sun, 17 Oct 2010 at 13:51:56 +0100, Simon McVittie wrote: > > It turns out this can be worked around by reverting part of the "+shadow" > > series. On the upstream bug, Chris Wilson thinks the correct fix is to > > improve > > backlight setting in the kernel, though. > > There is now a different upstream fix for this in master > (commit 33c08882c0d from Keith Packard) which also works for me. I don't know > whether you'd prefer to use that one, or the reversion I suggested. > > http://git.debian.org/?p=users/smcv/xserver-xorg-video-intel.git > (the upstream fix applied as a patch instead) certainly works with my current > kernel, which is 2.6.32-27 for amd64. > I'd committed the revert on monday: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git;a=commitdiff;h=2e37d6f4183f695386ded784720870a9598d3825 I don't know of a bug number the initial patch was fixing, so I'd go with the revert instead of the cherry-pick. We were waiting for 2.13.0 to move to testing (which has now happened), I guess we'll upload soonish. The next upload will also probably disable shadow on 865G (which is apparently less broken than 845 and 855), and have some version of http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=455f2939a661764ebb8d1747d44e16a0a8937808 (I had a simpler patch to do this which just called pci_device_has_kernel_driver() from intel_pci_probe(); since we're autoloading i915 from udev we don't need to modprobe it from X.) Let me know if you'd like to work on getting that ready so I can cross it out of my todo list ;) Cheers, Julien signature.asc Description: Digital signature
xsf-tools: Changes to 'master'
mrconfig| 11 ++- mrconfig.README |2 +- mrconfig.head |4 +++- 3 files changed, 10 insertions(+), 7 deletions(-) New commits: commit 482cd01fc073c00bf444d477dd138f849912f3ad Author: Cyril Brulebois Date: Thu Nov 18 17:00:33 2010 +0100 Update git URL so that git2ssh works for this repository as well. diff --git a/mrconfig.README b/mrconfig.README index 2508856..48e8c8e 100644 --- a/mrconfig.README +++ b/mrconfig.README @@ -13,7 +13,7 @@ Go to the directory where you want to clone all XSF packages (let's call it `~/debian-x`) and run this: # Get XSF tools: -git clone git://git.debian.org/pkg-xorg/debian/xsf-tools.git debian/xsf-tools.git +git clone git://git.debian.org/git/pkg-xorg/debian/xsf-tools.git debian/xsf-tools.git # Make the mrconfig file visible from the top-level: ln -s debian/xsf-tools.git/mrconfig .mrconfig # Needed to get custom commands to work: commit 916a0a102eb10ad429d61b69b76ee1c982c580db Author: Cyril Brulebois Date: Thu Nov 18 16:55:01 2010 +0100 Add remote_add_upstream alias. diff --git a/mrconfig b/mrconfig index e84d150..d5850d7 100644 --- a/mrconfig +++ b/mrconfig @@ -16,7 +16,9 @@ update = git2ssh = sed -i 's,git://git.debian.org,ssh://git.debian.org,' $MR_REPO/.git/config - +# Make it easy to run this command on all repositories: +remote_add_upstream = + xsf-remote-add-upstream [app/compiz.git] [app/grandr.git] [app/intel-gen4asm.git] diff --git a/mrconfig.head b/mrconfig.head index 8456ab0..ebee71b 100644 --- a/mrconfig.head +++ b/mrconfig.head @@ -16,4 +16,6 @@ update = git2ssh = sed -i 's,git://@@host@@,ssh://@@host@@,' $MR_REPO/.git/config - +# Make it easy to run this command on all repositories: +remote_add_upstream = + xsf-remote-add-upstream commit d776bc65820793901fb1ea4ddd4b73e18b110df8 Author: Cyril Brulebois Date: Thu Nov 18 14:39:01 2010 +0100 Update repositories. + Move doc-hackers.git and git-migration.git under debian/. + Move lib/drm-snapshot.git under attic/. + Remove empty pkg-xorg.git repository. diff --git a/mrconfig b/mrconfig index b5f6f2b..e84d150 100644 --- a/mrconfig +++ b/mrconfig @@ -71,6 +71,7 @@ git2ssh = #[attic/driver/xserver-xorg-video-sunbw2.git] #[attic/driver/xserver-xorg-video-vga.git] #[attic/driver/xserver-xorg-video-via.git] +#[attic/lib/drm-snapshot.git] #[attic/lib/libxevie.git] #[attic/lib/libxfontcache.git] #[attic/lib/libxkbui.git] @@ -93,9 +94,10 @@ git2ssh = [data/xbitmaps.git] [data/xcursor-themes.git] [data/xkb-data.git] +[debian/doc-hackers.git] +[debian/git-migration.git] [debian/xorg.git] [debian/xsf-tools.git] -[doc-hackers.git] [doc/xorg-docs.git] [doc/xorg-sgml-doctools.git] [driver/xserver-xorg-input-acecad.git] @@ -166,8 +168,6 @@ git2ssh = [font/xfonts-encodings.git] [font/xfonts-scalable.git] [font/xfonts-utils.git] -[git-migration.git] -[lib/drm-snapshot.git] [lib/libdmx.git] [lib/libdrm.git] [lib/libfontenc.git] @@ -207,7 +207,6 @@ git2ssh = [lib/pixman.git] [lib/xft.git] [lib/xtrans.git] -[pkg-xorg.git] [proto/x11proto-bigreqs.git] [proto/x11proto-composite.git] [proto/x11proto-core.git] -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pj6qu-0006y1...@alioth.debian.org
xorg-server: Changes to 'upstream-unstable'
Xi/exevents.c |4 ---
Xi/extinit.c |3 +-
Xi/xiproperty.c|9 +++
Xi/xiproperty.h|3 ++
dix/devices.c |4 +--
dix/events.c | 52 +
dix/getevents.c|2 -
dix/main.c |4 ---
hw/xfree86/common/xf86Helper.c |7 +
hw/xfree86/ddc/ddc.c |4 ---
hw/xfree86/modes/xf86Crtc.c|4 +--
hw/xfree86/modes/xf86Cursors.c |9 ---
include/eventstr.h |2 -
os/io.c| 27 ++---
os/osdep.h |1
randr/rrtransform.c| 28 +++---
xkb/xkbUtils.c | 41 ++--
17 files changed, 114 insertions(+), 90 deletions(-)
New commits:
commit c9bca39848add875a76cf2434aabbadb97ddd721
Author: Peter Hutterer
Date: Wed Jun 9 17:10:57 2010 +1000
Xi: move property reset from extension shutdown to init.
If any part of the stack calls XIGetKnownProperty during device shutdown
the property is re-initialized before the server generation resets, leaving
the value invalid again.
Move the reset to the extension init which happens before input devices are
initialized before the first property is requested.
Signed-off-by: Peter Hutterer
Reviewed-by: Julien Cristau
(cherry picked from commit 5cd11d2356d153840f1b429bdb8284367f8dc468)
diff --git a/Xi/extinit.c b/Xi/extinit.c
index d0fd2f6..daa79f6 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -1123,8 +1123,6 @@ RestoreExtensionEvents(void)
static void
IResetProc(ExtensionEntry * unused)
{
-XIResetProperties();
-
ReplySwapVector[IReqCode] = ReplyNotSwappd;
EventSwapVector[DeviceValuator] = NotImplemented;
EventSwapVector[DeviceKeyPress] = NotImplemented;
@@ -1303,6 +1301,8 @@ XInputExtensionInit(void)
inputInfo.all_devices = &xi_all_devices;
inputInfo.all_master_devices = &xi_all_master_devices;
+
+ XIResetProperties();
} else {
FatalError("IExtensionInit: AddExtensions failed\n");
}
commit 266dc682f623a2aca6654c42164a8d8b9362c53b
Author: Peter Hutterer
Date: Fri May 7 16:22:12 2010 +1000
Xi: reset the known properties at the end of the server generation.
Properties allocated through XIGetKnownProperty() aren't reset on the second
server generation but keep the old value. As a result, wrong Atoms are
supplied to the driver, resulting in potential data corruption or weird
error message.
Reproducible by running "xlsatom | grep FLOAT" twice on a plain X server.
The second X server generation won't have the FLOAT atom defined anymore,
despite the users of this atom not noticing any errors.
Signed-off-by: Peter Hutterer
Reviewed-by: Julien Cristau
Signed-off-by: Keith Packard
(cherry picked from commit 9802839d35aaf788790f1d0e8300db4693a70096)
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 0c12919..d0fd2f6 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -1123,6 +1123,7 @@ RestoreExtensionEvents(void)
static void
IResetProc(ExtensionEntry * unused)
{
+XIResetProperties();
ReplySwapVector[IReqCode] = ReplyNotSwappd;
EventSwapVector[DeviceValuator] = NotImplemented;
diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index ea66c54..2482171 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -392,6 +392,15 @@ XIGetKnownProperty(char *name)
return 0;
}
+void
+XIResetProperties(void)
+{
+int i;
+
+for (i = 0; i < (sizeof(dev_properties)/sizeof(struct dev_properties));
i++)
+dev_properties[i].type = None;
+}
+
/**
* Convert the given property's value(s) into @nelem_return integer values and
* store them in @buf_return. If @nelem_return is larger than the number of
diff --git a/Xi/xiproperty.h b/Xi/xiproperty.h
index 69b41fa..d8b8863 100644
--- a/Xi/xiproperty.h
+++ b/Xi/xiproperty.h
@@ -62,4 +62,7 @@ void SRepXIListProperties(ClientPtr client, int size,
xXIListPropertiesReply *rep);
void SRepXIGetProperty(ClientPtr client, int size,
xXIGetPropertyReply *rep);
+
+void XIResetProperties(void);
+
#endif /* XIPROPERTY_H */
commit 240e7c50cecdcc0ce6087e141f11f165d828a7e9
Author: Adam Jackson
Date: Mon Oct 18 15:42:54 2010 -0400
ddc: Don't probe for DDC/CI or EEPROM
For whatever reason, some (broken) monitors will crash if you do this.
We're not actually using this information for anything, so let's just
not do it.
Originally reported as http://bugzilla.redhat.com/620333
Reviewed-by: Alex Deucher
Signed-off-by: Adam Jackson
(cherry picked from commit d2064fbb687839c297a851a5d85f32dfbbe4a0d5)
diff --git a/hw/xfree86/ddc/ddc.c b/hw/xfree86/ddc/ddc.c
index 6fad9fb..df46689 100644
--- a/hw/xfree86/
Re: Keeping an upstream git URL somewhere
Hi again, Cyril Brulebois (01/11/2010): > I think it'd be nice to have a reference to the upstream git > repository in all Debian packages we maintain, so that one can just > use “debcheckout $foo $foo.git” to get the Debian packaging, and > then “tiny-shell-wrapper” to perform “git remote add upstream $url”. I called it xsf-remote-add-upstream, and it's available in the newly-born xsf-tools.git repository: http://git.debian.org/?p=pkg-xorg/debian/xsf-tools.git That repository also contains the debgittag script, called xsf-tag (so that one can append this directory to ones $PATH). > I'm not sure we want that in debian/control (even though an X… in > front of it the field could help keeping it out of the Packages and > Sources files); an alternative could be storing that in a comment in > debian/watch. I went for debian/watch*, with this format: #git=git://$url That works with debian/watch.$util in the bundle packages we have. > (I guess we could also provide some .mrconfig file with all debian > packages we maintain, so that one could easily have the same > dir/repo layout locally. I might look at it later on.) I borrowed some of David's ideas as seen in debian/doc-hackers.git, and there's a mrconfig file available in the same repository, along with instructions to bootstrap everything: http://git.debian.org/?p=pkg-xorg/debian/xsf-tools.git;a=blob_plain;f=mrconfig.README In other news, I killed the pkg-xorg.git repository, which was empty, and moved both doc-hackers.git and git-migration.git under the debian/ directory. More documentation to come, but later. Mraw, KiBi. signature.asc Description: Digital signature
xorg-server: Changes to 'debian-unstable'
ChangeLog | 40 ++- Xi/extinit.c |3 Xi/xiproperty.c |9 + Xi/xiproperty.h |3 debian/changelog |9 + debian/patches/07-xfree86-fix-build-with-xv-disabled.diff | 16 +- debian/patches/10-config-libudev-backend.diff | 80 +++--- debian/patches/15-nouveau.diff| 43 +++ debian/patches/19-compresize-fix.diff | 71 +--- debian/patches/22-render-swap-stops.diff | 33 + debian/patches/series |1 11 files changed, 197 insertions(+), 111 deletions(-) New commits: commit a41b8c3439d8acd36e012727e99de912a0976ed9 Author: Julien Cristau Date: Thu Nov 18 17:08:04 2010 +0100 Refresh patches. diff --git a/debian/changelog b/debian/changelog index b0a9bfd..86b943b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xorg-server (2:1.7.7-10) UNRELEASED; urgency=low * render: Fix byteswapping of gradient stops * Cherry-pick from upstream: - Xi: reset the known properties at each server generation + * Refresh patches. -- Julien Cristau Thu, 18 Nov 2010 16:46:32 +0100 diff --git a/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff b/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff index 8281634..1197c9a 100644 --- a/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff +++ b/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff @@ -10,9 +10,9 @@ Subject: [PATCH] xfree86: fix build with xv disabled Index: xorg-server/hw/xfree86/modes/xf86Crtc.c === xorg-server.orig/hw/xfree86/modes/xf86Crtc.c 2010-03-30 13:22:36.0 +0300 -+++ xorg-server/hw/xfree86/modes/xf86Crtc.c2010-03-30 13:22:39.0 +0300 -@@ -3011,6 +3011,7 @@ +--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.c xorg-server/hw/xfree86/modes/xf86Crtc.c +@@ -3013,6 +3013,7 @@ xf86_crtc_box_area(BoxPtr box) return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1); } @@ -20,7 +20,7 @@ Index: xorg-server/hw/xfree86/modes/xf86Crtc.c /* * Return the crtc covering 'box'. If two crtcs cover a portion of * 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc -@@ -3099,6 +3100,7 @@ +@@ -3101,6 +3102,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr return ret; } @@ -30,9 +30,9 @@ Index: xorg-server/hw/xfree86/modes/xf86Crtc.c xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new) Index: xorg-server/hw/xfree86/modes/xf86Crtc.h === xorg-server.orig/hw/xfree86/modes/xf86Crtc.h 2010-03-30 13:22:36.0 +0300 -+++ xorg-server/hw/xfree86/modes/xf86Crtc.h2010-03-30 13:22:39.0 +0300 -@@ -934,6 +934,7 @@ +--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.h xorg-server/hw/xfree86/modes/xf86Crtc.h +@@ -934,6 +934,7 @@ xf86_hide_cursors (ScrnInfoPtr scrn); extern _X_EXPORT void xf86_cursors_fini (ScreenPtr screen); @@ -40,7 +40,7 @@ Index: xorg-server/hw/xfree86/modes/xf86Crtc.h /* * For overlay video, compute the relevant CRTC and * clip video to that. -@@ -952,6 +953,7 @@ +@@ -952,6 +953,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr RegionPtr reg, INT32 width, INT32 height); diff --git a/debian/patches/10-config-libudev-backend.diff b/debian/patches/10-config-libudev-backend.diff index dd3137e..1de16e5 100644 --- a/debian/patches/10-config-libudev-backend.diff +++ b/debian/patches/10-config-libudev-backend.diff @@ -8,8 +8,8 @@ aa91508356f243edc3b11795b1481edcfe0d39c2 --- Index: xorg-server/config/Makefile.am === xorg-server.orig/config/Makefile.am2010-03-30 13:22:30.0 +0300 -+++ xorg-server/config/Makefile.am 2010-03-30 13:55:51.0 +0300 +--- xorg-server.orig/config/Makefile.am xorg-server/config/Makefile.am @@ -1,12 +1,20 @@ -AM_CFLAGS = @DIX_CFLAGS@ +AM_CFLAGS = $(DIX_CFLAGS) @@ -34,7 +34,7 @@ Index: xorg-server/config/Makefile.am if CONFIG_DBUS_API dbusconfigdir = $(sysconfdir)/dbus-1/system.d -@@ -16,7 +24,13 @@ +@@ -16,7 +24,13 @@ libconfig_la_SOURCES += dbus.c endif if CONFIG_HAL @@ -50,8 +50,8 @@ Index: xorg-server/config/Makefile.am EXTRA_DIST = xorg-server.conf x11-input.fdi Index: xorg-server/config/config-backends.h === xorg-server.orig/config/config-backends.h 2010-03-30 13:22:30.0 +0300 -+++ xorg-server/config/config-backends.h 2010-03-30 13:55
libxi: Changes to 'debian-unstable'
debian/changelog
| 17
debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch
| 174 --
debian/patches/series
|1
man/XAllowDeviceEvents.txt
| 56 +--
man/XGetDeviceProperty.txt
|5
man/XIQueryDevice.txt
|6
man/XSelectExtensionEvent.txt
|8
src/XExtInt.c
| 70 +++-
src/XGetVers.c
| 24 -
src/XIProperties.c
|1
src/XIQueryVersion.c
|1
src/XISelEv.c
| 33 -
src/XIint.h
|1
13 files changed, 152 insertions(+), 245 deletions(-)
New commits:
commit aeeb6237d48edf98d6361c4d1963ff5521cc3aab
Author: Julien Cristau
Date: Thu Nov 18 17:17:08 2010 +0100
Add changelog entry and drop obsolete patch
diff --git a/debian/changelog b/debian/changelog
index 7d7fcd9..968e34b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+libxi (2:1.3-5) UNRELEASED; urgency=low
+
+ * Cherry-picked fixes from upstream:
+- man: fix types for XGetSelectedExtensionEvents
+- Initialize extension with the right number of events (obsoletes our
+ quilt patch)
+- Don't unlock the Display twice
+- Fix usage of uninitialized value
+- Fix memory leak in XIGetSelectedEvents
+- Always unlock display correctly
+- man: improve readability of XAllowDeviceEvents
+- man: fix typo in XIQueryDevice doc (closes: #598964)
+- Fix typo when converting raw events from the wire
+- man: XGetDeviceProperty(3) has no parameter 'pending'
+
+ -- Julien Cristau Thu, 18 Nov 2010 17:14:40 +0100
+
libxi (2:1.3-4) unstable; urgency=low
* Add udeb needed for the graphical installer: libxi6-udeb.
diff --git
a/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch
b/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch
deleted file mode 100644
index 6261652..000
---
a/debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 5e87ce95525d6634066384b8dc829bb7c90ec008 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer
-Date: Wed, 9 Dec 2009 14:06:36 +1000
-Subject: [PATCH] Initialize extension with the right number of events.
-
-If the server supports a lower XI version than the client, the Xlib-internal
-event vector may be smashed. See libXext for more details.
-http://cgit.freedesktop.org/xorg/lib/libXext/commit/?id=83fdb27df4ddc2fb088ddf2ec65f0db6b7c57287
-
-This patch queries the server for the supported XI extension before
-registering the extension with Xlib. The number of events registered depends
-on the server version.
-
-Signed-off-by: Peter Hutterer
- src/XExtInt.c | 61 +++-
- src/XGetVers.c | 24 ++---
- src/XIint.h|1 +
- 3 files changed, 77 insertions(+), 9 deletions(-)
-
-Index: libxi/src/XExtInt.c
-===
libxi.orig/src/XExtInt.c
-+++ libxi/src/XExtInt.c
-@@ -173,6 +173,64 @@
- "BadClass, invalid event class", /* BadClass */
- };
-
-+/* Get the version supported by the server to know which number of
-+* events are support. Otherwise, a wrong number of events may smash
-+* the Xlib-internal event processing vector.
-+*
-+* Since the extension hasn't been initialized yet, we need to
-+* manually get the opcode, then the version.
-+*/
-+static int
-+_XiFindEventsSupported(Display *dpy)
-+{
-+XExtCodes codes;
-+XExtensionVersion *extversion = NULL;
-+int nevents = 0;
-+
-+if (!XQueryExtension(dpy, INAME, &codes.major_opcode,
-+&codes.first_event, &codes.first_error))
-+goto out;
-+
-+LockDisplay(dpy);
-+extversion = _XiGetExtensionVersionRequest(dpy, INAME,
-+codes.major_opcode);
-+UnlockDisplay(dpy);
-+SyncHandle();
-+if (!extversion || !extversion->present)
-+goto out;
-+
-+if (extversion->major_version >= 2)
-+nevents = IEVENTS; /* number is fixed, XI2 adds GenericEvents only */
-+else if (extversion->major_version <= 0)
-+{
-+fprintf(stderr,
-+"XInput_find_display: invalid extension version %d.%d\n",
-+extversion->major_version, extversion->minor_version);
-+goto out;
-+}
-+el
libxi: Changes to 'debian-unstable'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 620a6f18ff7de3e2bed301ec3a1166e4e82668ed Author: Julien Cristau Date: Thu Nov 18 17:31:20 2010 +0100 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 968e34b..a075fee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxi (2:1.3-5) UNRELEASED; urgency=low +libxi (2:1.3-5) unstable; urgency=low * Cherry-picked fixes from upstream: - man: fix types for XGetSelectedExtensionEvents @@ -13,7 +13,7 @@ libxi (2:1.3-5) UNRELEASED; urgency=low - Fix typo when converting raw events from the wire - man: XGetDeviceProperty(3) has no parameter 'pending' - -- Julien Cristau Thu, 18 Nov 2010 17:14:40 +0100 + -- Julien Cristau Thu, 18 Nov 2010 17:31:04 +0100 libxi (2:1.3-4) unstable; urgency=low -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pj7gl-00049x...@alioth.debian.org
libxi: Changes to 'refs/tags/libxi-2_1.3-5'
Tag 'libxi-2_1.3-5' created by Julien Cristau at 2010-11-18 16:49 + Tagging upload of libxi 2:1.3-5 to unstable. -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAABCAAGBQJM5VkUAAoJEDEBgAUJBeQM2OQP/2mCDCl+g6/lu1LQ/IpGl3sy Ozur7RXYTW03nRLMtYAyMS51FKqXvCpf+fKh8vJeQF6a6NossPQinMW7eJkMCeen 0EeMgKCeR5VErJ777zzu7qgKuZCTQN9rjLSz9ceMP9WEV/f0Nr/NrtpmQKm1EqjL GV3rGeKNqaIy9kNWvDaEnaYfnI9USyNaH9qNahfyDB5hXI9vk4hVL3B/Aqkpp9P3 ROVEwLy0VOJ3/nPLt008nOA7aLsoy8AyhVm+Myilzt2y3Zz2cEOWUUBSYXOTEKyx v8dIGcoq31iVqKAhAQ0qjJ/9wNnUjxM4UJwfFwwHChpGAn8wYG8dXSU6RDrVFyUq WItgVUkH1RFJqp5XrtImZBlhsYkJIyl7kUcViJA6zFQUV6iMLNoI7724NYaDj71T fTDDXuOqLAWgLTEAz+Mv0QbhPG2UZIlwP6W3mieD9hy6uT+PXMINdbRynVyUgRih k7zIDmNV3FLwZwEyGzwNIDoi+eXNu3VO1NzGfp7Vqwl1u81CPDWREqQ/21s8E94M s5p+7WydZ4cf6BeuDvtTaoBdWbG9R0sI49v/qrRh89T+zL52SpwT88aBjfsv+O0U m+hmq/7s1krbEl8lyAYhUgH6rCUUVSSsxJ4oQhVg2tUS72NVHkMni/vXjONoFMWq 8SZ2H2ydI9+tuYqBYlmX =ypCq -END PGP SIGNATURE- Changes since libxi-2_1.3-4: Carlos Garnacho (1): Fix typo when converting raw events from the wire. Cyril Brulebois (1): Mention upstream git URL in a comment. Jamey Sharp (1): Don't unlock the Display twice. Julien Cristau (3): man: fix typo in XIQueryDevice doc Add changelog entry and drop obsolete patch Upload to unstable Mikhail Gusarov (1): Remove duplicate xorg.fd.o URL and confusing mailing list URL from debian/control Pauli Nieminen (3): Fix usage of uninitialized value Fix memory leak in XIGetSelectedEvents Always unlock display correctly Peter Hutterer (4): man: fix types for XGetSelectedExtensionEvents. Initialize extension with the right number of events. man: improve readability of XAllowDeviceEvents. man: XGetDeviceProperty(3) has no parameter 'pending'. --- debian/changelog | 17 debian/control |6 debian/patches/0001-Initialize-extension-with-the-right-number-of-events.patch | 174 -- debian/patches/series |1 debian/watch |1 man/XAllowDeviceEvents.txt | 56 +-- man/XGetDeviceProperty.txt |5 man/XIQueryDevice.txt |6 man/XSelectExtensionEvent.txt |8 src/XExtInt.c | 70 +++- src/XGetVers.c | 24 - src/XIProperties.c |1 src/XIQueryVersion.c |1 src/XISelEv.c | 33 - src/XIint.h |1 15 files changed, 153 insertions(+), 251 deletions(-) --- -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pj7gm-0004at...@alioth.debian.org
[bts-link] source package xserver-xorg-video-intel
# # bts-link upstream status pull for source package xserver-xorg-video-intel # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html # user bts-link-upstr...@lists.alioth.debian.org # remote status report for #603142 (http://bugs.debian.org/603142) # * https://bugs.freedesktop.org/show_bug.cgi?id=31584 # * remote status changed: (?) -> NEW usertags 603142 + status-NEW thanks -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20101118163334.24589.54919.btsl...@busoni.debian.org
Bug#598964: marked as done (XIQueryDevice(3): Synopsis says XIQueryPointer)
Your message dated Thu, 18 Nov 2010 17:02:34 + with message-id and subject line Bug#598964: fixed in libxi 2:1.3-5 has caused the Debian Bug report #598964, regarding XIQueryDevice(3): Synopsis says XIQueryPointer to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 598964: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598964 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems --- Begin Message --- Package: libxi-dev Version: 2:1.3-4 Severity: minor File: /usr/share/man/man3/XIQueryDevice.3.gz -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi, in the manpage of XIQueryDevice, the function name is "XIQueryPointer" in the SYNOPSIS, which is confusing. Greetings, Joachim - -- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (500, 'unstable'), (101, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.35-trunk-amd64 (SMP w/2 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages libxi-dev depends on: ii libx11-dev2:1.3.3-3 X11 client-side library (developme ii libxext-dev 2:1.1.2-1 X11 miscellaneous extensions libra ii libxi62:1.3-4X11 Input extension library ii x11proto-input-dev2.0-2 X11 Input extension wire protocol libxi-dev recommends no packages. libxi-dev suggests no packages. - -- no debconf information -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkyojA0ACgkQ9ijrk0dDIGx9kgCgnUU0DhB2KlsOpZerICbBiSMc 0mEAnj3U6pkqejDCm2FLE8Txe7bUHHrL =bsIr -END PGP SIGNATURE- --- End Message --- --- Begin Message --- Source: libxi Source-Version: 2:1.3-5 We believe that the bug you reported is fixed in the latest version of libxi, which is due to be installed in the Debian FTP archive: libxi-dev_1.3-5_i386.deb to main/libx/libxi/libxi-dev_1.3-5_i386.deb libxi6-dbg_1.3-5_i386.deb to main/libx/libxi/libxi6-dbg_1.3-5_i386.deb libxi6-udeb_1.3-5_i386.udeb to main/libx/libxi/libxi6-udeb_1.3-5_i386.udeb libxi6_1.3-5_i386.deb to main/libx/libxi/libxi6_1.3-5_i386.deb libxi_1.3-5.diff.gz to main/libx/libxi/libxi_1.3-5.diff.gz libxi_1.3-5.dsc to main/libx/libxi/libxi_1.3-5.dsc A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 598...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Julien Cristau (supplier of updated libxi package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@debian.org) -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Format: 1.8 Date: Thu, 18 Nov 2010 17:31:04 +0100 Source: libxi Binary: libxi6 libxi6-udeb libxi6-dbg libxi-dev Architecture: source i386 Version: 2:1.3-5 Distribution: unstable Urgency: low Maintainer: Debian X Strike Force Changed-By: Julien Cristau Description: libxi-dev - X11 Input extension library (development headers) libxi6 - X11 Input extension library libxi6-dbg - X11 Input extension library (debug package) libxi6-udeb - X11 Input extension library (udeb) Closes: 598964 Changes: libxi (2:1.3-5) unstable; urgency=low . * Cherry-picked fixes from upstream: - man: fix types for XGetSelectedExtensionEvents - Initialize extension with the right number of events (obsoletes our quilt patch) - Don't unlock the Display twice - Fix usage of uninitialized value - Fix memory leak in XIGetSelectedEvents - Always unlock display correctly - man: improve readability of XAllowDeviceEvents - man: fix typo in XIQueryDevice doc (closes: #598964) - Fix typo when converting raw events from the wire - man: XGetDeviceProperty(3) has no parameter 'pending' Checksums-Sha1: aa8aa2a3f3d0a1c44b452adeabe4c76e7c173bf6 2089 libxi_1.3-5.dsc 4e84ff52868602257bac914240aace438f218531 20814 libxi_1.3-5.diff.gz 8babc77169faf16eeb60f30497bc43f199bc9783 54474 libxi6_1.3-5_i386.deb b6b145aa79725a2e16cf33d1c4f1a7aabe8ba44b 24258 libxi6-udeb_1.3-5_i386.udeb c14ac780c18535dd12261568ee1ba4074256b98e 409626 libxi6-dbg_1.3-5_i386.deb 8725cee7e0152ae59e544a82377f84b5a34ba8f6 137994 libxi-dev_1.3-5_i386.deb Checksums-Sha256: f246f9dc88cd9bc1578edcbf9a864b327dd876e07a4616e82fff128971460909 2089 libxi_1.3-5.dsc e9553747cd1499a4819b5a9548d19c66
Processing of libxi_1.3-5_i386.changes
libxi_1.3-5_i386.changes uploaded successfully to localhost along with the files: libxi_1.3-5.dsc libxi_1.3-5.diff.gz libxi6_1.3-5_i386.deb libxi6-udeb_1.3-5_i386.udeb libxi6-dbg_1.3-5_i386.deb libxi-dev_1.3-5_i386.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pj7ke-qk...@franck.debian.org
Bug#603940: unblock: libxi/2:1.3-5
Package: release.debian.org Severity: normal User: release.debian@packages.debian.org Usertags: unblock Please unblock package libxi. It has a number of small fixes and documentation improvements from upstream, and our quilt patch was replaced by the upstream version (almost identical). Here's the list of included upstream fixes: commit e9efb471f5396a25aee5650ed4b8f3733c3be2d2 Author: Peter Hutterer Date: Tue Nov 2 11:22:01 2010 +1000 man: XGetDeviceProperty(3) has no parameter 'pending'. Signed-off-by: Peter Hutterer Reviewed-by: Julien Cristau (cherry picked from commit 556246beaffb42e1f58d816542d91e360ea02080) commit dddf0a73aa712853029a70a65406ef827bf1563e Author: Carlos Garnacho Date: Wed Oct 6 11:04:21 2010 +0200 Fix typo when converting raw events from the wire. The raw values were being miscalculated, containing only the integral part of the FP3232, meanwhile normal valuators were mistakenly added the fractional part of its corresponding raw value. Signed-off-by: Carlos Garnacho Reviewed-by: Jeremy Huddleston Signed-off-by: Peter Hutterer (cherry picked from commit f237427f897d1dc527494653735d4bb93d740546) (cherry picked from commit dc9d2fd462ef3ba5176c74a2456822fe1671053d) commit 1f3c2d947dbf1020cd8ed19ff0f96da2037694a4 Author: Julien Cristau Date: Sun Oct 3 17:04:57 2010 +0200 man: fix typo in XIQueryDevice doc Don't pretend this is XIQueryPointer. Debian bug#598964 Reported-by: Joachim Breitner Signed-off-by: Julien Cristau (cherry picked from commit abc26c71b6032683b89085a7ebcd40ca81cdf3f2) (cherry picked from commit b7c8e70f3f93e5ff1b64bff33b802d53c867adf8) commit 9eab6d6dcff18acf9ac81cf618ae17f18a6e6331 Author: Peter Hutterer Date: Mon Aug 2 15:40:32 2010 +1000 man: improve readability of XAllowDeviceEvents. Parse the options to event-mode as a list. This requires un-indenting the rest, otherwise the asciidoc/xmlto conversion will indent the trailing paragraphs more than the list Signed-off-by: Peter Hutterer (cherry picked from commit 3f2814a0f9193cb33b44ef53059a4b349cf4cabc) (cherry picked from commit 5178b897167b54a78d6577441f1e27b797823f46) commit 51bd24b0d9dbb5e7384956911e5126e467fc2678 Author: Pauli Nieminen Date: Fri Jun 18 11:32:36 2010 +0300 Always unlock display correctly XISelectEvents and XIGetSelectedEvents were not unlocking display in all return paths. Reported-by: Julien Cristau Signed-off-by: Pauli Nieminen (cherry picked from commit 8daf961d0fe6a1433c8248d984618a7e22ff88b8) (cherry picked from commit b764411d074f0379810b7e921473504b539cfdf3) commit bc027f52efbd568e17857b9187255d76dcb25ceb Author: Pauli Nieminen Date: Mon Jun 14 10:05:36 2010 +0300 Fix memory leak in XIGetSelectedEvents mask_in was leaking for every successfull XIGetSelectedEvents. Signed-off-by: Pauli Nieminen Reviewed-by: Julien Cristau (cherry picked from commit b953bf7b9775e5970776a21ae3f7919592289c92) (cherry picked from commit e116a06d5964e51623d68c329119be87d3ce8ab0) commit abe783205b5c41616161c2c74b317dbe12385ce0 Author: Pauli Nieminen Date: Fri Jun 11 17:30:44 2010 +0300 Fix usage of uninitialized value In error case length of extra data could be uninitialized. This would result randomly sized request later in function. Signed-off-by: Pauli Nieminen Reviewed-by: Julien Cristau (cherry picked from commit 6199f89992e2b6ba5f96833f4f4087b61ca61ac5) (cherry picked from commit e2a82e587b528e2d1b352ee89d9f0b4ad5450f0a) commit 93d706757582805ef2cb7b868d27a13679bb9bdc Author: Jamey Sharp Date: Fri Apr 9 17:31:00 2010 -0700 Don't unlock the Display twice. _xiQueryVersion's caller must wrap it in a LockDisplay/UnlockDisplay pair, so it shouldn't call UnlockDisplay itself. Signed-off-by: Jamey Sharp (cherry picked from commit 54fbe5759aa961dccc618b35573845f847675570) (cherry picked from commit 9ab5ba3eabc58f5154b25f4f1de631c2fdaec3ce) commit 0f6950fc53b2cffc560551a2625a980b1db695f8 Author: Peter Hutterer Date: Wed Dec 9 13:59:57 2009 +1000 Initialize extension with the right number of events. If the server supports a lower XI version than the client, the Xlib-internal event vector may be smashed. See libXext for more details. http://cgit.freedesktop.org/xorg/lib/libXext/commit/?id=83fdb27df4ddc2fb088ddf2ec65f0db6b7c57287 This patch queries the server for the supported XI extension before registering the extension with Xlib. The number of events registered depends on the server version. Signed-off-by: Peter Hutterer Reviewed-by: Julien Cristau (cherry picked from commit 299de21b2ab3cfa2078823215f84da67e7b3d1a3) (cherry picked from commit 87b6e5822532f63b63dc926cbf6788726b83812d) commit 8ce148ef9d28a1693
libxi_1.3-5_i386.changes ACCEPTED into unstable
Accepted: libxi-dev_1.3-5_i386.deb to main/libx/libxi/libxi-dev_1.3-5_i386.deb libxi6-dbg_1.3-5_i386.deb to main/libx/libxi/libxi6-dbg_1.3-5_i386.deb libxi6-udeb_1.3-5_i386.udeb to main/libx/libxi/libxi6-udeb_1.3-5_i386.udeb libxi6_1.3-5_i386.deb to main/libx/libxi/libxi6_1.3-5_i386.deb libxi_1.3-5.diff.gz to main/libx/libxi/libxi_1.3-5.diff.gz libxi_1.3-5.dsc to main/libx/libxi/libxi_1.3-5.dsc Override entries for your package: libxi-dev_1.3-5_i386.deb - optional libdevel libxi6-dbg_1.3-5_i386.deb - extra debug libxi6-udeb_1.3-5_i386.udeb - optional debian-installer libxi6_1.3-5_i386.deb - optional libs libxi_1.3-5.dsc - source x11 Announcing to debian-devel-chan...@lists.debian.org Closing bugs: 598964 Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pj7sy-vt...@franck.debian.org
xsf-tools: Changes to 'master'
mrconfig |4 +++- mrconfig.head |4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit b7f2dde1d435403a42417e3f931c64f2e29a9db1 Author: Cyril Brulebois Date: Thu Nov 18 18:49:38 2010 +0100 Rename alias for xsf-remote-add-upstream. Unfortunately, mr does some magic with the aliases, so one can't really use underscores to separate words, and trying dashes instead leads to parse errors. diff --git a/mrconfig b/mrconfig index f3df527..8b48a2d 100644 --- a/mrconfig +++ b/mrconfig @@ -17,7 +17,7 @@ git2ssh = sed -i 's,git://git.debian.org,ssh://git.debian.org,' $MR_REPO/.git/config # Make it easy to run this command on all repositories: -remote_add_upstream = +remoteaddupstream = xsf-remote-add-upstream diff --git a/mrconfig.head b/mrconfig.head index ce99976..792579b 100644 --- a/mrconfig.head +++ b/mrconfig.head @@ -17,7 +17,7 @@ git2ssh = sed -i 's,git://@@host@@,ssh://@@host@@,' $MR_REPO/.git/config # Make it easy to run this command on all repositories: -remote_add_upstream = +remoteaddupstream = xsf-remote-add-upstream commit 2c9160e9840e592862b72ca875cbaf060f61492c Author: Cyril Brulebois Date: Thu Nov 18 17:44:01 2010 +0100 Fix spacing. diff --git a/mrconfig b/mrconfig index d5850d7..f3df527 100644 --- a/mrconfig +++ b/mrconfig @@ -19,6 +19,8 @@ git2ssh = # Make it easy to run this command on all repositories: remote_add_upstream = xsf-remote-add-upstream + + [app/compiz.git] [app/grandr.git] [app/intel-gen4asm.git] diff --git a/mrconfig.head b/mrconfig.head index ebee71b..ce99976 100644 --- a/mrconfig.head +++ b/mrconfig.head @@ -19,3 +19,5 @@ git2ssh = # Make it easy to run this command on all repositories: remote_add_upstream = xsf-remote-add-upstream + + -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pj8yt-0001uq...@alioth.debian.org
mesa: Changes to 'debian-experimental'
debian/watch |1 + 1 file changed, 1 insertion(+) New commits: commit cf8eeb02f5e3b7a1febf0dbace4e47bfefa88741 Author: Cyril Brulebois Date: Thu Nov 18 18:57:13 2010 +0100 Mention upstream git URL in a comment. diff --git a/debian/watch b/debian/watch index e18e573..89eb7db 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,4 @@ +#git=git://anongit.freedesktop.org/mesa/mesa version=3 opts="uversionmangle=s/-rc/~rc/" \ ftp://freedesktop.org/pub/mesa/([\d\.]*)/ MesaLib-(.*)\.tar\.gz -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pj8ex-0001wd...@alioth.debian.org
Bug#397438: Panel stays blank in MergedFB mode
Hello, About 3 years ago, you participated on the bug #397438 Panel stays blank in MergedFB mode The X server has changed a lot since then, so I wonder whether you are still experiencing the problem or if I could close this bug. Thanks for your time. Regards, -- Julien Viard de Galbert http://silicone.homelinux.org/ -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20101118220409.ga18...@vdg.blogsite.org
Processed: Re: Bug#414275: xorg: X randomly crashes upon mouse click
Processing commands for cont...@bugs.debian.org: > found 414275 xserver-xorg-core/2:1.1.1-19 Bug #414275 [xserver-xorg-core] xorg: X randomly crashes upon mouse click The source xserver-xorg-core and version 2:1.1.1-19 do not appear to match any binary packages Bug Marked as found in versions xserver-xorg-core/2:1.1.1-19. > thanks Stopping processing here. Please contact me if you need assistance. -- 414275: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=414275 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.c.129011913125520.transcr...@bugs.debian.org
Processing of libice_1.0.7-1_amd64.changes
libice_1.0.7-1_amd64.changes uploaded successfully to localhost along with the files: libice_1.0.7-1.dsc libice_1.0.7.orig.tar.gz libice_1.0.7-1.diff.gz libice6_1.0.7-1_amd64.deb libice6-dbg_1.0.7-1_amd64.deb libice-dev_1.0.7-1_amd64.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pjdcm-00033h...@franck.debian.org
libice_1.0.7-1_amd64.changes ACCEPTED into unstable
Accepted: libice-dev_1.0.7-1_amd64.deb to main/libi/libice/libice-dev_1.0.7-1_amd64.deb libice6-dbg_1.0.7-1_amd64.deb to main/libi/libice/libice6-dbg_1.0.7-1_amd64.deb libice6_1.0.7-1_amd64.deb to main/libi/libice/libice6_1.0.7-1_amd64.deb libice_1.0.7-1.diff.gz to main/libi/libice/libice_1.0.7-1.diff.gz libice_1.0.7-1.dsc to main/libi/libice/libice_1.0.7-1.dsc libice_1.0.7.orig.tar.gz to main/libi/libice/libice_1.0.7.orig.tar.gz Override entries for your package: libice-dev_1.0.7-1_amd64.deb - optional libdevel libice6-dbg_1.0.7-1_amd64.deb - extra debug libice6_1.0.7-1_amd64.deb - optional libs libice_1.0.7-1.dsc - source x11 Announcing to debian-devel-chan...@lists.debian.org Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pjdjn-0003lb...@franck.debian.org
libfs: Changes to 'debian-unstable'
.gitignore | 72 ++- ChangeLog| 124 +++ INSTALL |8 --- Makefile.am | 12 +++-- configure.ac | 24 -- debian/changelog | 11 +++- debian/control |9 +++ debian/rules |2 8 files changed, 218 insertions(+), 44 deletions(-) New commits: commit 4d2fa2f655a67a17742c8164f282118e0a22e25e Author: Cyril Brulebois Date: Fri Nov 19 01:00:36 2010 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 92aca12..5351d30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libfs (2:1.0.3-1) UNRELEASED; urgency=low +libfs (2:1.0.3-1) unstable; urgency=low [ Timo Aaltonen ] * Drop pre-dependency on x11-common from libfs-dev. This was needed @@ -16,7 +16,7 @@ libfs (2:1.0.3-1) UNRELEASED; urgency=low * Exclude libFS.la from dh_install accordingly. * Add myself to Uploaders. - -- Cyril Brulebois Fri, 19 Nov 2010 00:34:53 +0100 + -- Cyril Brulebois Fri, 19 Nov 2010 01:00:28 +0100 libfs (2:1.0.2-1) unstable; urgency=low commit e2fe3c8e71e5c46208f5704cfb45737d23f75228 Author: Cyril Brulebois Date: Fri Nov 19 01:00:27 2010 +0100 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index 62c07d5..92aca12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ libfs (2:1.0.3-1) UNRELEASED; urgency=low * Wrap build-deps. * Switch from --list-missing to --fail-missing for additional safety. * Exclude libFS.la from dh_install accordingly. + * Add myself to Uploaders. -- Cyril Brulebois Fri, 19 Nov 2010 00:34:53 +0100 diff --git a/debian/control b/debian/control index 0ab3a71..a2c13b3 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: libfs Section: x11 Priority: optional Maintainer: Debian X Strike Force -Uploaders: David Nusinow , Brice Goglin +Uploaders: David Nusinow , Brice Goglin , Cyril Brulebois Build-Depends: debhelper (>= 5.0.0), pkg-config, commit e50372e2acec2590ad9b4d20c7012f49a336897a Author: Cyril Brulebois Date: Fri Nov 19 00:47:50 2010 +0100 Exclude libFS.la from dh_install accordingly. diff --git a/debian/changelog b/debian/changelog index a17c29c..62c07d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ libfs (2:1.0.3-1) UNRELEASED; urgency=low * New upstream release. * Wrap build-deps. * Switch from --list-missing to --fail-missing for additional safety. + * Exclude libFS.la from dh_install accordingly. -- Cyril Brulebois Fri, 19 Nov 2010 00:34:53 +0100 diff --git a/debian/rules b/debian/rules index 3b3bef2..eb19d4d 100755 --- a/debian/rules +++ b/debian/rules @@ -72,7 +72,7 @@ binary-arch: build install dh_testroot dh_installdocs - dh_install --sourcedir=debian/tmp --fail-missing + dh_install --sourcedir=debian/tmp --fail-missing -XlibFS.la dh_installchangelogs ChangeLog dh_link dh_strip --dbg-package=$(PACKAGE)-dbg commit c7454d1528ceaeb8f01183492f37b86292ad382b Author: Cyril Brulebois Date: Fri Nov 19 00:47:13 2010 +0100 Switch from --list-missing to --fail-missing for additional safety. diff --git a/debian/changelog b/debian/changelog index 8e6ad5b..a17c29c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ libfs (2:1.0.3-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * New upstream release. * Wrap build-deps. + * Switch from --list-missing to --fail-missing for additional safety. -- Cyril Brulebois Fri, 19 Nov 2010 00:34:53 +0100 diff --git a/debian/rules b/debian/rules index 75cbb27..3b3bef2 100755 --- a/debian/rules +++ b/debian/rules @@ -72,7 +72,7 @@ binary-arch: build install dh_testroot dh_installdocs - dh_install --sourcedir=debian/tmp --list-missing + dh_install --sourcedir=debian/tmp --fail-missing dh_installchangelogs ChangeLog dh_link dh_strip --dbg-package=$(PACKAGE)-dbg commit db0f222f88a8660683bbe359644eda5fbbb55e4e Author: Cyril Brulebois Date: Fri Nov 19 00:37:21 2010 +0100 Wrap build-deps. diff --git a/debian/changelog b/debian/changelog index 7cb362d..8e6ad5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ libfs (2:1.0.3-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * New upstream release. + * Wrap build-deps. -- Cyril Brulebois Fri, 19 Nov 2010 00:34:53 +0100 diff --git a/debian/control b/debian/control index ec5dae2..0ab3a71 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,12 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force Uploaders: David Nusinow , Brice Goglin -Build-Depends: debhelper (>= 5.0.0), pkg-config, x11proto-core-dev (>= 6.8.99.15+cvs.20050722), x11proto-fonts-dev, xtrans-dev +Build-Depends: + debhelper (>= 5.0.0), + pkg-config, + x11proto-core-dev (>= 6.8.99.15+cvs.2
libfs: Changes to 'upstream-unstable'
.gitignore | 72 +-- INSTALL |8 -- Makefile.am | 12 + configure.ac | 24 --- 4 files changed, 77 insertions(+), 39 deletions(-) New commits: commit 4218339a30a899ceb82a9a057c6b96bce624f917 Author: Alan Coopersmith Date: Tue Oct 26 18:47:31 2010 -0700 libFS 1.0.3 Signed-off-by: Alan Coopersmith diff --git a/configure.ac b/configure.ac index ddc7bbd..a9afd7f 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,8 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) -AC_INIT(libFS, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libFS) +AC_INIT([libFS], [1.0.3], +[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libFS]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit f6aacdb5143032a9e21b8bb09212fcf69c839a85 Author: Alan Coopersmith Date: Tue Oct 26 18:45:48 2010 -0700 Remove unnecessary calls from configure.ac AM_PROG_CC is already covered by XORG_DEFAULT_OPTIONS AC_SUBST of CFLAGS & LIBS is taken care of by PKG_CHECK_MODULES Signed-off-by: Alan Coopersmith diff --git a/configure.ac b/configure.ac index ad0b33c..ddc7bbd 100644 --- a/configure.ac +++ b/configure.ac @@ -35,19 +35,15 @@ XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) # Check for progs -AC_PROG_CC AC_PROG_LIBTOOL # Check for dependencies PKG_CHECK_MODULES(FS, xproto fontsproto) -AC_SUBST(FS_CFLAGS) -AC_SUBST(FS_LIBS) + # # Split out so we don't include xtrans C flags in fs.pc # PKG_CHECK_MODULES(XTRANS, xtrans) -AC_SUBST(XTRANS_CFLAGS) -AC_SUBST(XTRANS_LIBS) XTRANS_CONNECTION_FLAGS commit c7c7dda28b61d9b008a2fab3baf8ed02662a6dbf Author: Gaetan Nadon Date: Mon Mar 29 16:50:33 2010 -0400 config: update AC_PREREQ statement to 2.60 Unrelated to the previous patches, the new value simply reflects the reality that the minimum level for autoconf to configure all x.org modules is 2.60 dated June 2006. ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz Signed-off-by: Gaetan Nadon diff --git a/configure.ac b/configure.ac index b33774b..ad0b33c 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ dnl PERFORMANCE OF THIS SOFTWARE. dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) +AC_PREREQ([2.60]) AC_INIT(libFS, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libFS) AM_INIT_AUTOMAKE([foreign dist-bzip2]) commit dbe6f1912d77cd42ca0ac7ac5296113f84fc690e Author: Gaetan Nadon Date: Mon Mar 29 15:09:34 2010 -0400 config: install in $docdir and distribute doc/FSlib.txt The dist_doc_DATA statement was designed for that purpose. Signed-off-by: Gaetan Nadon diff --git a/Makefile.am b/Makefile.am index 44ae65d..6d5fc63 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,9 +24,9 @@ SUBDIRS = src pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libfs.pc -MAINTAINERCLEANFILES = ChangeLog INSTALL -EXTRA_DIST = doc/FSlib.txt +dist_doc_DATA = doc/FSlib.txt +MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL commit 315643e773d666d1cc2248fe7ba1bc979ec34c70 Author: Gaetan Nadon Date: Mon Mar 29 14:53:48 2010 -0400 config: remove the pkgconfig pc.in file from EXTRA_DIST Automake always includes it in the tarball. Signed-off-by: Gaetan Nadon diff --git a/Makefile.am b/Makefile.am index 758ade2..44ae65d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libfs.pc MAINTAINERCLEANFILES = ChangeLog INSTALL -EXTRA_DIST = libfs.pc.in doc/FSlib.txt +EXTRA_DIST = doc/FSlib.txt .PHONY: ChangeLog INSTALL commit a391fd191e207b4408ce230505df25570cf041d4 Author: Gaetan Nadon Date: Fri Nov 27 20:56:03 2009 -0500 Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. diff --git a/Makefile.am b/Makefile.am index c984d85..758ade2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,6 +24,7 @@ SUBDIRS = src pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libfs.pc +MAINTAINERCLEANFILES = ChangeLog INSTALL EXTRA_DIST = libfs.pc.in doc/FSlib.txt commit 15104bf1988d27e7dc4272d32dbd381455c0e9f7 Author: Gaetan Nadon Date: Wed Oct 28 14:09:10 2009 -0400 INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 Add missing INSTALL file. Use standard GNU file on building tarball README may have been updated Remove AUTHORS file as it is empty and no content available yet. Remove NEWS file as it is empty and no content available yet. diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index e69de29..000 diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 8bc1e0b..000 --- a/INSTALL +++ /dev/null @@ -
libfs: Changes to 'refs/tags/libfs-2_1.0.3-1'
Tag 'libfs-2_1.0.3-1' created by Cyril Brulebois at
2010-11-19 00:02 +
Tagging upload of libfs 2:1.0.3-1 to unstable.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEABECAAYFAkzlvpQACgkQeGfVPHR5Nd1ODQCg1X6D8MwS9IgLXUiSbJZNDOKj
MGoAn061//UW8MbF2R0QLPsy/RGW8P9J
=Oe2i
-END PGP SIGNATURE-
Changes since libfs-2_1.0.2-1:
Alan Coopersmith (2):
Remove unnecessary calls from configure.ac
libFS 1.0.3
Cyril Brulebois (8):
Mention upstream git URL in a comment.
Merge branch 'upstream-unstable' into debian-unstable
Update changelogs.
Wrap build-deps.
Switch from --list-missing to --fail-missing for additional safety.
Exclude libFS.la from dh_install accordingly.
Add myself to Uploaders.
Upload to unstable.
Gaetan Nadon (8):
.gitignore: use common defaults with custom section # 24239
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
Deploy the new XORG_DEFAULT_OPTIONS #24242
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
config: remove the pkgconfig pc.in file from EXTRA_DIST
config: install in $docdir and distribute doc/FSlib.txt
config: update AC_PREREQ statement to 2.60
Jeremy Huddleston (1):
This is not a GNU project, so declare it foreign.
Julien Cristau (11):
xsfbs.sh: remove unused check_symlinks_and_{bomb,warn}
xsfbs.sh: remove unused analyze_path
xsfbs.sh: remove unused maplink function
xsfbs.sh: remove unused find_culprits function
xsfbs.sh: remove unused reject_whitespace function
xsfbs.mk: no need for shlibs.local
xsfbs.sh: fix typo and remove svn keyword
xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
xsfbs.mk: remove more obsolete code
Remove myself from Uploaders.
Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good
reason. Thanks, Colin Watson!
Mikhail Gusarov (1):
Remove duplicate xorg.fd.o URL and confusing mailing list URL from
debian/control
Timo Aaltonen (2):
Drop pre-dependency on x11-common from libfs-dev. This was needed for
upgrades from sarge.
Merge branch 'debian-unstable' of ../../xsfbs into debian-unstable
---
.gitignore| 72 ---
ChangeLog | 124 ++
INSTALL |8 -
Makefile.am | 12 +-
configure.ac | 24 ++---
debian/changelog | 20
debian/control| 16 +--
debian/rules | 12 +-
debian/watch |1
debian/xsfbs/xsfbs.mk | 21
debian/xsfbs/xsfbs.sh | 233 --
11 files changed, 238 insertions(+), 305 deletions(-)
---
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pjesu-xs...@alioth.debian.org
Processing of libfs_1.0.3-1_amd64.changes
libfs_1.0.3-1_amd64.changes uploaded successfully to localhost along with the files: libfs_1.0.3-1.dsc libfs_1.0.3.orig.tar.gz libfs_1.0.3-1.diff.gz libfs6_1.0.3-1_amd64.deb libfs6-dbg_1.0.3-1_amd64.deb libfs-dev_1.0.3-1_amd64.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pjetc-0007oo...@franck.debian.org
libfs_1.0.3-1_amd64.changes ACCEPTED into unstable
Accepted: libfs-dev_1.0.3-1_amd64.deb to main/libf/libfs/libfs-dev_1.0.3-1_amd64.deb libfs6-dbg_1.0.3-1_amd64.deb to main/libf/libfs/libfs6-dbg_1.0.3-1_amd64.deb libfs6_1.0.3-1_amd64.deb to main/libf/libfs/libfs6_1.0.3-1_amd64.deb libfs_1.0.3-1.diff.gz to main/libf/libfs/libfs_1.0.3-1.diff.gz libfs_1.0.3-1.dsc to main/libf/libfs/libfs_1.0.3-1.dsc libfs_1.0.3.orig.tar.gz to main/libf/libfs/libfs_1.0.3.orig.tar.gz Override entries for your package: libfs-dev_1.0.3-1_amd64.deb - optional libdevel libfs6-dbg_1.0.3-1_amd64.deb - extra debug libfs6_1.0.3-1_amd64.deb - optional libs libfs_1.0.3-1.dsc - source x11 Announcing to debian-devel-chan...@lists.debian.org Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pjefh-0008oc...@franck.debian.org
libxfont: Changes to 'refs/tags/libxfont-1_1.4.3-1'
Tag 'libxfont-1_1.4.3-1' created by Cyril Brulebois at 2010-11-19 00:42 + Tagging upload of libxfont 1:1.4.3-1 to experimental. -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) iEYEABECAAYFAkzlx+sACgkQeGfVPHR5Nd0/TQCfZsGrDOGvYxJB3GercIVAZW/G o30An2vzivZBVyAM71viVkcWiCfIzFkW =fxBy -END PGP SIGNATURE- Changes since libxfont-1_1.4.2-1: Alan Coopersmith (2): Fix builds with Sun compilers libXfont 1.4.3 Cyril Brulebois (9): Merge branch 'upstream-unstable' into debian-unstable Update changelogs. Bump xutils-dev build-dep for new macros. Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc. Pass --with-xmlto and --without-fop for the regular build (we want html and txt only). Disable both for the udeb build. Tweak doc filenames, and handle that through dh_install. Add --fail-missing -XlibXfont.la for the second dh_install call (the udeb one), for additional safety. Mention upstream git URL in a comment. Upload to experimental. Gaetan Nadon (1): doc: use xorg-docs xorg.css stylesheet Jeremy Huddleston (2): darwin: Fix build regression introduced by previous patch FreeType: Cleanup MUMBLE and fix printing of XLFD in debug spew. Jesse Adkins (1): Purge cvs tags. Jon TURNEY (1): Build fix for platforms which don't have weak linkage Yaakov Selkowitz (1): Revert "Bug #6247: Fix build on Cygwin" --- ChangeLog| 104 +++ Makefile.am | 27 --- configure.ac | 10 ++-- debian/changelog | 13 + debian/control |5 -- debian/libxfont-dev.install |5 ++ debian/rules | 13 + debian/watch |1 doc/.gitignore | 10 ++-- doc/Makefile.am | 66 +++ doc/fontlib.css | 41 doc/fontlib.xml |1 doc/fontlib.xsl | 32 - include/X11/fonts/bdfint.h |3 - include/X11/fonts/bitmap.h |3 - include/X11/fonts/bufio.h|3 - include/X11/fonts/fntfil.h |3 - include/X11/fonts/fntfilio.h |3 - include/X11/fonts/fntfilst.h |3 - include/X11/fonts/fontencc.h |1 include/X11/fonts/fontmisc.h |1 include/X11/fonts/fontshow.h |2 include/X11/fonts/fontutil.h |2 include/X11/fonts/fontxlfd.h |3 - include/X11/fonts/pcf.h |3 - src/FreeType/ft.h|8 --- src/FreeType/ftenc.c |1 src/FreeType/ftfuncs.c | 27 +++ src/FreeType/ftfuncs.h |1 src/FreeType/fttools.c |2 src/FreeType/xttcap.c|1 src/FreeType/xttcap.h|1 src/Makefile.am |2 src/bitmap/bdfread.c |3 - src/bitmap/bdfutils.c|2 src/bitmap/bitmap.c |3 - src/bitmap/bitmapfunc.c |4 - src/bitmap/bitmaputil.c |3 - src/bitmap/bitscale.c|1 src/bitmap/fontink.c |3 - src/bitmap/pcfread.c |1 src/bitmap/pcfwrite.c|2 src/bitmap/snfread.c |2 src/bitmap/snfstr.h |2 src/builtins/builtin.h |2 src/builtins/file.c |3 - src/builtins/fonts.c |3 - src/builtins/fpe.c |4 - src/builtins/render.c|4 - src/fc/fsconvert.c |2 src/fc/fserve.c |3 - src/fc/fserve.h |2 src/fc/fservestr.h |2 src/fc/fsio.c|2 src/fc/fsio.h|2 src/fc/fslibos.h |2 src/fontfile/bitsource.c |3 - src/fontfile/bufio.c |3 - src/fontfile/decompress.c|2 src/fontfile/defaults.c |3 - src/fontfile/dirfile.c |3 - src/fontfile/fileio.c|3 - src/fontfile/filewr.c|3 - src/fontfile/fontdir.c |4 - src/fontfile/fontencc.c |1 src/fontfile/fontfile.c |5 -- src/fontfile/fontscale.c |3 - src/fontfile/gunzip.c|2 src/fontfile/renderers.c |1 src/stubs/stubs.h| 16 +- src/util/atom.c |3 - src/util/fontaccel.c |3 - src/util/fontnames.c |4 - src/util/fontutil.c |3 - src/util/fontxlfd.c |3 - src/util/format.c|2 src/util/miscutil.c |5 -- src/util/patcache.c |3 - src/util/private.c |3 - src/util/utilbitmap.c|1 80 files changed, 233 insertions(+), 307 deletions(-) --- -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pjf4s-9r...@alioth.debian.org
libxfont: Changes to 'upstream-experimental'
Makefile.am | 27 - configure.ac | 10 +++--- doc/.gitignore | 10 +++--- doc/Makefile.am | 66 +++ doc/fontlib.css | 41 -- doc/fontlib.xml |1 doc/fontlib.xsl | 32 include/X11/fonts/bdfint.h |3 - include/X11/fonts/bitmap.h |3 - include/X11/fonts/bufio.h|3 - include/X11/fonts/fntfil.h |3 - include/X11/fonts/fntfilio.h |3 - include/X11/fonts/fntfilst.h |3 - include/X11/fonts/fontencc.h |1 include/X11/fonts/fontmisc.h |1 include/X11/fonts/fontshow.h |2 - include/X11/fonts/fontutil.h |2 - include/X11/fonts/fontxlfd.h |3 - include/X11/fonts/pcf.h |3 - src/FreeType/ft.h|8 + src/FreeType/ftenc.c |1 src/FreeType/ftfuncs.c | 27 + src/FreeType/ftfuncs.h |1 src/FreeType/fttools.c |2 - src/FreeType/xttcap.c|1 src/FreeType/xttcap.h|1 src/Makefile.am |2 - src/bitmap/bdfread.c |3 - src/bitmap/bdfutils.c|2 - src/bitmap/bitmap.c |3 - src/bitmap/bitmapfunc.c |4 -- src/bitmap/bitmaputil.c |3 - src/bitmap/bitscale.c|1 src/bitmap/fontink.c |3 - src/bitmap/pcfread.c |1 src/bitmap/pcfwrite.c|2 - src/bitmap/snfread.c |2 - src/bitmap/snfstr.h |2 - src/builtins/builtin.h |2 - src/builtins/file.c |3 - src/builtins/fonts.c |3 - src/builtins/fpe.c |4 -- src/builtins/render.c|4 -- src/fc/fsconvert.c |2 - src/fc/fserve.c |3 - src/fc/fserve.h |2 - src/fc/fservestr.h |2 - src/fc/fsio.c|2 - src/fc/fsio.h|2 - src/fc/fslibos.h |2 - src/fontfile/bitsource.c |3 - src/fontfile/bufio.c |3 - src/fontfile/decompress.c|2 - src/fontfile/defaults.c |3 - src/fontfile/dirfile.c |3 - src/fontfile/fileio.c|3 - src/fontfile/filewr.c|3 - src/fontfile/fontdir.c |4 -- src/fontfile/fontencc.c |1 src/fontfile/fontfile.c |5 --- src/fontfile/fontscale.c |3 - src/fontfile/gunzip.c|2 - src/fontfile/renderers.c |1 src/stubs/stubs.h| 16 -- src/util/atom.c |3 - src/util/fontaccel.c |3 - src/util/fontnames.c |4 -- src/util/fontutil.c |3 - src/util/fontxlfd.c |3 - src/util/format.c|2 - src/util/miscutil.c |5 +-- src/util/patcache.c |3 - src/util/private.c |3 - src/util/utilbitmap.c|1 74 files changed, 104 insertions(+), 295 deletions(-) New commits: commit 12157fbebc35c2d039df2df4fc5ac2b299eeec03 Author: Alan Coopersmith Date: Thu Oct 28 20:43:27 2010 -0700 libXfont 1.4.3 Signed-off-by: Alan Coopersmith diff --git a/configure.ac b/configure.ac index 46fe9f7..8389dfc 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) AC_INIT([libXfont], - 1.4.2, + [1.4.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXfont) # Autoheader generates config.h.in. No new lines allowed in the list. commit f29f1d68d7eca96e45ba3758686be07993d82e03 Author: Jesse Adkins Date: Tue Sep 28 13:30:02 2010 -0700 Purge cvs tags. Signed-off-by: Jesse Adkins Signed-off-by: Alan Coopersmith diff --git a/doc/fontlib.xml b/doc/fontlib.xml index 8b7245e..f2e4811 100644 --- a/doc/fontlib.xml +++ b/doc/fontlib.xml @@ -6,7 +6,6 @@ - diff --git a/include/X11/fonts/bdfint.h b/include/X11/fonts/bdfint.h index d41c4a5..913f660 100644 --- a/include/X11/fonts/bdfint.h +++ b/include/X11/fonts/bdfint.h @@ -1,5 +1,3 @@ -/* $Xorg: bdfint.h,v 1.4 2001/02/09 02:04:01 xorgcvs Exp $ */ - /* Copyright 1990, 1998 The Open Group @@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bdfint.h,v 1.4 2001/01/17 19:43:26 dawes Exp $ */ #ifndef BDFINT_H #define BDFINT_H diff --git a/include/X11/fonts/bitmap.h b/include/X11/fonts/bitmap.h index 9b170a9..c023427 100644 --- a/include/X11/fonts/bitmap.h +++ b/include/X11/fonts/bitmap.h @@ -1,5 +1,3 @@ -/* $Xorg: bitmap.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ - /* Copyright 1990, 1998 The Open Group @@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/fon
libxfont: Changes to 'debian-experimental'
ChangeLog| 104 +++ Makefile.am | 27 --- configure.ac | 10 ++-- debian/changelog | 13 + debian/control |5 -- debian/libxfont-dev.install |5 ++ debian/rules | 13 + debian/watch |1 doc/.gitignore | 10 ++-- doc/Makefile.am | 66 +++ doc/fontlib.css | 41 doc/fontlib.xml |1 doc/fontlib.xsl | 32 - include/X11/fonts/bdfint.h |3 - include/X11/fonts/bitmap.h |3 - include/X11/fonts/bufio.h|3 - include/X11/fonts/fntfil.h |3 - include/X11/fonts/fntfilio.h |3 - include/X11/fonts/fntfilst.h |3 - include/X11/fonts/fontencc.h |1 include/X11/fonts/fontmisc.h |1 include/X11/fonts/fontshow.h |2 include/X11/fonts/fontutil.h |2 include/X11/fonts/fontxlfd.h |3 - include/X11/fonts/pcf.h |3 - src/FreeType/ft.h|8 --- src/FreeType/ftenc.c |1 src/FreeType/ftfuncs.c | 27 +++ src/FreeType/ftfuncs.h |1 src/FreeType/fttools.c |2 src/FreeType/xttcap.c|1 src/FreeType/xttcap.h|1 src/Makefile.am |2 src/bitmap/bdfread.c |3 - src/bitmap/bdfutils.c|2 src/bitmap/bitmap.c |3 - src/bitmap/bitmapfunc.c |4 - src/bitmap/bitmaputil.c |3 - src/bitmap/bitscale.c|1 src/bitmap/fontink.c |3 - src/bitmap/pcfread.c |1 src/bitmap/pcfwrite.c|2 src/bitmap/snfread.c |2 src/bitmap/snfstr.h |2 src/builtins/builtin.h |2 src/builtins/file.c |3 - src/builtins/fonts.c |3 - src/builtins/fpe.c |4 - src/builtins/render.c|4 - src/fc/fsconvert.c |2 src/fc/fserve.c |3 - src/fc/fserve.h |2 src/fc/fservestr.h |2 src/fc/fsio.c|2 src/fc/fsio.h|2 src/fc/fslibos.h |2 src/fontfile/bitsource.c |3 - src/fontfile/bufio.c |3 - src/fontfile/decompress.c|2 src/fontfile/defaults.c |3 - src/fontfile/dirfile.c |3 - src/fontfile/fileio.c|3 - src/fontfile/filewr.c|3 - src/fontfile/fontdir.c |4 - src/fontfile/fontencc.c |1 src/fontfile/fontfile.c |5 -- src/fontfile/fontscale.c |3 - src/fontfile/gunzip.c|2 src/fontfile/renderers.c |1 src/stubs/stubs.h| 16 +- src/util/atom.c |3 - src/util/fontaccel.c |3 - src/util/fontnames.c |4 - src/util/fontutil.c |3 - src/util/fontxlfd.c |3 - src/util/format.c|2 src/util/miscutil.c |5 -- src/util/patcache.c |3 - src/util/private.c |3 - src/util/utilbitmap.c|1 80 files changed, 233 insertions(+), 307 deletions(-) New commits: commit 9e85911d68e52d7776c22ed3776f7339b4f45921 Author: Cyril Brulebois Date: Fri Nov 19 01:18:02 2010 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 44f0496..9f62375 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxfont (1:1.4.3-1) UNRELEASED; urgency=low +libxfont (1:1.4.3-1) experimental; urgency=low * New upstream release. * Bump xutils-dev build-dep for new macros. @@ -9,7 +9,7 @@ libxfont (1:1.4.3-1) UNRELEASED; urgency=low * Add --fail-missing -XlibXfont.la for the second dh_install call (the udeb one), for additional safety. - -- Cyril Brulebois Sat, 06 Nov 2010 15:05:02 +0100 + -- Cyril Brulebois Fri, 19 Nov 2010 01:17:48 +0100 libxfont (1:1.4.2-1) experimental; urgency=low commit 7386c9f1a44d64ef89e5dbe9a5b47be5997c07c7 Author: Cyril Brulebois Date: Thu Nov 18 15:10:44 2010 +0100 Mention upstream git URL in a comment. diff --git a/debian/watch b/debian/watch index a241b87..b369043 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ +#git=git://anongit.freedesktop.org/xorg/lib/libXfont version=3 http://xorg.freedesktop.org/releases/individual/lib/ libXfont-(.*)\.tar\.gz commit e5071177f8ea1ab78c693279ee774bfa2ee817be Author: Cyril Brulebois Date: Sat Nov 6 15:30:02 2010 +0100 Add --fail-missing -XlibXfont.la for the second dh_install call (the udeb one), for additional safety. diff --git a/debian/changelog b/debian/changelog index 8c4b6a2..44f0496 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ libxfont (1:1.4.3-1) UNRELEASED; urgency=low * Pass --with-xmlto and --without-fop for the regular build (we want
Processing of libxfont_1.4.3-1_amd64.changes
libxfont_1.4.3-1_amd64.changes uploaded successfully to localhost along with the files: libxfont_1.4.3-1.dsc libxfont_1.4.3.orig.tar.gz libxfont_1.4.3-1.diff.gz libxfont1_1.4.3-1_amd64.deb libxfont1-udeb_1.4.3-1_amd64.udeb libxfont1-dbg_1.4.3-1_amd64.deb libxfont-dev_1.4.3-1_amd64.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pjf6m-00020e...@franck.debian.org
libxfont_1.4.3-1_amd64.changes ACCEPTED into experimental
Accepted: libxfont-dev_1.4.3-1_amd64.deb to main/libx/libxfont/libxfont-dev_1.4.3-1_amd64.deb libxfont1-dbg_1.4.3-1_amd64.deb to main/libx/libxfont/libxfont1-dbg_1.4.3-1_amd64.deb libxfont1-udeb_1.4.3-1_amd64.udeb to main/libx/libxfont/libxfont1-udeb_1.4.3-1_amd64.udeb libxfont1_1.4.3-1_amd64.deb to main/libx/libxfont/libxfont1_1.4.3-1_amd64.deb libxfont_1.4.3-1.diff.gz to main/libx/libxfont/libxfont_1.4.3-1.diff.gz libxfont_1.4.3-1.dsc to main/libx/libxfont/libxfont_1.4.3-1.dsc libxfont_1.4.3.orig.tar.gz to main/libx/libxfont/libxfont_1.4.3.orig.tar.gz Override entries for your package: libxfont-dev_1.4.3-1_amd64.deb - optional libdevel libxfont1-dbg_1.4.3-1_amd64.deb - extra debug libxfont1-udeb_1.4.3-1_amd64.udeb - optional debian-installer libxfont1_1.4.3-1_amd64.deb - optional libs libxfont_1.4.3-1.dsc - source x11 Announcing to debian-devel-chan...@lists.debian.org Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pjf88-00027j...@franck.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu'
ChangeLog| 547 + NEWS |7 configure.ac |9 debian/README.Debian | 13 debian/changelog | 60 + debian/control |5 debian/patches/108_sandybridge_disable_Xv.patch | 60 - debian/patches/libdrm-from-sid-is-ok.diff| 11 debian/patches/series|2 man/intel.man|6 src/Makefile.am |5 src/brw_structs.h| 100 ++ src/common.h |7 src/i830_reg.h |2 src/i830_render.c|2 src/i965_reg.h | 98 ++ src/i965_render.c| 789 -- src/i965_video.c | 794 --- src/intel.h | 31 src/intel_batchbuffer.c | 47 - src/intel_batchbuffer.h | 13 src/intel_display.c |8 src/intel_dri.c | 247 - src/intel_driver.c | 206 +++- src/intel_driver.h | 78 - src/intel_hwmc.c | 14 src/intel_memory.c | 40 src/intel_module.c | 113 ++ src/intel_shadow.c | 204 src/intel_uxa.c | 334 +-- src/intel_video.c| 53 - src/intel_video.h|7 src/legacy/i810/i810.h |3 src/legacy/i810/i810_dri.c |4 src/render_program/Makefile.am | 45 + src/render_program/exa_wm_ca.g6b |4 src/render_program/exa_wm_ca_srcalpha.g6b|4 src/render_program/exa_wm_mask_affine.g6a| 47 + src/render_program/exa_wm_mask_affine.g6b|4 src/render_program/exa_wm_mask_projective.g6a| 63 + src/render_program/exa_wm_mask_projective.g6b| 12 src/render_program/exa_wm_mask_sample_a.g4a |3 src/render_program/exa_wm_mask_sample_a.g4b |3 src/render_program/exa_wm_mask_sample_a.g4b.gen5 |3 src/render_program/exa_wm_mask_sample_a.g6b |3 src/render_program/exa_wm_mask_sample_argb.g4a |3 src/render_program/exa_wm_mask_sample_argb.g4b |3 src/render_program/exa_wm_mask_sample_argb.g4b.gen5 |3 src/render_program/exa_wm_mask_sample_argb.g6b |3 src/render_program/exa_wm_noca.g6b |4 src/render_program/exa_wm_src_affine.g6a | 47 + src/render_program/exa_wm_src_affine.g6b |4 src/render_program/exa_wm_src_projective.g6a | 63 + src/render_program/exa_wm_src_projective.g6b | 12 src/render_program/exa_wm_src_sample_a.g4a |3 src/render_program/exa_wm_src_sample_a.g4b |3 src/render_program/exa_wm_src_sample_a.g4b.gen5 |3 src/render_program/exa_wm_src_sample_a.g6b |3 src/render_program/exa_wm_src_sample_argb.g4a|3 src/render_program/exa_wm_src_sample_argb.g4b|3 src/render_program/exa_wm_src_sample_argb.g4b.gen5 |3 src/render_program/exa_wm_src_sample_argb.g6b|3 src/render_program/exa_wm_src_sample_planar.g4a |7 src/render_program/exa_wm_src_sample_planar.g4b |7 src/render_program/exa_wm_src_sample_planar.g4b.gen5 |7 src/render_program/exa_wm_src_sample_planar.g6b |5 src/render_program/exa_wm_write.g6a | 77 + src/render_program/exa_wm_write.g6b | 17 src/render_program/exa_wm_yuv_rgb.g6b| 12 uxa/uxa-glyphs.c |7 uxa/uxa.c|3 71 files changed, 3653 insertions(+), 765 deletions(-) New commits: commit 3b64a0083fc3ed2ef130c58205edf0d8a9348036 Author: Robert Hooker Date: Mon Nov 15 12:31:40 2010 -0500 Add libudev-dev to build deps to enable monitor hotplug detection code. diff --git a/debian/control b/debian/control index ca415ea..94b56a4 100644 --- a/debian/control +++ b/debian/control @@ -30,6 +30,7 @@ Build-Depends: libxcb-aux0-dev, libxcb-dri2-0-dev, # end xvmc + libudev-dev [linux-any], dpkg-dev (>= 1.14.17)
libxmu: Changes to 'refs/tags/libxmu-2_1.1.0-1'
Tag 'libxmu-2_1.1.0-1' created by Cyril Brulebois at 2010-11-19 07:45 + Tagging upload of libxmu 2:1.1.0-1 to unstable. -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) iEYEABECAAYFAkzmKyEACgkQeGfVPHR5Nd3f7QCdGK2F14d4trVUVNZpjSJYSDzs kDUAmQELtNs1Wdg0Z5lgQr3aPEcZYLWA =4ANN -END PGP SIGNATURE- Changes since libxmu-2_1.0.5-2: Alan Coopersmith (16): Move doc/Xmu.ms from xorg-docs module Convert Xmu.ms to DocBook/xml Correct some minor typos in original document Fix distcheck (forgot to mark Xmu.xml as dist_*) Show X logo as a figure for XmuDrawLogo Add XmuSnprintf to doc/Xmu.xml Update docs to match headers Add XmuNCopyISOLatin1Lowered & XmuNCopyISOLatin1Uppered to doc/Xmu.xml Document which functions are in libXmu vs. libXmuu Use _X_ATTRIBUTE_PRINTF from Xfuncproto.h in Xmu headers Xmu.xml: Compilers that can't handle void are now ancient history Add some cross-reference links and an index to the docs Use shared stylesheets from xorg-sgml-doctools instead of a private copy Add xorg.css to CLEANFILES to pass make distcheck Remove unnecessary calls from configure.ac libXmu 1.1.0 Cyril Brulebois (11): Mention upstream git URL in a comment. Merge branch 'upstream-unstable' into debian-unstable Update changelogs. Bump xutils-dev build-dep for new macros. Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc. Pass --with-xmlto and --without-fop (we want html and txt only). Pass --docdir=/usr/share/doc/libxmu-headers and add this directory to libxmu-headers.install file. Remove the hardcoded path to the X logo in the Xmu.html file. Kill *.xml in the doc directory, no point in shipping them. Switch from --list-missing to --fail-missing for additional safety. Upload to unstable. Fernando Carrijo (1): Purge macro NEED_EVENTS Gaetan Nadon (13): .gitignore: use common defaults with custom section # 24239 Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 Deploy the new XORG_DEFAULT_OPTIONS #24242 INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES config: remove execute permission on source C file config: remove the pkgconfig pc.in file from EXTRA_DIST config: update AC_PREREQ statement to 2.60 config: add WhitePoint.h to the include headers config: move docs ignore from toplevel .gitignore to /doc config: use HAVE_STYLESHEET now defined in XORG_CHECK_SGML_DOCTOOLS config: use HAVE_XMLTO_TEXT from XORG_WITH_XMLTO specs: xsl stylesheet requires abs path to images Jeremy Huddleston (1): This is not a GNU project, so declare it foreign. Jesse Adkins (1): Purge cvs tags. --- .gitignore| 73 ChangeLog | 336 ++ Makefile.am | 16 README|6 configure.ac | 29 debian/changelog | 14 debian/control|4 debian/libxmu-headers.install |1 debian/rules | 10 debian/watch |1 doc/.gitignore|6 doc/Makefile.am | 62 doc/Xmu.xml | 4727 ++ doc/xlogo.svg | 45 include/Makefile.am |3 include/X11/Xmu/Atoms.h |3 include/X11/Xmu/CharSet.h |4 include/X11/Xmu/CloseHook.h |3 include/X11/Xmu/Converters.h |4 include/X11/Xmu/CurUtil.h |3 include/X11/Xmu/CvtCache.h|3 include/X11/Xmu/DisplayQue.h |3 include/X11/Xmu/Drawing.h |3 include/X11/Xmu/Editres.h |3 include/X11/Xmu/EditresP.h|3 include/X11/Xmu/Error.h |3 include/X11/Xmu/ExtAgent.h|3 include/X11/Xmu/Initer.h |3 include/X11/Xmu/Lookup.h |4 include/X11/Xmu/Misc.h|2 include/X11/Xmu/StdCmap.h |3 include/X11/Xmu/StdSel.h |3 include/X11/Xmu/SysUtil.h |9 include/X11/Xmu/WhitePoint.h |2 include/X11/Xmu/WidgetNode.h |3 include/X11/Xmu/WinUtil.h |3 include/X11/Xmu/Xct.h |3 include/X11/Xmu/Xmu.h | 10 src/AllCmap.c |3 src/Atoms.c |3 src/ClientWin.c |3 src/Clip.c|1 src/CloseHook.c |3 src/CmapAlloc.c |3 src/CrCmap.c |3 src/CrPixFBit.c |3 src/CursorName.c |3 src/CvtCache.c|3 src/CvtStdSel.c |4 src/DefErrMsg.c |4 src/DelCmap.c |3 src/DisplayQue.c |3 src/Distinct.c
libxmu: Changes to 'debian-unstable'
.gitignore| 73 ChangeLog | 336 ++ Makefile.am | 16 README|6 configure.ac | 29 debian/changelog | 14 debian/control|4 debian/libxmu-headers.install |1 debian/rules | 10 doc/.gitignore|6 doc/Makefile.am | 62 doc/Xmu.xml | 4727 ++ doc/xlogo.svg | 45 include/Makefile.am |3 include/X11/Xmu/Atoms.h |3 include/X11/Xmu/CharSet.h |4 include/X11/Xmu/CloseHook.h |3 include/X11/Xmu/Converters.h |4 include/X11/Xmu/CurUtil.h |3 include/X11/Xmu/CvtCache.h|3 include/X11/Xmu/DisplayQue.h |3 include/X11/Xmu/Drawing.h |3 include/X11/Xmu/Editres.h |3 include/X11/Xmu/EditresP.h|3 include/X11/Xmu/Error.h |3 include/X11/Xmu/ExtAgent.h|3 include/X11/Xmu/Initer.h |3 include/X11/Xmu/Lookup.h |4 include/X11/Xmu/Misc.h|2 include/X11/Xmu/StdCmap.h |3 include/X11/Xmu/StdSel.h |3 include/X11/Xmu/SysUtil.h |9 include/X11/Xmu/WhitePoint.h |2 include/X11/Xmu/WidgetNode.h |3 include/X11/Xmu/WinUtil.h |3 include/X11/Xmu/Xct.h |3 include/X11/Xmu/Xmu.h | 10 src/AllCmap.c |3 src/Atoms.c |3 src/ClientWin.c |3 src/Clip.c|1 src/CloseHook.c |3 src/CmapAlloc.c |3 src/CrCmap.c |3 src/CrPixFBit.c |3 src/CursorName.c |3 src/CvtCache.c|3 src/CvtStdSel.c |4 src/DefErrMsg.c |4 src/DelCmap.c |3 src/DisplayQue.c |3 src/Distinct.c|3 src/DrRndRect.c |3 src/DrawLogo.c|3 src/EditresCom.c |3 src/ExtAgent.c|3 src/FToCback.c|3 src/GetHost.c |3 src/GrayPixmap.c |3 src/Initer.c |3 src/LocBitmap.c |3 src/Lookup.c |3 src/LookupCmap.c |3 src/Lower.c |4 src/RdBitF.c |3 src/ScrOfWin.c|3 src/ShapeWidg.c |3 src/StdCmap.c |3 src/StrToBS.c |4 src/StrToBmap.c |3 src/StrToCurs.c |4 src/StrToGrav.c |3 src/StrToJust.c |4 src/StrToLong.c |3 src/StrToOrnt.c |4 src/StrToShap.c |3 src/StrToWidg.c |3 src/UpdMapHint.c |3 src/VisCmap.c |3 src/WidgetNode.c |4 src/Xct.c |3 src/sharedlib.c |3 82 files changed, 5295 insertions(+), 261 deletions(-) New commits: commit 0eef98205771d69cea4123f631929e227333a8c0 Author: Cyril Brulebois Date: Fri Nov 19 08:42:39 2010 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 95fe6a6..f837cc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxmu (2:1.1.0-1) UNRELEASED; urgency=low +libxmu (2:1.1.0-1) unstable; urgency=low * New upstream release. * Bump xutils-dev build-dep for new macros. @@ -10,7 +10,7 @@ libxmu (2:1.1.0-1) UNRELEASED; urgency=low * Kill *.xml in the doc directory, no point in shipping them. * Switch from --list-missing to --fail-missing for additional safety. - -- Cyril Brulebois Fri, 19 Nov 2010 01:49:07 +0100 + -- Cyril Brulebois Fri, 19 Nov 2010 08:42:29 +0100 libxmu (2:1.0.5-2) unstable; urgency=high commit 9346d182432efc8075e4ca5fa0abc352477ce097 Author: Cyril Brulebois Date: Fri Nov 19 08:41:27 2010 +0100 Switch from --list-missing to --fail-missing for additional safety. diff --git a/debian/changelog b/debian/changelog index 8eeefc2..95fe6a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ libxmu (2:1.1.0-1) UNRELEASED; urgency=low libxmu-headers.install file. * Remove the hardcoded path to the X logo in the Xmu.html file. * Kill *.xml in the doc directory, no point in shipping them. + * Switch from --list-missing to --fail-missing for additional safety. -- Cyril Brulebois Fri, 19 Nov 2010 01:49:07 +0100 diff --git a/debian/rules b/debian/rules index 122c2b9..faf789d 100755 --- a/debian/rules +++ b/debian/rules @@ -83,7 +83,7 @@ binary-arch: install dh_testroot dh_installdocs -s - dh_install -s -
libxmu: Changes to 'upstream-unstable'
.gitignore | 73 INSTALL | 229 -- Makefile.am | 16 README |6 configure.ac | 29 doc/.gitignore |6 doc/Makefile.am | 62 doc/Xmu.xml | 4727 +++ doc/xlogo.svg| 45 include/Makefile.am |3 include/X11/Xmu/Atoms.h |3 include/X11/Xmu/CharSet.h|4 include/X11/Xmu/CloseHook.h |3 include/X11/Xmu/Converters.h |4 include/X11/Xmu/CurUtil.h|3 include/X11/Xmu/CvtCache.h |3 include/X11/Xmu/DisplayQue.h |3 include/X11/Xmu/Drawing.h|3 include/X11/Xmu/Editres.h|3 include/X11/Xmu/EditresP.h |3 include/X11/Xmu/Error.h |3 include/X11/Xmu/ExtAgent.h |3 include/X11/Xmu/Initer.h |3 include/X11/Xmu/Lookup.h |4 include/X11/Xmu/Misc.h |2 include/X11/Xmu/StdCmap.h|3 include/X11/Xmu/StdSel.h |3 include/X11/Xmu/SysUtil.h|9 include/X11/Xmu/WhitePoint.h |2 include/X11/Xmu/WidgetNode.h |3 include/X11/Xmu/WinUtil.h|3 include/X11/Xmu/Xct.h|3 include/X11/Xmu/Xmu.h| 10 src/AllCmap.c|3 src/Atoms.c |3 src/ClientWin.c |3 src/Clip.c |1 src/CloseHook.c |3 src/CmapAlloc.c |3 src/CrCmap.c |3 src/CrPixFBit.c |3 src/CursorName.c |3 src/CvtCache.c |3 src/CvtStdSel.c |4 src/DefErrMsg.c |4 src/DelCmap.c|3 src/DisplayQue.c |3 src/Distinct.c |3 src/DrRndRect.c |3 src/DrawLogo.c |3 src/EditresCom.c |3 src/ExtAgent.c |3 src/FToCback.c |3 src/GetHost.c|3 src/GrayPixmap.c |3 src/Initer.c |3 src/LocBitmap.c |3 src/Lookup.c |3 src/LookupCmap.c |3 src/Lower.c |4 src/RdBitF.c |3 src/ScrOfWin.c |3 src/ShapeWidg.c |3 src/StdCmap.c|3 src/StrToBS.c|4 src/StrToBmap.c |3 src/StrToCurs.c |4 src/StrToGrav.c |3 src/StrToJust.c |4 src/StrToLong.c |3 src/StrToOrnt.c |4 src/StrToShap.c |3 src/StrToWidg.c |3 src/UpdMapHint.c |3 src/VisCmap.c|3 src/WidgetNode.c |4 src/Xct.c|3 src/sharedlib.c |3 78 files changed, 4932 insertions(+), 488 deletions(-) New commits: commit 5d9b0896bfdfe60656a2d806a06e17c7adf335b5 Author: Alan Coopersmith Date: Fri Oct 29 16:52:54 2010 -0700 libXmu 1.1.0 Signed-off-by: Alan Coopersmith diff --git a/configure.ac b/configure.ac index c75a452..69ea570 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.60]) AC_INIT([libXmu], -[1.0.5], +[1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXmu]) commit 28f4666ad88ab736f52c1cb16674226f14bc2a15 Author: Alan Coopersmith Date: Thu Oct 28 12:24:30 2010 -0700 Remove unnecessary calls from configure.ac AC_PROG_CC is handled by XORG_DEFAULT_OPTIONS AC_SUBST of *_LIBS & *_CFLAGS are handled by PKG_CHECK_MODULES Signed-off-by: Alan Coopersmith diff --git a/configure.ac b/configure.ac index 5ed4864..c75a452 100644 --- a/configure.ac +++ b/configure.ac @@ -30,16 +30,10 @@ AM_CONFIG_HEADER([config.h]) # Checks for programs. AC_PROG_LIBTOOL -AC_PROG_CC # Checks for pkg-config packages PKG_CHECK_MODULES(XMU, xt xext x11 xextproto) -AC_SUBST(XMU_CFLAGS) -AC_SUBST(XMU_LIBS) - PKG_CHECK_MODULES(XMUU, x11) -AC_SUBST(XMUU_CFLAGS) -AC_SUBST(XMUU_LIBS) # CvtStdSel.c needs to know which network transports to build hostname # conversion routines for commit 1ab19053c75b44be9c49700b1190dd5d8da152ce Author: Jesse Adkins Date: Tue Sep 28 13:30:03 2010 -0700 Purge cvs tags. Signed-off-by: Jesse Adkins Signed-off-by: Alan Coopersmith diff --git a/include/X11/Xmu/Atoms.h b/include/X11/Xmu/Atoms.h index f7b4c8f..3d86910 100644 --- a/include/X11/Xmu/Atoms.h +++ b/include/X11/Xmu/Atoms.h @@ -1,5 +1,3 @@ -/* $Xorg: Atoms.h,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior wr
mesa: Changes to 'debian-experimental'
configure.ac| 29 +++-
debian/changelog|6 +
debian/watch|2 -
src/gallium/auxiliary/rtasm/rtasm_execmem.c |2 -
src/gallium/include/pipe/p_config.h |2 -
src/mesa/drivers/osmesa/Makefile|2 -
src/mesa/main/compiler.h|3 +-
7 files changed, 28 insertions(+), 18 deletions(-)
New commits:
commit 537176fae783f738e97f1c3be5a448753c9f9cf9
Author: Cyril Brulebois
Date: Fri Nov 19 08:58:06 2010 +0100
Specify PASV in watch file, and mangle +repack.
diff --git a/configure.ac b/configure.ac
index 2f3a47a..3c70ea5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -591,6 +591,13 @@ else
enable_xcb=no
fi
+dnl Direct rendering or just indirect rendering
+AC_ARG_ENABLE([driglx-direct],
+[AS_HELP_STRING([--disable-driglx-direct],
+[enable direct rendering in GLX and EGL for DRI
@<:@default=enabled@:>@])],
+[driglx_direct="$enableval"],
+[driglx_direct="yes"])
+
dnl
dnl libGL configuration per driver
dnl
@@ -624,12 +631,14 @@ dri)
AC_MSG_ERROR([Can't use static libraries for DRI drivers])
fi
-# Check for libdrm
-PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])
-PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])
-PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
-GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >=
$DRI2PROTO_REQUIRED glproto >= $GLPROTO_REQUIRED"
-DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
+if test x"$driglx_direct" = xyes; then
+# Check for libdrm
+PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])
+PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])
+PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
+GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >=
$DRI2PROTO_REQUIRED glproto >= $GLPROTO_REQUIRED"
+DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
+fi
# find the DRI deps for libGL
if test "$x11_pkgconfig" = yes; then
@@ -726,12 +735,6 @@ AC_ARG_WITH([dri-searchpath],
[DRI_DRIVER_SEARCH_DIR="$withval"],
[DRI_DRIVER_SEARCH_DIR='${DRI_DRIVER_INSTALL_DIR}'])
AC_SUBST([DRI_DRIVER_SEARCH_DIR])
-dnl Direct rendering or just indirect rendering
-AC_ARG_ENABLE([driglx-direct],
-[AS_HELP_STRING([--disable-driglx-direct],
-[enable direct rendering in GLX and EGL for DRI
@<:@default=enabled@:>@])],
-[driglx_direct="$enableval"],
-[driglx_direct="yes"])
dnl Which drivers to build - default is chosen by platform
AC_ARG_WITH([dri-drivers],
[AS_HELP_STRING([--with-dri-drivers@<:@=DIRS...@:>@],
@@ -848,7 +851,7 @@ if test "$mesa_driver" = dri; then
;;
esac
;;
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | kfreebsd*-gnu*)
DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"
diff --git a/debian/changelog b/debian/changelog
index b38d47d..162397d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (7.9+repack-2) UNRELEASED; urgency=low
+
+ * Specify PASV in watch file, and mangle +repack.
+
+ -- Cyril Brulebois Fri, 19 Nov 2010 08:55:53 +0100
+
mesa (7.9+repack-1) experimental; urgency=low
* Repack the upstream tarball to get rid of duplicate files which make dpkg
diff --git a/debian/watch b/debian/watch
index 89eb7db..605e3ba 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
#git=git://anongit.freedesktop.org/mesa/mesa
version=3
-opts="uversionmangle=s/-rc/~rc/" \
+opts="uversionmangle=s/-rc/~rc/,dversionmangle=s/\+repack//,pasv" \
ftp://freedesktop.org/pub/mesa/([\d\.]*)/ MesaLib-(.*)\.tar\.gz
diff --git a/src/gallium/auxiliary/rtasm/rtasm_execmem.c
b/src/gallium/auxiliary/rtasm/rtasm_execmem.c
index 65d5ce7..bd84532 100644
--- a/src/gallium/auxiliary/rtasm/rtasm_execmem.c
+++ b/src/gallium/auxiliary/rtasm/rtasm_execmem.c
@@ -37,7 +37,7 @@
#include "rtasm_execmem.h"
-#if defined(PIPE_OS_BSD)
+#ifndef MAP_ANONYMOUS
#define MAP_ANONYMOUS MAP_ANON
#endif
diff --git a/src/gallium/include/pipe/p_config.h
b/src/gallium/include/pipe/p_config.h
index 74a1fa2..b0e5644 100644
--- a/src/gallium/include/pipe/p_config.h
+++ b/src/gallium/include/pipe/p_config.h
@@ -133,7 +133,7 @@
#define PIPE_OS_UNIX
#endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#define PIPE_OS_FREEBSD
#define PIPE_OS_BSD
#define PIPE_OS_UNIX
diff --git a/src/mesa/drivers/osmesa/Makefile b/src/mesa/drivers/osmesa/Makefile
index 39ab09a..1561ef2 100644
--- a/src/mesa/drivers/osmesa/Makefile
+++ b/src/mesa/drivers/osmesa/Makefile
@@ -37,7 +37,7 @@ default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
# -DCHAN_BITS=16/32.
$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECT
