Bug#412228: DRI modules loaded by defaul.
To avoid DRI and DRI2 module to load at Xorg initialization, you must add the following line to xorg.confg Disable dri Disable dri2 Howerver xorg will always load this modules by default. -- Francesco. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xterm 246-1 MIGRATED to testing
FYI: The status of the xterm source package in Debian's testing distribution has changed. Previous version: 244-2 Current version: 246-1 -- This email is automatically generated once a day. As the installation of new packages into testing happens multiple times a day you will receive later changes on the next day. See http://release.debian.org/testing-watch/ for more information. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#543512: update-fonts-alias should skip removed fonts
On Fri, Aug 28, 2009 at 12:16:02AM +0700, Theppitak Karoonboonyanan wrote:
Exclude list, probably:
- /etc/fonts/excluded-aliases lists *.alias files to be excluded.
- Patch update-fonts-alias to filter out the exclude list.
- Patch dh_installxfonts so that:
- package.postrm adds its *.alias to excluded-aliases
- package.postinst removes its *.alias from excluded-aliases if any.
This requires font packages to be rebuilt with the updated debhelper
to take effect. Unupdated packages still work as usual, just fail piuparts,
and get listed in fonts.alias even after they are removed (but not purged).
And here are the patches for debhelper and xfonts-utils. They have been
tested by rebuilding thaixfonts (with package.alias) and thaifonts-scalable
(without package.alias) and then emulating piuparts sequence against them
in a chroot.
--
Theppitak Karoonboonyanan
http://linux.thai.net/~thep/
Index: debhelper-7.4.0+nmu1/autoscripts/postinst-xfonts
===
--- debhelper-7.4.0+nmu1.orig/autoscripts/postinst-xfonts 2009-09-02 18:50:52.0 +0700
+++ debhelper-7.4.0+nmu1/autoscripts/postinst-xfonts 2009-09-02 19:23:36.0 +0700
@@ -1,3 +1,6 @@
+#ALIAS_BEGIN#
+#ALIAS_BODY#
+#ALIAS_END#
if which update-fonts-dir /dev/null 21; then
#CMDS#
fi
Index: debhelper-7.4.0+nmu1/autoscripts/postrm-xfonts
===
--- debhelper-7.4.0+nmu1.orig/autoscripts/postrm-xfonts 2009-09-02 18:51:02.0 +0700
+++ debhelper-7.4.0+nmu1/autoscripts/postrm-xfonts 2009-09-02 19:24:06.0 +0700
@@ -1,3 +1,6 @@
+#ALIAS_BEGIN#
+#ALIAS_BODY#
+#ALIAS_END#
if [ -x `which update-fonts-dir 2/dev/null` ]; then
#CMDS#
fi
Index: debhelper-7.4.0+nmu1/dh_installxfonts
===
--- debhelper-7.4.0+nmu1.orig/dh_installxfonts 2009-09-02 18:50:35.0 +0700
+++ debhelper-7.4.0+nmu1/dh_installxfonts 2009-09-02 21:54:29.0 +0700
@@ -60,20 +60,36 @@
if (@fontdirs) {
# Figure out what commands the postinst and postrm will need
# to call.
- my @cmds;
+ my @cmds, my @alias_postinst, my @alias_postrm;
+ my $alias_begin=/#ALIAS_BEGIN#/d;
+ my $alias_postinst_body=/#ALIAS_BODY#/d;
+ my $alias_postrm_body=/#ALIAS_BODY#/d;
+ my $alias_end=/#ALIAS_END#/d;
+ my $alias_exclude=/etc/fonts/excluded-aliases;
foreach my $f (@fontdirs) {
# This must come before update-fonts-dir.
push @cmds, update-fonts-scale $f
if -f $tmp/etc/X11/fonts/$f/$package.scale;
push @cmds, update-fonts-dir --x11r7-layout $f;
- push @cmds, update-fonts-alias $f
-if -f $tmp/etc/X11/fonts/$f/$package.alias;
+ if (-f $tmp/etc/X11/fonts/$f/$package.alias) {
+push @cmds, update-fonts-alias $f;
+push @alias_postinst, \tsed -i \',/etc/X11/fonts/$f/$package.alias,d\' $alias_exclude;
+push @alias_postrm, \tsed -i \',/etc/X11/fonts/$f/$package.alias,d\' $alias_exclude;
+push @alias_postrm, \techo /etc/X11/fonts/$f/$package.alias $alias_exclude;
+ }
+ }
+
+ if (@alias_postinst) {
+ $alias_begin=s:#ALIAS_BEGIN#:if [ -f $alias_exclude ]; then:;
+ $alias_postinst_body=s:#ALIAS_BODY#:.join(n, @alias_postinst).:;
+ $alias_postrm_body=s:#ALIAS_BODY#:.join(n, @alias_postrm).:;
+ $alias_end=s:#ALIAS_END#:fi:;
}
autoscript($package, postinst, postinst-xfonts,
- s:#CMDS#:.join(;, @cmds).:;);
+ s:#CMDS#:.join(;, @cmds).:;$alias_begin;$alias_postinst_body;$alias_end;);
autoscript($package, postrm, postrm-xfonts,
- s:#CMDS#:.join(;, @cmds).:;);
+ s:#CMDS#:.join(;, @cmds).:;$alias_begin;$alias_postrm_body;$alias_end;);
addsubstvar($package, misc:Depends, xfonts-utils);
}
Index: xfonts-utils-7.4+2/debian/local/update-fonts-alias
===
--- xfonts-utils-7.4+2.orig/debian/local/update-fonts-alias 2009-09-02 22:11:23.0 +0700
+++ xfonts-utils-7.4+2/debian/local/update-fonts-alias 2009-09-02 22:21:28.0 +0700
@@ -129,30 +129,33 @@
continue
fi
-# Are there any files to process?
-if [ $(echo $ETCDIR/*.alias $ETC7DIR/*.alias) != $ETCDIR/*.alias $ETC7DIR/*.alias ]
-then
-if [ -n $X11R7DIR ] [ -d $X11R7DIR ]; then
-# Write the new alias file in a temporary location in case we are
-# interrupted.
-cat $X11R7DIR/fonts.alias.update-new EOF
+if [ -n $X11R7DIR ] [ -d $X11R7DIR ]; then
+# Write the new alias file in a temporary location in case we are
+# interrupted.
+cat $X11R7DIR/fonts.alias.update-new EOF
!! fonts.alias -- automatically generated file. DO NOT EDIT.
!! To modify, see update-fonts-alias(8).
EOF
-for FILE in $ETCDIR/*.alias $ETC7DIR/*.alias; do
-[ -e $FILE ] || continue
-echo !! $FILE $X11R7DIR/fonts.alias.update-new
-cat $FILE
MESA glut package?
Hi, Is there any MESA glut package available? We have an application that we are trying to port to debian but is uses off-screen rendering with the original GLUT lib from an old mesa pacakge. It would be really really interesting to have the choice between freeglut VS MESA glut since freeglut does not allow rendering without an X. Help appreciated! Thnx! - vin
Bug#543512: update-fonts-alias should skip removed fonts
Theppitak Karoonboonyanan wrote: + push @alias_postinst, \tsed -i \',/etc/X11/fonts/$f/$package.alias,d\' $alias_exclude; + push @alias_postrm, \tsed -i \',/etc/X11/fonts/$f/$package.alias,d\' $alias_exclude; I have a rule of thumb: When you have to put more than two backslashes in a row in your code, you're doing something wrong. My first suggestion would be that update-fonts-alias be passed the file to exclude and handle whatever bookkeeping (exclude list or whatever) it needs to, instead of requiring maintainer scripts sed it and get it right. That seems the most maintainable. Alternatively, putting this code in the autoscript file itself, and just substituting in the name of the alias file, should eliminate much of the obvious ugliness. -- see shy jo signature.asc Description: Digital signature
Re: MESA glut package?
On Wed, Sep 2, 2009 at 13:43:24 -0400, Fortier,Vincent [Montreal] wrote: Hi, Is there any MESA glut package available? We have an application that we are trying to port to debian but is uses off-screen rendering with the original GLUT lib from an old mesa pacakge. It would be really really interesting to have the choice between freeglut VS MESA glut since freeglut does not allow rendering without an X. No, we don't build Mark Kilgard's glut, which is included in mesa. AFAICT there used to be a separate glut package with this, but it got replaced with freeglut in 2004. Cheers, Julien -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#544754: xserver-xorg-video-radeon: DRI does't work: fail to load firmware RS690. And instability when install firmware-linux package.
Thomas Pierson wrote: Why the firmware-linux package is not include with the xserver-xorg-video-radeon package? The firmware is non-free, so it can't go in Debian main packages (where the video-radeon package is). Also the firmware originally comes from the kerneland not from the radeon driver anyway (the kernel is loading the firmware when needed, the user-space X driver doesn't know about it) . Is this instability result of a actual development or a bad configuration/association between these 2 package? Is my configuration correct? You don't have any xorg.conf configuration file, so there's nothing wrong with it :) There's no incompatibility between firmware-linux and the radeon driver. But installing the former enables DRI in the latter. So you get more chances of using some code that's not very stable yet. I don't know if DRI for RS690 is supposed to be stable nowadays, I hope Alex will answer this. Brice -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#544754: xserver-xorg-video-radeon: DRI does't work: fail to load firmware RS690. And instability when install firmware-linux package.
On Wed, Sep 2, 2009 at 20:35:19 +, Thomas Pierson wrote: So I have some questions : Why the firmware-linux package is not include with the xserver-xorg-video-radeon package? Because it belongs with the kernel, not the X driver. And it's in a separate package because Debian ships sourceless firmware in the non-free archive, not in main. Is this instability result of a actual development or a bad configuration/association between these 2 package? Is my configuration correct? No clue about these. What version of libgl1-mesa-dri are you using? Can you post X and kernel logs where firmware-linux is installed? Cheers, Julien -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#544754: xserver-xorg-video-radeon: DRI does't work: fail to load firmware RS690. And instability when install firmware-linux package.
On Wed, Sep 2, 2009 at 3:09 PM, Brice Goglinbrice.gog...@ens-lyon.org wrote: Thomas Pierson wrote: Why the firmware-linux package is not include with the xserver-xorg-video-radeon package? The firmware is non-free, so it can't go in Debian main packages (where the video-radeon package is). Also the firmware originally comes from the kerneland not from the radeon driver anyway (the kernel is loading the firmware when needed, the user-space X driver doesn't know about it) . Is this instability result of a actual development or a bad configuration/association between these 2 package? Is my configuration correct? You don't have any xorg.conf configuration file, so there's nothing wrong with it :) There's no incompatibility between firmware-linux and the radeon driver. But installing the former enables DRI in the latter. So you get more chances of using some code that's not very stable yet. I don't know if DRI for RS690 is supposed to be stable nowadays, I hope Alex will answer this. Yes DRI on rs690 is stable. Alex -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#531771: xkb-data: level 3 switch not working anymore
Hello, same bug for me on a Logitech Keyboard with danish layout. What exactly is needed to workaround this bug? Downgrading to Lenny's xkb-data version and restarting X was not enough for me. I also tried to set different values in XKBOPTIONS of /etc/default/console-setup, but no luck. (Feel free to remove this noise message once this bug report includes the steps to workaround) Thanks, Loris -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Processed: Changing email addresses.
Processing commands for cont...@bugs.debian.org: submitter 204325 che...@visi.com Bug #204325 [perl] rename: return code /w failed renames is true. Changed Bug submitter to 'che...@visi.com' from 'Mike Mestnik cheako...@yahoo.com' submitter 215326 che...@visi.com Bug #215326 [dillo] dillo: Leaks memory, and on new browser it forks /wo cleaning up first. Changed Bug submitter to 'che...@visi.com' from 'cheako...@yahoo.com' submitter 231964 che...@visi.com Bug #231964 [privoxy] privoxy: Not sutable for large or medium networks. Changed Bug submitter to 'che...@visi.com' from 'cheako...@yahoo.com' submitter 236657 che...@visi.com Bug #236657 [x2x] x2x: with multihead from display full to display not accesable (invers of 191350) Changed Bug submitter to 'che...@visi.com' from 'cheako...@yahoo.com' submitter 243578 che...@visi.com Bug #243578 [gtk-gnutella] gtk-gnutella: TOS settings on some upload sockets is incorectly set. Changed Bug submitter to 'che...@visi.com' from 'cheako...@yahoo.com' submitter 246321 che...@visi.com Bug #246321 [interchange-ui] configure: Starting Interchange Server: su. Changed Bug submitter to 'che...@visi.com' from 'cheako...@yahoo.com' submitter 246361 che...@visi.com Bug #246361 [interchange] interchange: Wrong PID in pidfile, it is one too fue. Changed Bug submitter to 'che...@visi.com' from 'cheako...@yahoo.com' submitter 260752 che...@visi.com Bug #260752 [xcdroast] xcdroast: Speed 0 is not, let cdrecord, auto detect speed, it's 1x. Changed Bug submitter to 'che...@visi.com' from 'cheako...@yahoo.com' submitter 274623 che...@visi.com Bug #274623 [prelink] prelink: Unknown fatal error at src/layout.c:538. Changed Bug submitter to 'che...@visi.com' from 'cheako...@yahoo.com' submitter 286759 che...@visi.com Bug #286759 [foomatic-filters] foo-rip: PPD: *Include directive ignored? Changed Bug submitter to 'che...@visi.com' from 'cheako...@yahoo.com' submitter 310417 che...@visi.com Bug #310417 [perl-modules] libnet-perl: Net/Cmd.pm(354) uninitialized value - Net/NNTP.pm(673) Argument isn't numeric. Changed Bug submitter to 'che...@visi.com' from 'cheako...@yahoo.com' submitter 217207 che...@visi.com Bug #217207 [mozilla-mailnews] mozilla-mailnews: KeepMailOnServer /w RemoveRemoveWRL, msg not RR when filtered. Changed Bug submitter to 'che...@visi.com' from 'Mike Mestnik cheako...@yahoo.com' submitter 275541 che...@visi.com Bug #275541 [procps] procps: watch -d doesn't handel lines being removed effectivly(diff -B). Changed Bug submitter to 'che...@visi.com' from 'cheako...@yahoo.com' submitter 149680 che...@visi.com Bug #149680 [iproute] Trailing whitespace when listing tc qdiscs. Changed Bug submitter to 'che...@visi.com' from 'Mike Mestnik cheako...@yahoo.com' submitter 268356 che...@visi.com Bug #268356 [snmpd] Updated avc802dot11 MIB Changed Bug submitter to 'che...@visi.com' from 'Mike Mestnik cheako...@yahoo.com' submitter 149706 che...@visi.com Bug #149706 [xqf] xqf should treat game type as case sensitive, making it lower case when it calles the game. Changed Bug submitter to 'che...@visi.com' from 'Mike Mestnik cheako...@yahoo.com' submitter 202534 che...@visi.com Bug #202534 [ssh] ssh: XAUTHORITY not set for su. Changed Bug submitter to 'che...@visi.com' from 'Mike Mestnik cheako...@yahoo.com' submitter 206044 che...@visi.com Bug #206044 [sawfish] sawfish: dose not treat nautils desktop icons as, clicable, windows. Changed Bug submitter to 'che...@visi.com' from 'Mike Mestnik cheako...@yahoo.com' submitter 214029 che...@visi.com Bug #214029 [arpwatch] arpwatch: Cisco's bogus flip flop. Changed Bug submitter to 'che...@visi.com' from 'cheako...@yahoo.com' submitter 215632 che...@visi.com Bug #215632 [xcdroast] xcdroast: Should close tray when closing burnscreen or exit. Changed Bug submitter to 'che...@visi.com' from 'cheako...@yahoo.com' submitter 217194 che...@visi.com Bug #217194 [oidentd] oident: oidentd: Setup is too complex in nat/masq case. Changed Bug submitter to 'che...@visi.com' from 'Mike Mestnik cheako...@yahoo.com' submitter 220528 che...@visi.com Bug #220528 [nestra] nestra: There is no sound support. Changed Bug submitter to 'che...@visi.com' from 'cheako...@yahoo.com' submitter 225194 che...@visi.com Bug #225194 [wget] wget -c: Could use a overlapping or checksums to varify content. Changed Bug submitter to 'che...@visi.com' from 'cheako...@yahoo.com' submitter 236950 che...@visi.com Bug #236950 [razor] razor-report: Reports mozilla deleted mail from mozilla mbox file. Changed Bug submitter to 'che...@visi.com' from 'cheako...@yahoo.com' submitter 243567 che...@visi.com Bug #243567 [net-tools] /bin/netstat: netstat: Dosen't report TOS or socket options. Changed Bug submitter to 'che...@visi.com' from 'cheako...@yahoo.com' submitter 244101 che...@visi.com Bug #244101 [ifupdown] Please provide logical interface name to up/down commands Changed Bug submitter to 'che...@visi.com' from 'cheako...@yahoo.com'
xkb-data: Changes to 'debian-unstable'
debian/NEWS |2 +- debian/changelog |7 --- debian/compat|2 +- debian/control |4 ++-- debian/rules |4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-) New commits: commit 9f64961ef09f3f6f576f08cc23158e11bdca47d1 Author: David Nusinow dnusi...@debian.org Date: Wed Sep 2 21:34:07 2009 -0400 Fix whitespace in NEWS entry diff --git a/debian/NEWS b/debian/NEWS index 77d7814..b14e13b 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -5,6 +5,6 @@ xkeyboard-config (1.6-2) unstable; urgency=low would like to re-enable this feature, you may do so in your desktop's Keyboard Preferences application. You may also enable it for the current session using the command - setxkbmap -option terminate:ctrl_alt_bksp. +setxkbmap -option terminate:ctrl_alt_bksp. -- David Nusinow dnusi...@debian.org Tue, 25 Aug 2009 12:52:38 -0400 commit b727063edd684fbd2dd6146478e3defece169545 Author: David Nusinow dnusi...@debian.org Date: Wed Sep 2 21:26:46 2009 -0400 Bump debhelper build-dep to 7 diff --git a/debian/control b/debian/control index 593cf02..b7fef9e 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: extra Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: Mohammed Adnène Trojette adn+...@diwi.org, Julien Cristau jcris...@debian.org -Build-Depends: debhelper (= 5.0.0), quilt +Build-Depends: debhelper (= 7.0.0), quilt Build-Depends-Indep: libxml-parser-perl, x11-xkb-utils, automake, intltool, libglib2.0-dev Standards-Version: 3.8.3.0 Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xkb-data commit d3b24dc3f3c2d59beffe65f8271902c0a99d9d77 Author: David Nusinow dnusi...@debian.org Date: Wed Sep 2 21:20:42 2009 -0400 Update standards version to 3.8.3.0. No changes necessary. diff --git a/debian/changelog b/debian/changelog index b234f75..36c816c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ xkeyboard-config (1.6-2) UNRELEASED; urgency=low * Update xsfbs to 5693792171d885769e58d053c08b11acd12a * Update to debhelper version 7 + Fix up dh_clean calls + * Update standards version to 3.8.3.0. No changes necessary. [ Julien Cristau ] * Don't install base.xml in /etc/X11/xkb. Modifying this creates more diff --git a/debian/control b/debian/control index 01df4b4..593cf02 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: Mohammed Adnène Trojette adn+...@diwi.org, Julien Cristau jcris...@debian.org Build-Depends: debhelper (= 5.0.0), quilt Build-Depends-Indep: libxml-parser-perl, x11-xkb-utils, automake, intltool, libglib2.0-dev -Standards-Version: 3.8.1 +Standards-Version: 3.8.3.0 Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xkb-data Vcs-Browser: http://git.debian.org/?p=pkg-xorg/data/xkb-data.git Homepage: http://www.freedesktop.org/Software/XKeyboardConfig commit 3c76eadca60c8c8a0380f3fe290db21e7fe615fe Author: David Nusinow dnusi...@debian.org Date: Wed Sep 2 21:14:44 2009 -0400 Update to debhelper version 7 Fix up dh_clean calls diff --git a/debian/changelog b/debian/changelog index 7098317..b234f75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ xkeyboard-config (1.6-2) UNRELEASED; urgency=low [ David Nusinow ] * Add a note about re-enabling ctrl-alt-backspace killing to NEWS.Debian. * Update xsfbs to 5693792171d885769e58d053c08b11acd12a + * Update to debhelper version 7 ++ Fix up dh_clean calls [ Julien Cristau ] * Don't install base.xml in /etc/X11/xkb. Modifying this creates more diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/rules b/debian/rules index d237d45..7a61b23 100755 --- a/debian/rules +++ b/debian/rules @@ -18,6 +18,7 @@ endif xkb_base := /usr/share/X11/xkb configure: $(STAMP_DIR)/patch + dh_prep intltoolize -c -f autoreconf -vfi @@ -49,10 +50,10 @@ clean: xsfclean -rm -f intltool-extract intltool-merge intltool-update -rm -f rules/base.xml -rm -f po/.intltool-merge-cache config.status.lineno - dh_clean rm -f compat/compat.dir geometry/geometry.dir keycodes/keycodes.dir rm -f keymap/keymap.dir symbols/symbols.dir types/types.dir rules/base rm -f rules/compat/base.l[2-4]*.part rules/compat/base.m*.part + dh_clean deb: dpkg-buildpackage -rfakeroot -i'/\.git|/\.svn' @@ -70,7 +71,6 @@ dir: install: build dh_testdir dh_testroot - dh_clean -k dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/xkb-data commit 7040420121b63ddcd9661c814d2f63e8bb72b55b Author: David Nusinow dnusi...@debian.org Date: Wed Sep 2 21:05:38 2009 -0400 Fix up changelog a bit diff --git a/debian/changelog b/debian/changelog index
xfonts-base: Changes to 'debian-unstable'
debian/README.source | 73 +++
debian/changelog |8 +
debian/control|4
debian/xsfbs/xsfbs.mk |4
debian/xsfbs/xsfbs.sh | 241 --
5 files changed, 81 insertions(+), 249 deletions(-)
New commits:
commit b68834a71e5e73865dbb51885884793348a3ad0f
Author: David Nusinow dnusi...@debian.org
Date: Wed Sep 2 21:57:53 2009 -0400
Remove note about requiring this package for the X server to work.
Thanks Piotr Engelking. Closes: #534499
diff --git a/debian/changelog b/debian/changelog
index fcc60ef..385fa78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xfonts-base (1:1.0.0-7) UNRELEASED; urgency=low
* Update xsfbs to 5693792171d885769e58d053c08b11acd12a
+ * Remove note about requiring this package for the X server to work.
+Thanks Piotr Engelking. Closes: #534499
-- David Nusinow dnusi...@debian.org Wed, 26 Aug 2009 23:32:33 -0400
diff --git a/debian/control b/debian/control
index 493cd65..6f70858 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,3 @@ Description: standard fonts for X
xfonts-base provides a standard set of low-resolution bitmapped fonts. In
most cases it is desirable to have the X font server (xfs) and/or an X server
installed to make the fonts available to X clients.
- .
- If you are not using a remote font server, you must install this package
- if you are installing an X server. It contains fonts, including the
- 'fixed' font, without which X servers will not work.
commit 3d0890a5191f07e64a504c2773fbc84211985ee7
Author: David Nusinow dnusi...@debian.org
Date: Wed Aug 26 23:32:33 2009 -0400
Update xsfbs to 5693792171d885769e58d053c08b11acd12a
diff --git a/debian/changelog b/debian/changelog
index d10f012..fcc60ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xfonts-base (1:1.0.0-7) UNRELEASED; urgency=low
+
+ * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
+
+ -- David Nusinow dnusi...@debian.org Wed, 26 Aug 2009 23:32:33 -0400
+
xfonts-base (1:1.0.0-6) unstable; urgency=low
* Drop paragraph about xfonts-base-transcoded from the description. That
commit 5693792171d885769e58d053c08b11acd12a
Author: Julien Cristau jcris...@debian.org
Date: Wed Aug 26 18:53:36 2009 +0200
xsfbs.mk: no need for shlibs.local
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
#debian/*.prerm
$@
-# Generate the shlibs.local file.
-debian/shlibs.local:
- cat debian/*.shlibs $@
-
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2/dev/null)
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)
commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau jcris...@debian.org
Date: Wed Aug 26 18:47:09 2009 +0200
xsfbs.sh: remove unused reject_whitespace function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
done
}
-reject_whitespace () {
- # syntax: reject_whitespace [ operand ]
- #
- # scan operand (typically a shell variable whose value cannot be trusted) for
- # whitespace characters and barf if any are found
- if [ -n $1 ]; then
-# does the operand contain any whitespace?
-if expr $1 : [[:space:]] /dev/null 21; then
- # can't use die(), because I want to avoid forward references
- echo $THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered
\
- possibly malicious garbage \$1\ 2
- exit $SHELL_LIB_THROWN_ERROR
-fi
- fi
-}
-
reject_unlikely_path_chars () {
# syntax: reject_unlikely_path_chars [ operand ... ]
#
commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau jcris...@debian.org
Date: Wed Aug 26 18:23:53 2009 +0200
xsfbs.sh: remove unused find_culprits function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-find_culprits () {
- local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
-msg
-
- reject_whitespace $1
- message Searching for overlapping packages...
- dpkg_info_dir=/var/lib/dpkg/info
- if [ -d $dpkg_info_dir ]; then
-if [ $(echo $dpkg_info_dir/*.list) != $dpkg_info_dir/*.list ]; then
- possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
-(xbase-clients|x11-common|xfs|xlibs))
- if [ -n $possible_culprits ]; then
-smoking_guns=$(grep -l $1 $possible_culprits || true)
-
