ChangeLog | 7 debian/README.VCS-source | 8 debian/README.source | 30 debian/changelog | 54 + debian/compat | 2 debian/control | 43 - debian/overrides | 5 debian/patches/series | 1 debian/rules | 86 -- debian/xserver-xorg-video-openchrome.docs | 1 debian/xserver-xorg-video-openchrome.install | 3 debian/xserver-xorg-video-openchrome.lintian-overrides | 5 debian/xsfbs/repack.sh | 32 debian/xsfbs/xsfbs.mk | 285 ------- debian/xsfbs/xsfbs.sh | 622 ----------------- src/via_cursor.c | 7 src/via_dri.c | 21 src/via_driver.c | 18 src/via_id.c | 6 src/via_mode.c | 5 src/via_panel.c | 9 src/via_video.c | 1 22 files changed, 153 insertions(+), 1098 deletions(-)
New commits: commit e89235fe952070583c76f5c54597d3390e038bc0 Author: Julien Viard de Galbert <[email protected]> Date: Fri Feb 25 15:43:38 2011 +0100 Fixing git build package config diff --git a/debian/gbp.conf b/debian/gbp.conf index 4281d52..9a1a1bf 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,7 +1,7 @@ [DEFAULT] # the default branch for upstream sources -upstream-branch=upstream-unstable +upstream-branch=upstream-experimental # the default branch for the debian patch -debian-branch=debian-unstable +debian-branch=debian-experimental # enable pristine-tar support pristine-tar=true commit 4342d335dc431a507866b1cf19821efe902d1f03 Author: Julien Viard de Galbert <[email protected]> Date: Fri Feb 25 15:41:30 2011 +0100 Removed the dummy transitional package -via diff --git a/debian/changelog b/debian/changelog index a8958fb..0628a40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-openchrome (1:0.2.904+svn916-2) UNRELEASED; urgency=low * Adding debug package + * Removed the dummy transitional package -via -- Julien Viard de Galbert <[email protected]> Fri, 25 Feb 2011 15:37:21 +0100 diff --git a/debian/control b/debian/control index ff551f0..0e9b650 100644 --- a/debian/control +++ b/debian/control @@ -69,12 +69,3 @@ Description: X.Org X server -- VIA display driver -- debugging symbols and open-source drivers is to use this version of the driver. . This package contains debugging symbols for OpenChrome driver. - -Package: xserver-xorg-video-via -Architecture: i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64 lpia -Depends: - xserver-xorg-video-openchrome, - ${misc:Depends}, -Description: X.Org X server -- VIA display driver (dummy transitional package) - This transitional package helps users transition to the OpenChrome driver. - Once this package and its dependencies are installed you can safely remove it. commit 1a30bcbd0d5c27dd4d7a4ae620de94c6fc02fa03 Author: Cyril Brulebois <[email protected]> Date: Mon Feb 21 12:34:29 2011 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 5af331d..f7168ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-openchrome (1:0.2.904+svn916-1) UNRELEASED; urgency=low +xserver-xorg-video-openchrome (1:0.2.904+svn916-1) unstable; urgency=low * New upstream snapshot + 904: FIC CE2A1 @@ -14,7 +14,7 @@ xserver-xorg-video-openchrome (1:0.2.904+svn916-1) UNRELEASED; urgency=low thanks to Selim T. Erdogan (Closes: #614022) + 916: Add workaround for #177 ticket - -- Julien Viard de Galbert <[email protected]> Sun, 20 Feb 2011 14:00:15 +0100 + -- Julien Viard de Galbert <[email protected]> Mon, 21 Feb 2011 12:33:59 +0100 xserver-xorg-video-openchrome (1:0.2.904+svn891-1) unstable; urgency=low commit 4f1ec475618516ca62dd8c5961392fdbcf74f1e2 Author: Julien Viard de Galbert <[email protected]> Date: Sun Feb 20 14:02:51 2011 +0100 Add changelog entries for upstream's changes diff --git a/debian/changelog b/debian/changelog index d9aca75..5af331d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +xserver-xorg-video-openchrome (1:0.2.904+svn916-1) UNRELEASED; urgency=low + + * New upstream snapshot + + 904: FIC CE2A1 + + 905: MSI PM8M-V + + 906: Use DRICreatePCIBusID when available to create Bus ID string + + 907: Restore video interrupt flag + + 908: Fix hardware cursor for VX900 + + 909: Fix OpenGL application crash on VX900 chipset + + 912: Lenovo ThinkCenter E51 8714 (reported by José Jorge) + + 913: Fix VIA VB8001 Mini-ITX Board (P4M900) support + + 914: Add suport for Semp Informática Notebook IS 1462 (reported by Colin) + + 915: Fix #395 - revert ViaPanelGetSizeFromDDC renaming + thanks to Selim T. Erdogan (Closes: #614022) + + 916: Add workaround for #177 ticket + + -- Julien Viard de Galbert <[email protected]> Sun, 20 Feb 2011 14:00:15 +0100 + xserver-xorg-video-openchrome (1:0.2.904+svn891-1) unstable; urgency=low [ Julien Viard de Galbert ] commit c25bb04420ea4035bc70b8c9c7079554cbd55c8b Author: gang65 <gang65@e8d65cb0-85f4-0310-8831-c60e2a5ce829> Date: Sun Feb 20 11:43:03 2011 +0000 Add workaround for #177 ticket git-svn-id: http://svn.openchrome.org/svn/trunk@916 e8d65cb0-85f4-0310-8831-c60e2a5ce829 diff --git a/src/via_driver.c b/src/via_driver.c index 8c84635..62d8fb1 100644 --- a/src/via_driver.c +++ b/src/via_driver.c @@ -1015,6 +1015,12 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags) switch (pVia->Chipset) { case VIA_CLE266: +#ifdef XSERVER_LIBPCIACCESS + pci_device_cfg_read_u8(bridge, &videoRam, 0xE1); +#else + videoRam = pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70; +#endif + pScrn->videoRam = (1 << ((videoRam & 0x70) >> 4)) << 10; case VIA_KM400: #ifdef XSERVER_LIBPCIACCESS pci_device_cfg_read_u8(bridge, &videoRam, 0xE1); @@ -1022,6 +1028,12 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags) videoRam = pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70; #endif pScrn->videoRam = (1 << ((videoRam & 0x70) >> 4)) << 10; + /* Workaround for #177 (VRAM probing fail on P4M800) */ + if (pScrn->videoRam < 16384) { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "Memory size detection failed: using 16 MB.\n"); + pScrn->videoRam = 16 << 10; + } break; case VIA_PM800: case VIA_VM800: @@ -1072,12 +1084,6 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags) if (from == X_PROBED) { xf86DrvMsg(pScrn->scrnIndex, from, "Probed amount of VideoRAM = %d kB\n", pScrn->videoRam); - - if (pScrn->videoRam < 16384) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Memory size detection failed: using 16 MB.\n"); - pScrn->videoRam = 16 << 10; - } } if (!VIASetupDefaultOptions(pScrn)) { commit 57321bdb71efe67bd22b69896968825457bf9ea4 Author: gang65 <gang65@e8d65cb0-85f4-0310-8831-c60e2a5ce829> Date: Sun Feb 20 11:25:17 2011 +0000 Fix #395 - revert ViaPanelGetSizeFromDDC renaming (thanks to julienvdg) git-svn-id: http://svn.openchrome.org/svn/trunk@915 e8d65cb0-85f4-0310-8831-c60e2a5ce829 diff --git a/src/via_panel.c b/src/via_panel.c index d9ad742..583e12f 100644 --- a/src/via_panel.c +++ b/src/via_panel.c @@ -307,11 +307,8 @@ ViaPanelPreInit(ScrnInfoPtr pScrn) int width, height; Bool ret; - ret = ViaPanelGetSizeFromDDC(pScrn, &width, &height); -/* - if (!ret) - ret = ViaPanelGetSizeFromDDCv2(pScrn, &width); -*/ + ret = ViaPanelGetSizeFromDDCv1(pScrn, &width, &height); + if (ret) { panel->NativeModeIndex = ViaPanelLookUpModeIndex(width, height); DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaPanelLookUpModeIndex, Width %d, Height %d, NativeModeIndex%d\n", width, height, panel->NativeModeIndex)); @@ -411,7 +408,7 @@ ViaPanelGetSizeFromEDID(ScrnInfoPtr pScrn, xf86MonPtr pMon, } Bool -ViaPanelGetSizeFromDDC(ScrnInfoPtr pScrn, int *width, int *height) +ViaPanelGetSizeFromDDCv1(ScrnInfoPtr pScrn, int *width, int *height) { VIAPtr pVia = VIAPTR(pScrn); xf86MonPtr pMon; commit e47aba4c1272d59150cec53cb195b92ed6fc34f6 Author: gang65 <gang65@e8d65cb0-85f4-0310-8831-c60e2a5ce829> Date: Sun Feb 20 11:20:01 2011 +0000 Add suport for Semp Informática Notebook IS 1462 (reported by Colin) git-svn-id: http://svn.openchrome.org/svn/trunk@914 e8d65cb0-85f4-0310-8831-c60e2a5ce829 diff --git a/src/via_id.c b/src/via_id.c index d7353d1..fce5006 100644 --- a/src/via_id.c +++ b/src/via_id.c @@ -204,6 +204,7 @@ static struct ViaCardIdStruct ViaCardId[] = { {"Fujitsu/Siemens Amilo Pro V3515", VIA_P4M900, 0x1734, 0x10CB, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, {"Fujitsu/Siemens Amilo Li1705", VIA_P4M900, 0x1734, 0x10F7, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, {"ASRock P4VM900-SATA2", VIA_P4M900, 0x1849, 0x3371, VIA_DEVICE_CRT}, + {"Semp Informática Notebook IS 1462", VIA_P4M900, 0x1509, 0x1D41, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, /*** CX700 ***/ {"VIA VT8454B", VIA_CX700, 0x0908, 0x1975, VIA_DEVICE_CRT}, /* Evaluation board, reference possibly wrong */ commit a5eabab7e4e40a20008af1b0056a9afed3ba9a67 Author: gang65 <gang65@e8d65cb0-85f4-0310-8831-c60e2a5ce829> Date: Sun Feb 20 11:12:12 2011 +0000 Fix VIA VB8001 Mini-ITX Board (P4M900) support git-svn-id: http://svn.openchrome.org/svn/trunk@913 e8d65cb0-85f4-0310-8831-c60e2a5ce829 diff --git a/src/via_id.c b/src/via_id.c index 96c7355..d7353d1 100644 --- a/src/via_id.c +++ b/src/via_id.c @@ -188,7 +188,7 @@ static struct ViaCardIdStruct ViaCardId[] = { {"Mitac 8515", VIA_P4M900, 0x1071, 0x8515, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, {"Medion Notebook MD96483", VIA_P4M900, 0x1071, 0x8615, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, {"Mitac 8624", VIA_P4M900, 0x1071, 0x8624, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, - {"VIA VT3364 (P4M900)", VIA_P4M900, 0x1106, 0x3371, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, + {"VIA VB8001 Mini-ITX Board (P4M900)", VIA_P4M900, 0x1106, 0x3371, VIA_DEVICE_CRT}, {"Gigabyte GA-VM900M", VIA_P4M900, 0x1458, 0xD000, VIA_DEVICE_CRT}, {"MSI VR321", VIA_P4M900, 0x1462, 0x3355, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, {"MSI P4M900M / P4M900M2-F/L", VIA_P4M900, 0x1462, 0x7255, VIA_DEVICE_CRT}, commit cbcb1c3b975fdd1bc06cc62f6670840775a4d5ae Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829> Date: Thu Feb 17 10:44:51 2011 +0000 Lenovo ThinkCenter E51 8714 (reported by José Jorge) git-svn-id: http://svn.openchrome.org/svn/trunk@912 e8d65cb0-85f4-0310-8831-c60e2a5ce829 diff --git a/src/via_id.c b/src/via_id.c index 176aa15..96c7355 100644 --- a/src/via_id.c +++ b/src/via_id.c @@ -115,6 +115,7 @@ static struct ViaCardIdStruct ViaCardId[] = { {"Packard Bell Easynote B3 800/B3340", VIA_K8M800, 0x1631, 0xC009, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, {"Packard Bell Imedia 2097", VIA_K8M800, 0x1631, 0xD007, VIA_DEVICE_CRT}, {"Fujitsu-Siemens Amilo K7610", VIA_K8M800, 0x1734, 0x10B3, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, + {"Lenovo ThinkCenter E51 8714", VIA_K8M800, 0x17AA, 0x1008, VIA_DEVICE_CRT}, {"ASRock K8Upgrade-VM800", VIA_K8M800, 0x1849, 0x3108, VIA_DEVICE_CRT}, {"Axper XP-M8VM800", VIA_K8M800, 0x1940, 0xD000, VIA_DEVICE_CRT}, commit 4672251d2f10db3fed58d7e11b75e6e3209b64a1 Author: Cyril Brulebois <[email protected]> Date: Sat Feb 5 14:53:15 2011 +0100 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 3da695a..d9aca75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-openchrome (1:0.2.904+svn891-1) UNRELEASED; urgency=low +xserver-xorg-video-openchrome (1:0.2.904+svn891-1) unstable; urgency=low [ Julien Viard de Galbert ] * New upstream snapshot @@ -32,7 +32,7 @@ xserver-xorg-video-openchrome (1:0.2.904+svn891-1) UNRELEASED; urgency=low * Remove long obsolete Replaces/Conflicts. * Wrap Depends/Provides. - -- Julien Viard de Galbert <[email protected]> Tue, 21 Dec 2010 16:16:42 +0100 + -- Cyril Brulebois <[email protected]> Sat, 05 Feb 2011 14:53:15 +0100 xserver-xorg-video-openchrome (1:0.2.904+svn858-1) experimental; urgency=low commit 3b7b61a2fa257c28382f8edaeebc8167f6e5e285 Author: Cyril Brulebois <[email protected]> Date: Sat Feb 5 09:32:18 2011 +0100 Add a placeholding series file. diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..fdffa2a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +# placeholder commit c64cf178567b0b696f40c7c7b11bd9047c535bbd Author: Cyril Brulebois <[email protected]> Date: Fri Feb 4 17:24:55 2011 +0100 Remove patch (which was a cherry-pick). diff --git a/debian/patches/01-cherry-pick-r854.diff b/debian/patches/01-cherry-pick-r854.diff deleted file mode 100644 index 12c042a..0000000 --- a/debian/patches/01-cherry-pick-r854.diff +++ /dev/null @@ -1,18 +0,0 @@ -From: Cyril Brulebois <[email protected]> -Partially reverts r830: - http://svn.openchrome.org/trac/changeset/830/trunk - http://svn.openchrome.org/trac/changeset/854/trunk ---- a/src/via_dri.c -+++ b/src/via_dri.c -@@ -267,11 +267,6 @@ VIADRIAgpInit(ScreenPtr pScreen, VIAPtr - pVIADRI = pDRIInfo->devPrivate; - pVia->agpSize = 0; - --/* For AMD64 */ --#ifdef __x86_64__ -- return FALSE; --#endif -- - if (drmAgpAcquire(pVia->drmFD) < 0) { - xf86DrvMsg(pScreen->myNum, X_ERROR, "[drm] drmAgpAcquire failed %d\n", - errno); diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 8dff6ec..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01-cherry-pick-r854.diff commit 88da0d7300997ffd437aa209bdce760b897d4215 Author: Cyril Brulebois <[email protected]> Date: Fri Feb 4 17:21:56 2011 +0100 Fix typo. diff --git a/debian/README.source b/debian/README.source index 41e8c58..df29eaf 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,4 +1,4 @@ -xserver-xorg-video-openchrome packages are not based on openchrome releases +xserver-xorg-video-openchrome packages are not based on openchrome release tarballs but on openchrome subversion repository. Refer to the README.VCS-source file for details on how to setup git and commit f953d4d6f505bac86b5c67582d4e94e489245672 Author: Cyril Brulebois <[email protected]> Date: Fri Feb 4 17:19:54 2011 +0100 Remove references to xsfbs. diff --git a/debian/README.VCS-source b/debian/README.VCS-source index c29b8e5..b524184 100644 --- a/debian/README.VCS-source +++ b/debian/README.VCS-source @@ -38,14 +38,6 @@ git svn fetch Note: for some reason git-svn will create a master branch if none existed, it can be ignored, only the refs/remotes/trunk is important. -6. Setup and other remote branch for xsfbs - -git remote add xsfbs git://git.debian.org/pkg-xorg/xsfbs.git - -7. And fetch it - -git fetch xsfbs - -------------------- Building the package -------------------- diff --git a/debian/README.source b/debian/README.source index 7ea68e2..41e8c58 100644 --- a/debian/README.source +++ b/debian/README.source @@ -4,10 +4,6 @@ tarballs but on openchrome subversion repository. Refer to the README.VCS-source file for details on how to setup git and git svn to fetch from both git.debian.org and svn.openchrome.org -This packages also uses the X Strike Force Build System (xfsbs). -The rest of this file comes from xfsbs and is left unmodified to ease later -merges. - ------------------------------------------------------ Quick Guide To Patching This Package For The Impatient ------------------------------------------------------ commit bdb38672f5261b324955b12eccdf9811307bc789 Author: Cyril Brulebois <[email protected]> Date: Fri Feb 4 17:15:53 2011 +0100 Wrap Depends/Provides. diff --git a/debian/changelog b/debian/changelog index 02938f5..f36142f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ xserver-xorg-video-openchrome (1:0.2.904+svn891-1) UNRELEASED; urgency=low - Use a .docs to get NEWS installed. * Remove xsfbs accordingly. * Remove long obsolete Replaces/Conflicts. + * Wrap Depends/Provides. -- Julien Viard de Galbert <[email protected]> Tue, 21 Dec 2010 16:16:42 +0100 diff --git a/debian/control b/debian/control index 130b9dd..bc5c3e2 100644 --- a/debian/control +++ b/debian/control @@ -29,8 +29,12 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-openchr Package: xserver-xorg-video-openchrome Architecture: i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64 lpia -Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends} -Provides: ${xviddriver:Provides} +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xviddriver:Depends}, +Provides: + ${xviddriver:Provides} Description: X.Org X server -- VIA display driver OpenChrome is a project for the development of free and open-source drivers for the VIA UniChrome video chipsets. @@ -47,7 +51,9 @@ Description: X.Org X server -- VIA display driver Package: xserver-xorg-video-via Architecture: i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64 lpia -Depends: xserver-xorg-video-openchrome, ${misc:Depends} +Depends: + xserver-xorg-video-openchrome, + ${misc:Depends}, Description: X.Org X server -- VIA display driver (dummy transitional package) This transitional package helps users transition to the OpenChrome driver. Once this package and its dependencies are installed you can safely remove it. commit 63696f184e1c54c1905ec57711d9271f2711a382 Author: Cyril Brulebois <[email protected]> Date: Fri Feb 4 17:15:00 2011 +0100 Remove long obsolete Replaces/Conflicts. diff --git a/debian/changelog b/debian/changelog index 1b588d8..02938f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,7 @@ xserver-xorg-video-openchrome (1:0.2.904+svn891-1) UNRELEASED; urgency=low of manually installing debian/overrides. dh_lintian is our friend. - Use a .docs to get NEWS installed. * Remove xsfbs accordingly. + * Remove long obsolete Replaces/Conflicts. -- Julien Viard de Galbert <[email protected]> Tue, 21 Dec 2010 16:16:42 +0100 diff --git a/debian/control b/debian/control index 7997115..130b9dd 100644 --- a/debian/control +++ b/debian/control @@ -31,8 +31,6 @@ Package: xserver-xorg-video-openchrome Architecture: i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64 lpia Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends} Provides: ${xviddriver:Provides} -Conflicts: libchromexvmc1, libchromexvmcpro1 -Replaces: libchromexvmc1, libchromexvmcpro1 Description: X.Org X server -- VIA display driver OpenChrome is a project for the development of free and open-source drivers for the VIA UniChrome video chipsets. commit a25b1c63444cee300e358ff3ba93a6dcf2c20bcd Author: Cyril Brulebois <[email protected]> Date: Fri Feb 4 17:12:25 2011 +0100 Remove xsfbs accordingly. diff --git a/debian/README.source b/debian/README.source index f5d52a1..4ecd5e6 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,13 +1,3 @@ -xserver-xorg-video-openchrome packages are not based on openchrome releases -tarballs but on openchrome subversion repository. - -Refer to the README.VCS-source file for details on how to setup git and -git svn to fetch from both git.debian.org and svn.openchrome.org - -This packages also uses the X Strike Force Build System (xfsbs). -The rest of this file comes from xfsbs and is left unmodified to ease later -merges. - ------------------------------------------------------ Quick Guide To Patching This Package For The Impatient ------------------------------------------------------ @@ -57,27 +47,3 @@ are involved: 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. diff --git a/debian/changelog b/debian/changelog index 6104cd3..1b588d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,7 @@ xserver-xorg-video-openchrome (1:0.2.904+svn891-1) UNRELEASED; urgency=low - Use debian/xserver-xorg-video-openchrome.lintian-overrides instead of manually installing debian/overrides. dh_lintian is our friend. - Use a .docs to get NEWS installed. + * Remove xsfbs accordingly. -- Julien Viard de Galbert <[email protected]> Tue, 21 Dec 2010 16:16:42 +0100 diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh deleted file mode 100755 index 5935cc9..0000000 --- a/debian/xsfbs/repack.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -set -e - -if ! [ -d debian/prune ]; then - exit 0 -fi - -if [ "x$1" != x--upstream-version ]; then - exit 1 -fi - -version="$2" -filename="$3" - -if [ -z "$version" ] || ! [ -f "$filename" ]; then - exit 1 -fi - -dir="$(pwd)" -tempdir="$(mktemp -d)" - -cd "$tempdir" -tar xf "$dir/$filename" -cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done - -tar czf "$dir/$filename" * -cd "$dir" -rm -rf "$tempdir" -echo "Done pruning upstream tarball" - -exit 0 diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk deleted file mode 100755 index 3c59c20..0000000 --- a/debian/xsfbs/xsfbs.mk +++ /dev/null @@ -1,285 +0,0 @@ -#!/usr/bin/make -f - -# Debian X Strike Force Build System (XSFBS): Make portion - -# Copyright 1996 Stephen Early -# Copyright 1997 Mark Eichin -# Copyright 1998-2005, 2007 Branden Robinson -# Copyright 2005 David Nusinow -# -# Licensed under the GNU General Public License, version 2. See the file -# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>. - -# Originally by Stephen Early <[email protected]> -# Modified by Mark W. Eichin <[email protected]> -# Modified by Adam Heath <[email protected]> -# Modified by Branden Robinson <[email protected]> -# Modified by Fabio Massimo Di Nitto <[email protected]> -# Modified by David Nusinow <[email protected]> -# Acknowledgements to Manoj Srivastava. - -# Pass $(DH_OPTIONS) into the environment for debhelper's benefit. -export DH_OPTIONS - -# force quilt to not use ~/.quiltrc and to use debian/patches -QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null - -# Set up parameters for the upstream build environment. - -# Determine (source) package name from Debian changelog. -SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \ - | grep '^Source:' | awk '{print $$2}') - -# Determine package version from Debian changelog. -SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \ - | grep '^Version:' | awk '{print $$2}') - -# Determine upstream version number. -UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//') - -# Determine the source version without the epoch for make-orig-tar-gz -NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') - -# Figure out who's building this package. -BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}}) - -# Find out if this is an official build; an official build has nothing but -# digits, dots, and/or the codename of a release in the Debian part of the -# version number. Anything else indicates an unofficial build. -OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) - -# Set up parameters for the Debian build environment. - -# Determine our architecture. -BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) -# Work around some old-time dpkg braindamage. -BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH)) -# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy. -ifdef DEB_HOST_ARCH - ARCH:=$(DEB_HOST_ARCH) -else - # dpkg-cross sets the ARCH environment variable; if set, use it. - ifdef ARCH - ARCH:=$(ARCH) - else - ARCH:=$(BUILD_ARCH) - endif -endif - -# $(STAMP_DIR) houses stamp files for complex targets. -STAMP_DIR:=stampdir - -# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place -# their files. -DEBTREEDIR:=$(CURDIR)/debian/tmp - -# All "important" targets have four lines: -# 1) A target name that is invoked by a package-building tool or the user. -# This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart. -# 2) A line delcaring 1) as a phony target (".PHONY:"). -# 3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may -# depend on other targets. -# 4) A line declaring 3) as a member of the $(stampdir_targets) variable; the -# "$(STAMP_DIR)/" prefix is omitted. -# -# This indirection is needed so that the "stamp" files that signify when a rule -# is done can be located in a separate "stampdir". Recall that make has no way -# to know when a goal has been met for a phony target (like "build" or -# "install"). -# -# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@" -# so that the target will not be run again. Removing the file will make Make -# run the target over. - -# All phony targets should be declared as dependencies of .PHONY, even if they -# do not have "($STAMP_DIR)/"-prefixed counterparts. - -# Define a harmless default rule to keep things from going nuts by accident. -.PHONY: default -default: - -# Set up the $(STAMP_DIR) directory. -.PHONY: stampdir -stampdir_targets+=stampdir -stampdir: $(STAMP_DIR)/stampdir -$(STAMP_DIR)/stampdir: - mkdir $(STAMP_DIR) - >$@ - -# Set up the package build directory as quilt expects to find it. -.PHONY: prepare -stampdir_targets+=prepare -prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts - >$@ - -.PHONY: logdir -stampdir_targets+=logdir -logdir: $(STAMP_DIR)/logdir -$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir - mkdir -p $(STAMP_DIR)/log - >$@ - -# Apply all patches to the upstream source. -.PHONY: patch -stampdir_targets+=patch -patch: $(STAMP_DIR)/patch -$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare - if ! [ `which quilt` ]; then \ - echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ - exit 1; \ - fi; \ - if $(QUILT) next >/dev/null 2>&1; then \ - echo -n "Applying patches..."; \ - if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ - cat $(STAMP_DIR)/log/patch; \ - echo "successful."; \ - else \ - cat $(STAMP_DIR)/log/patch; \ - echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ - exit 1; \ - fi; \ - else \ - echo "No patches to apply"; \ - fi; \ - >$@ - -# Revert all patches to the upstream source. -.PHONY: unpatch -unpatch: $(STAMP_DIR)/logdir - rm -f $(STAMP_DIR)/patch - @echo -n "Unapplying patches..."; \ - if $(QUILT) applied >/dev/null 2>/dev/null; then \ - if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ - cat $(STAMP_DIR)/log/unpatch; \ - echo "successful."; \ - else \ - cat $(STAMP_DIR)/log/unpatch; \ - echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ - exit 1; \ - fi; \ - else \ - echo "nothing to do."; \ - fi - -# Clean the generated maintainer scripts. -.PHONY: cleanscripts -cleanscripts: - rm -f $(STAMP_DIR)/genscripts - rm -f debian/*.config \ - debian/*.postinst \ - debian/*.postrm \ - debian/*.preinst \ - debian/*.prerm - -# Clean the package build tree. -.PHONY: xsfclean -xsfclean: cleanscripts unpatch - dh_testdir - rm -rf .pc - rm -rf $(STAMP_DIR) - dh_clean - -# Remove files from the upstream source tree that we don't need, or which have -# licensing problems. It must be run before creating the .orig.tar.gz. -# -# Note: This rule is for Debian package maintainers' convenience, and is not -# needed for conventional build scenarios. -.PHONY: prune-upstream-tree -prune-upstream-tree: - # Ensure we're in the correct directory. - dh_testdir - grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf - -# Verify that there are no offsets or fuzz in the patches we apply. -# -# Note: This rule is for Debian package maintainers' convenience, and is not -# needed for conventional build scenarios. -.PHONY: patch-audit -patch-audit: prepare unpatch - @echo -n "Auditing patches..."; \ - >$(STAMP_DIR)/log/patch; \ - FUZZY=; \ - while [ -n "$$($(QUILT) next)" ]; do \ - RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ - case "$$RESULT" in \ - succeeded) \ - echo "fuzzy patch: $$($(QUILT) top)" \ - | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \ - FUZZY=yes; \ - ;; \ - FAILED) \ - echo "broken patch: $$($(QUILT) next)" \ - | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \ - exit 1; \ - ;; \ - esac; \ - done; \ - if [ -n "$$FUZZY" ]; then \ - echo "there were fuzzy patches; please fix."; \ - exit 1; \ - else \ - echo "done."; \ - fi - -# Generate the maintainer scripts. -.PHONY: genscripts -stampdir_targets+=genscripts -genscripts: $(STAMP_DIR)/genscripts -$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir - for FILE in debian/*.config.in \ - debian/*.postinst.in \ - debian/*.postrm.in \ - debian/*.preinst.in \ - debian/*.prerm.in; do \ - if [ -e "$$FILE" ]; then \ - MAINTSCRIPT=$$(echo $$FILE | sed 's/.in$$//'); \ - sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' <$$FILE \ - | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >$$MAINTSCRIPT.tmp; \ - cat debian/xsfbs/xsfbs.sh >>$$MAINTSCRIPT.tmp; \ - sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' <$$FILE \ - | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ - sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ - -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ - <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ - rm $$MAINTSCRIPT.tmp; \ - fi; \ - done - # Validate syntax of generated shell scripts. - #sh debian/scripts/validate-posix-sh debian/*.config \ - # debian/*.postinst \ - # debian/*.postrm \ - # debian/*.preinst \ - # debian/*.prerm - >$@ - -# Compute dependencies for drivers -# -VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) -INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) - -# these two can be removed post-squeeze -VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) -INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input - -ifeq ($(PACKAGE),) -PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) -endif - -.PHONY: serverabi -serverabi: install -ifeq ($(VIDEODEP),) - @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' - @exit 1 -else - echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars - echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars - # the following is there for compatibility... - echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars - echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars - echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars -endif - -# vim:set noet ai sts=8 sw=8 tw=0: diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh deleted file mode 100644 index 813fd8d..0000000 --- a/debian/xsfbs/xsfbs.sh +++ /dev/null @@ -1,622 +0,0 @@ -# This is the X Strike Force shell library for X Window System package -# maintainer scripts. It serves to define shell functions commonly used by -# such packages, and performs some error checking necessary for proper operation -# of those functions. By itself, it does not "do" much; the maintainer scripts -# invoke the functions defined here to accomplish package installation and -# removal tasks. - -# If you are reading this within a Debian package maintainer script (e.g., -# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can -# skip past this library by scanning forward in this file to the string -# "GOBSTOPPER". - -SOURCE_VERSION=@SOURCE_VERSION@ -OFFICIAL_BUILD=@OFFICIAL_BUILD@ - -# Use special abnormal exit codes so that problems with this library are more -# easily tracked down. -SHELL_LIB_INTERNAL_ERROR=86 -SHELL_LIB_THROWN_ERROR=74 -SHELL_LIB_USAGE_ERROR=99 - -# old -> new variable names -if [ -z "$DEBUG_XORG_PACKAGE" ] && [ -n "$DEBUG_XFREE86_PACKAGE" ]; then - DEBUG_XORG_PACKAGE="$DEBUG_XFREE86_PACKAGE" -fi -if [ -z "$DEBUG_XORG_DEBCONF" ] && [ -n "$DEBUG_XFREE86_DEBCONF" ]; then - DEBUG_XORG_DEBCONF="$DEBUG_XFREE86_DEBCONF" -fi - -# initial sanity checks -if [ -z "$THIS_PACKAGE" ]; then - cat >&2 <<EOF -Error: package maintainer script attempted to use shell library without -definining \$THIS_PACKAGE shell variable. Please report the package name, -version, and the text of this error message to the Debian Bug Tracking System. -Visit <http://www.debian.org/Bugs/Reporting> on the World Wide Web for -instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the -"doc-debian" package, or install the "reportbug" package and use the command of -the same name to file a report against version $SOURCE_VERSION of this package. -EOF - exit $SHELL_LIB_USAGE_ERROR -fi - -if [ -z "$THIS_SCRIPT" ]; then - cat >&2 <<EOF -Error: package maintainer script attempted to use shell library without -definining \$THIS_SCRIPT shell variable. Please report the package name, -version, and the text of this error message to the Debian Bug Tracking System. -Visit <http://www.debian.org/Bugs/Reporting> on the World Wide Web for -instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the -"doc-debian" package, or install the "reportbug" package and use the command of -the same name to file a report against version $SOURCE_VERSION of the -"$THIS_PACKAGE" package. -EOF - exit $SHELL_LIB_USAGE_ERROR -fi - -if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then - RECONFIGURE="true" -else - RECONFIGURE= -fi - -if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then - FIRSTINST="yes" -fi - -if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then - UPGRADE="yes" -fi - -trap "message;\ - message \"Received signal. Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\ - message;\ - exit 1" HUP INT QUIT TERM - -reject_nondigits () { - # syntax: reject_nondigits [ operand ... ] - # - # scan operands (typically shell variables whose values cannot be trusted) for - # characters other than decimal digits and barf if any are found - while [ -n "$1" ]; do - # does the operand contain anything but digits? - if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then - # can't use die(), because it wraps message() which wraps this function - echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \ - "possibly malicious garbage \"$1\"" >&2 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
