xserver-xorg-video-chips: Changes to 'debian-unstable'
ChangeLog | 25 +++++
debian/README.source | 73 +++++++++++++++
debian/changelog | 10 +-
debian/control | 2
debian/xserver-xorg-video-chips.install | 1
debian/xsfbs/xsfbs.sh | 12 --
man/chips.man | 2
src/ct_driver.c | 148 ++++----------------------------
8 files changed, 128 insertions(+), 145 deletions(-)
New commits:
commit b8feefe714ee3eb790fa4350b92e5a802e17751f
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Jul 21 18:31:10 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index ed60180..07ecba8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-chips (1:1.2.1-3) UNRELEASED; urgency=low
+xserver-xorg-video-chips (1:1.2.1-3) unstable; urgency=low
[ David Nusinow ]
* Remove 03_gen_pci_ids.diff. The server now uses an internal table to
@@ -9,7 +9,7 @@ xserver-xorg-video-chips (1:1.2.1-3) UNRELEASED; urgency=low
* Pull from upstream master up to commit 722267e9.
+ Fix PCI card probe and chipset detection, closes: #534397.
- -- Brice Goglin <bgoglin@debian.org> Tue, 21 Jul 2009 18:29:55 +0200
+ -- Brice Goglin <bgoglin@debian.org> Tue, 21 Jul 2009 18:31:02 +0200
xserver-xorg-video-chips (1:1.2.1-2) unstable; urgency=low
commit 157b476bfc144d96508435b2b9bd2b482442b6cc
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Jul 21 18:30:55 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index f90e6c8..1633dd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+commit 722267e99012d0b8bbd7f22eaeac99e85bf48e0c
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sun Jul 19 10:37:37 2009 +0200
+
+ Fix PCI card probe and chipset detection.
+
+ it appears that the chips&technologies X driver was partially broken
+ during libpciaccess conversion. Thanks to the analysis by Marien Swart
+ in bug #18122 and a similar fix by Mark Kettenis for the radeon
+ driver.
+
+ Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+
+commit 6c6b0933da2fb08e0804647f736b0155909d6348
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu May 28 14:51:29 2009 -0400
+
+ Remove useless loader symbol lists.
+
+commit a8d0e8c0665be8d1004458c464a453cf251823ce
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 9 16:26:30 2009 -0800
+
+ Remove xorgconfig & xorgcfg from See Also list in man page
+
commit 6380f6ac5924397c0be27198e9779971eb9b0086
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Dec 22 14:27:11 2008 +1000
diff --git a/debian/changelog b/debian/changelog
index beb435f..ed60180 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ xserver-xorg-video-chips (1:1.2.1-3) UNRELEASED; urgency=low
[ Brice Goglin ]
* Add README.source, bump Standards-Version to 3.8.2.
+ * Pull from upstream master up to commit 722267e9.
+ + Fix PCI card probe and chipset detection, closes: #534397.
- -- Brice Goglin <bgoglin@debian.org> Tue, 21 Jul 2009 18:27:30 +0200
+ -- Brice Goglin <bgoglin@debian.org> Tue, 21 Jul 2009 18:29:55 +0200
xserver-xorg-video-chips (1:1.2.1-2) unstable; urgency=low
commit f50aea27eb85e64663bc6e4964d738a8cbf23e7b
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Jul 21 18:27:57 2009 +0200
Adding README.source means we can bump Standards-Version
diff --git a/debian/changelog b/debian/changelog
index a238b06..beb435f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
xserver-xorg-video-chips (1:1.2.1-3) UNRELEASED; urgency=low
+ [ David Nusinow ]
* Remove 03_gen_pci_ids.diff. The server now uses an internal table to
pick a video card during autoconfig.
- -- David Nusinow <dnusinow@debian.org> Mon, 04 May 2009 21:47:51 -0400
+ [ Brice Goglin ]
+ * Add README.source, bump Standards-Version to 3.8.2.
+
+ -- Brice Goglin <bgoglin@debian.org> Tue, 21 Jul 2009 18:27:30 +0200
xserver-xorg-video-chips (1:1.2.1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0b07d76..f084535 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-chips
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-chips.git
commit 5e694ec7dc4f506cf80b074eb40139842872bf55
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Jul 21 18:27:08 2009 +0200
Don't try to install usr/share/xserver-xorg/pci/* anymore
diff --git a/debian/xserver-xorg-video-chips.install b/debian/xserver-xorg-video-chips.install
index a8fac35..daf7bfe 100644
--- a/debian/xserver-xorg-video-chips.install
+++ b/debian/xserver-xorg-video-chips.install
@@ -1,2 +1 @@
usr/lib/xorg/modules/drivers/*.so
-usr/share/xserver-xorg/pci/*
commit 722267e99012d0b8bbd7f22eaeac99e85bf48e0c
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Jul 19 10:37:37 2009 +0200
Fix PCI card probe and chipset detection.
it appears that the chips&technologies X driver was partially broken
during libpciaccess conversion. Thanks to the analysis by Marien Swart
in bug #18122 and a similar fix by Mark Kettenis for the radeon
driver.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 6ecc89e..998c590 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -480,14 +480,14 @@ static DisplayModeRec ChipsNTSCMode = {
{ PCI_VENDOR_CHIPSTECH, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }
static const struct pci_id_match chips_device_match[] = {
- CHIPS_DEVICE_MATCH(PCI_CHIP_65545, 0),
- CHIPS_DEVICE_MATCH(PCI_CHIP_65548, 0),
- CHIPS_DEVICE_MATCH(PCI_CHIP_65550, 0),
- CHIPS_DEVICE_MATCH(PCI_CHIP_65554, 0),
- CHIPS_DEVICE_MATCH(PCI_CHIP_65555, 0),
- CHIPS_DEVICE_MATCH(PCI_CHIP_68554, 0),
- CHIPS_DEVICE_MATCH(PCI_CHIP_69000, 0),
- CHIPS_DEVICE_MATCH(PCI_CHIP_69030, 0),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_65545, CHIPS_CT65545),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_65548, CHIPS_CT65548),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_65550, CHIPS_CT65550),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_65554, CHIPS_CT65554),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_65555, CHIPS_CT65555),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_68554, CHIPS_CT68554),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_69000, CHIPS_CT69000),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_69030, CHIPS_CT69030),
{ 0, 0, 0 },
};
#endif
@@ -722,7 +722,7 @@ chipsSetup(pointer module, pointer opts, int *errmaj, int *errmin)
if (!setupDone) {
setupDone = TRUE;
- xf86AddDriver(&CHIPS, module, 0);
+ xf86AddDriver(&CHIPS, module, HaveDriverFuncs);
/*
* Modules that this driver always requires can be loaded here
@@ -801,7 +801,6 @@ CHIPSPciProbe(DriverPtr drv, int entity_num, struct pci_device * dev,
intptr_t match_data)
{
ScrnInfoPtr pScrn = NULL;
- EntityInfoPtr pEnt;
CHIPSPtr cPtr;
/* Allocate a ScrnInfoRec and claim the slot */
@@ -822,12 +821,16 @@ CHIPSPciProbe(DriverPtr drv, int entity_num, struct pci_device * dev,
pScrn->FreeScreen = CHIPSFreeScreen;
pScrn->ValidMode = CHIPSValidMode;
+ if (!CHIPSGetRec(pScrn)) {
+ return FALSE;
+ }
+ cPtr = CHIPSPTR(pScrn);
+ cPtr->Chipset = match_data;
/*
* For cards that can do dual head per entity, mark the entity
* as sharable.
*/
- pEnt = xf86GetEntityInfo(entity_num);
- if (pEnt->chipset == CHIPS_CT69030) {
+ if (match_data == CHIPS_CT69030) {
CHIPSEntPtr cPtrEnt = NULL;
DevUnion *pPriv;
@@ -1102,7 +1105,11 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
for (i = 0; i<pScrn->numEntities; i++) {
cPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
if (cPtr->pEnt->resources) return FALSE;
- cPtr->Chipset = cPtr->pEnt->chipset;
+ /* If we are using libpciaccess this is already set in CHIPSPciProbe.
+ * If we are using something else we need to set it here.
+ */
+ if (!cPtr->Chipset)
+ cPtr->Chipset = cPtr->pEnt->chipset;
pScrn->chipset = (char *)xf86TokenToString(CHIPSChipsets,
cPtr->pEnt->chipset);
if ((cPtr->Chipset == CHIPS_CT64200) ||
commit 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jun 3 03:37:37 2009 +0200
Kill custom readlink function
This was needed for very, very old versions of debianutils.
Closes: #498890
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 197eb74..781826f 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,16 +303,6 @@ EOF
fi
}
-# we require a readlink command or shell function
-if ! which readlink > /dev/null 2>&1; then
- message "The readlink command was not found. Please install version" \
- "1.13.1 or later of the debianutils package."
- readlink () {
- # returns what symlink in $1 actually points to
- perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1"
- }
-fi
-
check_symlink () {
# syntax: check_symlink symlink
#
commit 6c6b0933da2fb08e0804647f736b0155909d6348
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 28 14:51:29 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 4bc5e68..6ecc89e 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -691,97 +691,6 @@ static const OptionInfoRec ChipsHiQVOptions[] = {
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
-/*
- * List of symbols from other modules that this module references. This
- * list is used to tell the loader that it is OK for symbols here to be
- * unresolved providing that it hasn't been told that they haven't been
- * told that they are essential via a call to xf86LoaderReqSymbols() or
- * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
- * unresolved symbols that are not required.
- */
-
-static const char *vgahwSymbols[] = {
- "vgaHWAllocDefaultRegs",
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWHBlankKGA",
- "vgaHWInit",
- "vgaHWLock",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWUnlock",
- "vgaHWVBlankKGA",
- "vgaHWddc1SetSpeedWeak",
- NULL
-};
-
-#ifdef XFree86LOADER
-static const char *miscfbSymbols[] = {
-#ifdef HAVE_XF1BPP
- "xf1bppScreenInit",
-#endif
-#ifdef HAVE_XF4BPP
- "xf4bppScreenInit",
-#endif
- "cfb8_16ScreenInit",
- NULL
-};
-#endif
-
-static const char *fbSymbols[] = {
- "fbScreenInit",
- "fbPictureInit",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAInit",
- "XAAInitDualFramebufferOverlay",
- "XAAStippleScanlineFuncMSBFirst",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-static const char *ddcSymbols[] = {
- "xf86DoEDID_DDC1",
- "xf86DoEDID_DDC2",
- "xf86PrintEDID",
- "xf86SetDDCproperties",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- "xf86I2CFindBus",
- "xf86I2CProbeAddress",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(chipsSetup);
@@ -821,14 +730,6 @@ chipsSetup(pointer module, pointer opts, int *errmaj, int *errmin)
*/
/*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
- LoaderRefSymLists(vgahwSymbols, miscfbSymbols, fbSymbols, xaaSymbols,
- ramdacSymbols, ddcSymbols, i2cSymbols,
- shadowSymbols, vbeSymbols, NULL);
-
- /*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
@@ -1182,7 +1083,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
/* The vgahw module should be loaded here when needed */
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
/* Allocate the ChipsRec driverPrivate */
if (!CHIPSGetRec(pScrn)) {
@@ -1225,7 +1125,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
#if 0
if (xf86LoadSubModule(pScrn, "int10")) {
xf86Int10InfoPtr pInt;
- xf86LoaderReqSymLists(int10Symbols, NULL);
#if 1
xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
pInt = xf86InitInt10(cPtr->pEnt->index);
@@ -1235,7 +1134,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
#endif
if (xf86LoadSubModule(pScrn, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols, NULL);
cPtr->pVbe = VBEInit(NULL,cPtr->pEnt->index);
}
@@ -1407,7 +1305,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
CHIPSFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymbols("xf1bppScreenInit", NULL);
break;
#endif
#ifdef HAVE_XF4BPP
@@ -1418,7 +1315,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
CHIPSFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymbols("xf4bppScreenInit", NULL);
break;
#endif
case 16:
@@ -1429,7 +1325,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
CHIPSFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymbols("cfb8_16bppScreenInit", NULL);
break;
}
default:
@@ -1439,7 +1334,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
CHIPSFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
break;
}
@@ -1450,7 +1344,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
CHIPSFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
if (cPtr->Flags & ChipsShadowFB) {
@@ -1460,7 +1353,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
CHIPSFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
if (cPtr->Accel.UseHWCursor) {
@@ -1470,7 +1362,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
CHIPSFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
if (cPtr->Flags & ChipsLinearSupport)
@@ -2029,8 +1920,6 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
Bool ddc_done = FALSE;
xf86MonPtr pMon;
- xf86LoaderReqSymLists(ddcSymbols, NULL);
-
if (cPtr->pVbe) {
if ((pMon
= xf86PrintEDID(vbeDoEDID(cPtr->pVbe, pVbeModule))) != NULL) {
@@ -2041,8 +1930,6 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
if (!ddc_done)
if (xf86LoadSubModule(pScrn, "i2c")) {
- xf86LoaderReqSymLists(i2cSymbols,NULL);
-
if (chips_i2cInit(pScrn)) {
if ((pMon = xf86PrintEDID(xf86DoEDID_DDC2(pScrn->scrnIndex,
cPtr->I2C))) != NULL)
@@ -3003,7 +2890,6 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, int flags)
}
if (xf86LoadSubModule(pScrn, "ddc")) {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
if (cPtr->pVbe)
xf86SetDDCproperties(pScrn,xf86PrintEDID(vbeDoEDID(cPtr->pVbe, NULL)));
}
@@ -3776,7 +3662,6 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int flags)
"Memory clock option not supported for this chipset\n");
if (xf86LoadSubModule(pScrn, "ddc")) {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
if (cPtr->pVbe)
xf86SetDDCproperties(pScrn,xf86PrintEDID(vbeDoEDID(cPtr->pVbe, NULL)));
}
commit 7deebf983f53c505bc25171ab77fdc408f250a6e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue May 26 15:58:19 2009 +0200
xsfbs: don't run dpkg --print-installation-architecture
This is deprecated in new dpkg, and had no users anyway.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 8840ff9..197eb74 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -57,8 +57,6 @@ EOF
exit $SHELL_LIB_USAGE_ERROR
fi
-ARCHITECTURE="$(dpkg --print-installation-architecture)"
-
if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
RECONFIGURE="true"
else
commit 4178d948cd66a938222d0d7c6353ee8d60229e40
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 25 20:08:50 2009 -0400
Add README.source
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..34ab4bf
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,73 @@
+------------------------------------------------------
+Quick Guide To Patching This Package For The Impatient
+------------------------------------------------------
+
+1. Make sure you have quilt installed
+2. Unpack the package as usual with "dpkg-source -x"
+3. Run the "patch" target in debian/rules
+4. Create a new patch with "quilt new" (see quilt(1))
+5. Edit all the files you want to include in the patch with "quilt edit"
+ (see quilt(1)).
+6. Write the patch with "quilt refresh" (see quilt(1))
+7. Run the "clean" target in debian/rules
+
+Alternatively, instead of using quilt directly, you can drop the patch in to
+debian/patches and add the name of the patch to debian/patches/series.
+
+------------------------------------
+Guide To The X Strike Force Packages
+------------------------------------
+
+The X Strike Force team maintains X packages in git repositories on
+git.debian.org in the pkg-xorg subdirectory. Most upstream packages
+are actually maintained in git repositories as well, so they often
+just need to be pulled into git.debian.org in a "upstream-*" branch.
+Otherwise, the upstream sources are manually installed in the Debian
+git repository.
+
+The .orig.tar.gz upstream source file could be generated this
+"upstream-*" branch in the Debian git repository but it is actually
+copied from upstream tarballs directly.
+
+Due to X.org being highly modular, packaging all X.org applications
+as their own independent packages would have created too many Debian
+packages. For this reason, some X.org applications have been grouped
+into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
+x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
+Most packages, including the X.org server itself and all libraries
+and drivers are, however maintained independently.
+
+The Debian packaging is added by creating the "debian-*" git branch
+which contains the aforementioned "upstream-*" branch plus the debian/
+repository files.
+When a patch has to be applied to the Debian package, two solutions
+are involved:
+* If the patch is available in one of the upstream branches, it
+ may be git'cherry-picked into the Debian repository. In this
+ case, it appears directly in the .diff.gz.
+* Otherwise, the patch is added to debian/patches/ which is managed
+ with quilt as documented in /usr/share/doc/quilt/README.source.
+
+quilt is actually invoked by the Debian X packaging through a larger
+set of scripts called XSFBS. XSFBS brings some other X specific
+features such as managing dependencies and conflicts due to the video
+and input driver ABIs.
+XSFBS itself is maintained in a separate repository at
+ git://git.debian.org/pkg-xorg/xsfbs.git
+and it is pulled inside the other Debian X repositories when needed.
+
+The XSFBS patching system requires a build dependency on quilt. Also
+a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
+so that the XSFBS patching occurs before the actual build. So the
+very first target of the build (likely the one running autoreconf)
+should depend on $(STAMP_DIR)/patch. It should also not depend on
+anything so that parallel builds are correctly supported (nothing
+should probably run while patching is being done). And finally, the
+clean target should depend on the xsfclean target so that patches
+are unapplied on clean.
+
+When the upstream sources contain some DFSG-nonfree files, they are
+listed in text files in debian/prune/ in the "debian-*" branch of
+the Debian repository. XSFBS' scripts then take care of removing
+these listed files during the build so as to generate a modified
+DFSG-free .orig.tar.gz tarball.
commit fa6396d6bf68b9a0154089146287245f9ad60a1e
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 25 21:31:03 2009 +0100
xsfbs: repack.sh needs to be executable
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
old mode 100644
new mode 100755
commit a8d0e8c0665be8d1004458c464a453cf251823ce
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 16:26:30 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/chips.man b/man/chips.man
index a0a9427..3f8cfe1 100644
--- a/man/chips.man
+++ b/man/chips.man
@@ -217,7 +217,7 @@ of what the BIOS is saying set this option to off. Don't set it to off
if a panel is connected.
Default: value probed by BIOS.
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.PP
You are also recommended to read the README.chips file that comes with all
__xservername__ distributions, which discusses the
Reply to: