ChangeLog | 18 +++++++ configure.ac | 2 debian/README.source | 73 +++++++++++++++++++++++++++++++ debian/changelog | 11 ++++ debian/control | 5 -- debian/patches/01_gen_pci_ids.diff | 14 ----- debian/patches/series | 1 debian/rules | 4 - debian/xserver-xorg-video-voodoo.install | 1 debian/xsfbs/xsfbs.sh | 12 ----- man/voodoo.man | 2 src/voodoo_driver.c | 34 -------------- 12 files changed, 108 insertions(+), 69 deletions(-)
New commits: commit 58331ad8fe14b5719a51acc52d9ab83333c12fc7 Author: Brice Goglin <[email protected]> Date: Sun Jul 19 23:53:12 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 05b04c7..7879fb5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,13 @@ -xserver-xorg-video-voodoo (1:1.2.2-1) UNRELEASED; urgency=low +xserver-xorg-video-voodoo (1:1.2.2-1) unstable; urgency=low * New upstream release. * Bump Standards-Version to 3.8.2. * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to choose a driver during autoconfiguration. + Disable patch system and remove quilt from build-deps. + * Add myself to Uploaders. - -- Brice Goglin <[email protected]> Mon, 20 Jul 2009 00:02:56 +0200 + -- Brice Goglin <[email protected]> Mon, 20 Jul 2009 00:03:22 +0200 xserver-xorg-video-voodoo (1:1.2.1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 3e4ab23..ce45a76 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-video-voodoo Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Julien Cristau <[email protected]> +Uploaders: David Nusinow <[email protected]>, Julien Cristau <[email protected]>, Brice Goglin <[email protected]> Build-Depends: debhelper (>= 5.0.0), pkg-config, commit 3af923feed87f1947e955188d92f11bad71eb6b1 Author: Brice Goglin <[email protected]> Date: Mon Jul 20 00:02:20 2009 +0200 Remove 01_gen_pci_ids.diff. The X server now uses an internal table to choose a driver during autoconfiguration. Disable patch system and remove quilt from build-deps. diff --git a/debian/changelog b/debian/changelog index 28f2c26..05b04c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,11 @@ xserver-xorg-video-voodoo (1:1.2.2-1) UNRELEASED; urgency=low * New upstream release. * Bump Standards-Version to 3.8.2. + * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to + choose a driver during autoconfiguration. + + Disable patch system and remove quilt from build-deps. - -- Brice Goglin <[email protected]> Sun, 19 Jul 2009 23:51:48 +0200 + -- Brice Goglin <[email protected]> Mon, 20 Jul 2009 00:02:56 +0200 xserver-xorg-video-voodoo (1:1.2.1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 66264e6..3e4ab23 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Uploaders: David Nusinow <[email protected]>, Julien Cristau <jcris...@debian. Build-Depends: debhelper (>= 5.0.0), pkg-config, - quilt, automake, libtool, xutils-dev, diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff deleted file mode 100644 index c171edb..0000000 --- a/debian/patches/01_gen_pci_ids.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- /dev/null -+++ xserver-xorg-video-voodoo/src/voodoo.ids -@@ -0,0 +1,2 @@ -+121A0001 -+121A0002 ---- xserver-xorg-video-voodoo.orig/src/Makefile.am -+++ xserver-xorg-video-voodoo/src/Makefile.am -@@ -34,3 +34,6 @@ - voodoo.h \ - voodoo_pcirename.h \ - voodoo_hardware.c -+ -+pcidatadir = $(datadir)/xserver-xorg/pci -+pcidata_DATA = voodoo.ids diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index b55d79f..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01_gen_pci_ids.diff diff --git a/debian/rules b/debian/rules index 90093ec..40826eb 100755 --- a/debian/rules +++ b/debian/rules @@ -33,7 +33,7 @@ endif confflags += --disable-static build: build-stamp -build-stamp: $(STAMP_DIR)/patch +build-stamp: dh_testdir autoreconf -vfi @@ -45,7 +45,7 @@ build-stamp: $(STAMP_DIR)/patch cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) >$@ -clean: xsfclean +clean: dh_testdir dh_testroot rm -f build-stamp diff --git a/debian/xserver-xorg-video-voodoo.install b/debian/xserver-xorg-video-voodoo.install index a8fac35..daf7bfe 100644 --- a/debian/xserver-xorg-video-voodoo.install +++ b/debian/xserver-xorg-video-voodoo.install @@ -1,2 +1 @@ usr/lib/xorg/modules/drivers/*.so -usr/share/xserver-xorg/pci/* commit c58d3eed614d67ebfe7a46abebf1b1996867d706 Author: Brice Goglin <[email protected]> Date: Sun Jul 19 23:52:18 2009 +0200 Adding README.source means we can bump Standards-Version diff --git a/debian/changelog b/debian/changelog index 31dd299..28f2c26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ xserver-xorg-video-voodoo (1:1.2.2-1) UNRELEASED; urgency=low * New upstream release. + * Bump Standards-Version to 3.8.2. - -- Brice Goglin <[email protected]> Sun, 19 Jul 2009 23:50:58 +0200 + -- Brice Goglin <[email protected]> Sun, 19 Jul 2009 23:51:48 +0200 xserver-xorg-video-voodoo (1:1.2.1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 5bcc8b2..66264e6 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: x11proto-randr-dev, x11proto-render-dev, dpkg-dev (>= 1.14.17) -Standards-Version: 3.7.3 +Standards-Version: 3.8.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-voodoo Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-voodoo.git commit f4abb2b84d1eaf53f2239ce653850c2e938b76da Author: Brice Goglin <[email protected]> Date: Sun Jul 19 23:51:27 2009 +0200 New upstream release diff --git a/ChangeLog b/ChangeLog index ad02f7f..c8348e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +commit b88c1e442fa9367ebb0addf744b759cea91a4868 +Author: Adam Jackson <[email protected]> +Date: Thu Jul 2 11:55:03 2009 -0400 + + voodoo 1.2.2 + +commit bf6571791206d7784e711abcb6f353ae06d54bd8 +Author: Adam Jackson <[email protected]> +Date: Thu May 28 15:27:48 2009 -0400 + + Remove useless loader symbol lists. + +commit 46fa3eff8d2b8f17e50e575df96b02e4b8a89874 +Author: Alan Coopersmith <[email protected]> +Date: Fri Jan 9 16:39:21 2009 -0800 + + Remove xorgconfig & xorgcfg from See Also list in man page + commit 01e0f1442d8883376aeb5eb764e0ee92e00d4fdb Author: Adam Jackson <[email protected]> Date: Tue Feb 24 10:29:41 2009 -0500 diff --git a/debian/changelog b/debian/changelog index df56efc..31dd299 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-voodoo (1:1.2.2-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Brice Goglin <[email protected]> Sun, 19 Jul 2009 23:50:58 +0200 + xserver-xorg-video-voodoo (1:1.2.1-1) unstable; urgency=low * Run autoreconf on build. commit b88c1e442fa9367ebb0addf744b759cea91a4868 Author: Adam Jackson <[email protected]> Date: Thu Jul 2 11:55:03 2009 -0400 voodoo 1.2.2 diff --git a/configure.ac b/configure.ac index ff6c1a5..919e29f 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-voodoo], - 1.2.1, + 1.2.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-voodoo) commit 8f72294ada477f003888b6776883c1dd98289f3f Author: Julien Cristau <[email protected]> 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 bf6571791206d7784e711abcb6f353ae06d54bd8 Author: Adam Jackson <[email protected]> Date: Thu May 28 15:27:48 2009 -0400 Remove useless loader symbol lists. diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c index 2822543..f412215 100644 --- a/src/voodoo_driver.c +++ b/src/voodoo_driver.c @@ -128,34 +128,6 @@ static SymTabRec VoodooChipsets[] = { {-1, NULL } }; - -/* - * 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 *fbSymbols[] = { - "fbScreenInit", - "fbPictureInit", - NULL -}; - -static const char *xaaSymbols[] = { - "XAACreateInfoRec", - "XAAInit", - "XAADestroyInfoRec", - NULL -}; - -static const char *shadowSymbols[] = { - "ShadowFBInit", - NULL -}; - #ifdef XFree86LOADER static XF86ModuleVersionInfo voodooVersRec = @@ -181,7 +153,6 @@ static pointer voodooSetup(pointer module, pointer opts, int *errmaj, int *errmi { setupDone = TRUE; xf86AddDriver(&VOODOO, module, 0); - LoaderRefSymLists(fbSymbols, shadowSymbols, xaaSymbols,NULL); return (pointer)1; } return NULL; @@ -583,15 +554,11 @@ VoodooPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } - xf86LoaderReqSymLists(fbSymbols, NULL); - if (!xf86LoadSubModule(pScrn, "xaa")) { VoodooFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(xaaSymbols, NULL); - if(pVoo->ShadowFB) { /* Load the shadow framebuffer */ @@ -599,7 +566,6 @@ VoodooPreInit(ScrnInfoPtr pScrn, int flags) VoodooFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(shadowSymbols, NULL); } return TRUE; } commit 7deebf983f53c505bc25171ab77fdc408f250a6e Author: Julien Cristau <[email protected]> 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 <[email protected]> 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 46fa3eff8d2b8f17e50e575df96b02e4b8a89874 Author: Alan Coopersmith <[email protected]> Date: Fri Jan 9 16:39:21 2009 -0800 Remove xorgconfig & xorgcfg from See Also list in man page diff --git a/man/voodoo.man b/man/voodoo.man index 8e828df..92fb9bd 100644 --- a/man/voodoo.man +++ b/man/voodoo.man @@ -67,6 +67,6 @@ The driver interacts badly with the sstfb frame buffer driver as there is insufficient information to restore the chip to its previous state. .SH "SEE ALSO" -__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__) +__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__) .SH AUTHORS Authors: Alan Cox, Ghozlane Toumi, Henrik Harmsen. -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
