xserver-xorg-video-neomagic: Changes to 'debian-unstable'
ChangeLog | 18 +++++
configure.ac | 2
debian/README.source | 73 ++++++++++++++++++++++
debian/changelog | 9 ++
debian/control | 2
debian/xserver-xorg-video-neomagic.install | 1
debian/xsfbs/xsfbs.sh | 12 ---
man/neomagic.man | 2
src/neo_driver.c | 95 -----------------------------
9 files changed, 101 insertions(+), 113 deletions(-)
New commits:
commit 61a9b5ab2779b18651c11d6ad4985971252fa4f7
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Jul 25 23:59:47 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 36286ff..948fbde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-neomagic (1:1.2.3-1) UNRELEASED; urgency=low
+xserver-xorg-video-neomagic (1:1.2.3-1) unstable; urgency=low
[ David Nusinow ]
* Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
@@ -9,7 +9,7 @@ xserver-xorg-video-neomagic (1:1.2.3-1) UNRELEASED; urgency=low
* Add README.source, bump Standards-Version to 3.8.2.
* New upstream release.
- -- Brice Goglin <bgoglin@debian.org> Sat, 25 Jul 2009 23:58:39 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sat, 25 Jul 2009 23:59:37 +0200
xserver-xorg-video-neomagic (1:1.2.2-2) unstable; urgency=low
commit d7f19a6fe892f2e4886e4a22a04f27339c0b2c9a
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Jul 25 23:59:34 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 559b171..041a6f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+commit 33997831f0ffe61452fac111b51dabffef348b76
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Jul 2 11:24:20 2009 -0400
+
+ neomagic 1.2.3
+
+commit d97ccdfef1107c7721c838f0cd3fbed5f456dc13
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu May 28 15:07:11 2009 -0400
+
+ Remove useless loader symbol lists.
+
+commit 31e1e1e4a789295545d6924031ba6d56078f9afa
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 9 16:31:03 2009 -0800
+
+ Remove xorgconfig & xorgcfg from See Also list in man page
+
commit 9bfdc7232a77472c4a1c13c869f6bc52916ce664
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Dec 22 14:37:21 2008 +1000
diff --git a/debian/changelog b/debian/changelog
index b615fb7..36286ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-neomagic (1:1.2.2-3) UNRELEASED; urgency=low
+xserver-xorg-video-neomagic (1:1.2.3-1) UNRELEASED; urgency=low
[ David Nusinow ]
* Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
@@ -7,8 +7,9 @@ xserver-xorg-video-neomagic (1:1.2.2-3) UNRELEASED; urgency=low
[ Brice Goglin ]
* Add README.source, bump Standards-Version to 3.8.2.
+ * New upstream release.
- -- Brice Goglin <bgoglin@debian.org> Sat, 25 Jul 2009 23:55:19 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sat, 25 Jul 2009 23:58:39 +0200
xserver-xorg-video-neomagic (1:1.2.2-2) unstable; urgency=low
commit 134a6b3c26ca44d8615373efb2dc219ba51b5663
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Jul 25 23:55:43 2009 +0200
Bump Standards-Version to 3.8.2 now that we have README.source
diff --git a/debian/changelog b/debian/changelog
index ad35200..b615fb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
xserver-xorg-video-neomagic (1:1.2.2-3) UNRELEASED; urgency=low
+ [ David Nusinow ]
* Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
choose a driver during autoconfiguration.
+ Disable the patch system and remove quilt from the build-deps.
- -- David Nusinow <dnusinow@debian.org> Mon, 04 May 2009 22:19:41 -0400
+ [ Brice Goglin ]
+ * Add README.source, bump Standards-Version to 3.8.2.
+
+ -- Brice Goglin <bgoglin@debian.org> Sat, 25 Jul 2009 23:55:19 +0200
xserver-xorg-video-neomagic (1:1.2.2-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 9925cab..2eececd 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-neomagic
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-neomagic.git
commit 4031dee80df64c2707584d5e69353f6c29b6b523
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Jul 25 23:50:02 2009 +0200
Don't try to install usr/share/xserver-xorg/pci/* anymore
diff --git a/debian/xserver-xorg-video-neomagic.install b/debian/xserver-xorg-video-neomagic.install
index 8a9f4ba..614cfb4 100644
--- a/debian/xserver-xorg-video-neomagic.install
+++ b/debian/xserver-xorg-video-neomagic.install
@@ -1,3 +1,2 @@
usr/lib/xorg/modules/drivers/*.so
usr/share/man/man4/*
-usr/share/xserver-xorg/pci/*
commit 33997831f0ffe61452fac111b51dabffef348b76
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 11:24:20 2009 -0400
neomagic 1.2.3
diff --git a/configure.ac b/configure.ac
index 2f7843a..4fb509d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-neomagic],
- 1.2.2,
+ 1.2.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-neomagic)
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 d97ccdfef1107c7721c838f0cd3fbed5f456dc13
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 28 15:07:11 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/neo_driver.c b/src/neo_driver.c
index f472601..686fc05 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -412,79 +412,6 @@ static const OptionInfoRec NEOOptions[] = {
{ -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[] = {
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWInit",
- "vgaHWLock",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreenWeak",
- "vgaHWSetStdFuncs",
- "vgaHWUnlock",
- "vgaHWddc1SetSpeedWeak",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "shadowInit",
- NULL
-};
-
-static const char *ddcSymbols[] = {
- "xf86DoEDID_DDC1",
- "xf86DoEDID_DDC2",
- "xf86PrintEDID",
- "xf86SetDDCproperties",
- NULL
-};
-
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(neoSetup);
@@ -519,18 +446,6 @@ neoSetup(pointer module, pointer opts, int *errmaj, int *errmin)
xf86AddDriver(&NEOMAGIC, module, 0);
/*
- * Modules that this driver always requires can be loaded here
- * by calling LoadSubModule().
- */
-
- /*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
- LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols,
- ramdacSymbols, shadowSymbols,
- ddcSymbols, vbeSymbols, i2cSymbols, NULL);
- /*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
@@ -744,8 +659,6 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
/*
* Allocate a vgaHWRec.
*/
@@ -965,7 +878,6 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
pScrn->monitor = pScrn->confScreen->monitor;
if (xf86LoadSubModule(pScrn, "ddc")) {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
#if 1 /* for DDC1 testing */
if (!neoDoDDCVBE(pScrn))
if (!neoDoDDC2(pScrn))
@@ -1411,25 +1323,20 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
RETURN;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
if (!nPtr->noLinear) {
if (!xf86LoadSubModule(pScrn, "xaa"))
RETURN;
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
if (nPtr->shadowFB) {
if (!xf86LoadSubModule(pScrn, "shadow")) {
RETURN;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
if (!nPtr->swCursor) {
if (!xf86LoadSubModule(pScrn, "ramdac"))
RETURN;
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
return TRUE;
}
@@ -3208,7 +3115,6 @@ neoDoDDC2(ScrnInfoPtr pScrn)
VGAwGR(0x09,0x26);
if (xf86LoadSubModule(pScrn, "i2c")) {
- xf86LoaderReqSymLists(i2cSymbols, NULL);
if (neo_I2CInit(pScrn)) {
ret = xf86SetDDCproperties(pScrn,xf86PrintEDID(xf86DoEDID_DDC2(
pScrn->scrnIndex,nPtr->I2C)));
@@ -3229,7 +3135,6 @@ neoDoDDCVBE(ScrnInfoPtr pScrn)
VGAwGR(0x09,0x26);
if (xf86LoadSubModule(pScrn, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols, NULL);
if ((pVbe = VBEInit(NULL,nPtr->pEnt->index))) {
ret = xf86SetDDCproperties(
pScrn,xf86PrintEDID(vbeDoEDID(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 31e1e1e4a789295545d6924031ba6d56078f9afa
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 16:31:03 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/neomagic.man b/man/neomagic.man
index e5d59bf..9daffe5 100644
--- a/man/neomagic.man
+++ b/man/neomagic.man
@@ -90,7 +90,7 @@ following options are needed to avoid a lock-up of the graphic engine:
.fi
.SH "SEE ALSO"
-__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Jens Owen, Kevin E. Martin, and also Egbert Eich,
Mark Vojkovich, Alan Hourihane.
Reply to: