xserver-xorg-video-cirrus: Changes to 'upstream-unstable'
ChangeLog | 421 ++++++++++++++
configure.ac | 2
debian/README.source | 73 ++
debian/changelog | 208 +++++++
debian/compat | 1
debian/control | 39 +
debian/copyright | 67 ++
debian/rules | 99 +++
debian/watch | 2
debian/xserver-xorg-video-cirrus.install | 1
debian/xserver-xorg-video-cirrus.links | 1
debian/xserver-xorg-video-cirrus.manpages | 1
debian/xsfbs/repack.sh | 32 +
debian/xsfbs/xsfbs.mk | 293 ++++++++++
debian/xsfbs/xsfbs.sh | 853 ++++++++++++++++++++++++++++++
src/alp_driver.c | 6
src/cir_driver.c | 3
src/cir_shadow.c | 1
src/lg_driver.c | 5
19 files changed, 2103 insertions(+), 5 deletions(-)
New commits:
commit 5cbe6d11d11070da698a6a3ddd5d95d1cff34da1
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:26 2009 +1000
cirrus: bump for release 1.3.2
diff --git a/configure.ac b/configure.ac
index 14b3a6f..d205eb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-cirrus],
- 1.3.1,
+ 1.3.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-cirrus)
commit 4ecaa548a996475fbb4c6403698b2ecaf35e9d6b
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:40 2009 +1000
cirrus: change to using ABI version check
diff --git a/src/alp_driver.c b/src/alp_driver.c
index c5c531d..fe81757 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -36,7 +36,7 @@
/* This driver needs to be modified to not use vgaHW for multihead operation */
#include "vgaHW.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#include "xf86Resources.h"
#endif
diff --git a/src/cir_driver.c b/src/cir_driver.c
index 758e2fb..5466c48 100644
--- a/src/cir_driver.c
+++ b/src/cir_driver.c
@@ -21,7 +21,7 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#endif
/* All drivers need this */
diff --git a/src/lg_driver.c b/src/lg_driver.c
index 9d0850b..cfc3e65 100644
--- a/src/lg_driver.c
+++ b/src/lg_driver.c
@@ -39,7 +39,7 @@
/* This driver needs to be modified to not use vgaHW for multihead operation */
#include "vgaHW.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#include "xf86Resources.h"
#endif
commit 2765aba56fe66038ab7de554474b8d30995f3ef0
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:29 2009 +1000
cirrus: update for resources/RAC API removal
diff --git a/src/alp_driver.c b/src/alp_driver.c
index a14a5e8..c5c531d 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -36,8 +36,10 @@
/* This driver needs to be modified to not use vgaHW for multihead operation */
#include "vgaHW.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86RAC.h"
#include "xf86Resources.h"
+#endif
/* All drivers initialising the SW cursor need this */
#include "mipointer.h"
@@ -695,7 +697,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
(unsigned long)pCir->IOAddress);
} else
xf86DrvMsg(pScrn->scrnIndex, from1, "Not Using MMIO\n");
-
+
+#ifndef XSERVER_LIBPCIACCESS
/*
* XXX Check if this is correct
*/
@@ -712,6 +715,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
"xf86RegisterResources() found resource conflicts\n");
return FALSE;
}
+#endif
if (!xf86LoadSubModule(pScrn, "i2c")) {
AlpFreeRec(pScrn);
diff --git a/src/cir_driver.c b/src/cir_driver.c
index 4cdce94..758e2fb 100644
--- a/src/cir_driver.c
+++ b/src/cir_driver.c
@@ -21,8 +21,9 @@
#include "xf86.h"
#include "xf86_OSproc.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
-
+#endif
/* All drivers need this */
/* Drivers for PCI hardware need this */
diff --git a/src/cir_shadow.c b/src/cir_shadow.c
index e8b8d35..b89890a 100644
--- a/src/cir_shadow.c
+++ b/src/cir_shadow.c
@@ -11,7 +11,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "shadowfb.h"
diff --git a/src/lg_driver.c b/src/lg_driver.c
index 2574472..9d0850b 100644
--- a/src/lg_driver.c
+++ b/src/lg_driver.c
@@ -39,8 +39,10 @@
/* This driver needs to be modified to not use vgaHW for multihead operation */
#include "vgaHW.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86RAC.h"
#include "xf86Resources.h"
+#endif
/* All drivers initialising the SW cursor need this */
#include "mipointer.h"
@@ -571,6 +573,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
pCir->FbMapSize = pScrn->videoRam * 1024;
pCir->IoMapSize = 0x4000; /* 16K for moment, will increase */
+#ifndef XSERVER_LIBPCIACCESS
pScrn->racIoFlags = RAC_COLORMAP
#ifndef EXPERIMENTAL
| RAC_VIEWPORT
@@ -584,7 +587,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
"xf86RegisterResources() found resource conflicts\n");
return FALSE;
}
-
+#endif
if (!xf86LoadSubModule(pScrn, "ddc")) {
LgFreeRec(pScrn);
return FALSE;
commit 54fb225b3486121ae0dba31712f870ec79003cbe
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Jul 19 23:53:14 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 7925bfa..35cf87c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.3.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.1-1) unstable; urgency=low
[ Julien Cristau ]
* Update debian/copyright from upstream's COPYING.
@@ -7,7 +7,7 @@ xserver-xorg-video-cirrus (1:1.3.1-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.2.
- -- Brice Goglin <bgoglin@debian.org> Sun, 19 Jul 2009 23:51:59 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sun, 19 Jul 2009 23:52:36 +0200
xserver-xorg-video-cirrus (1:1.3.0-1) unstable; urgency=low
commit 63333dab6fe4068b43e145fcc60c09429aa8ed36
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Jul 19 23:52:29 2009 +0200
Bump Standards-Version
diff --git a/debian/changelog b/debian/changelog
index 19a373f..7925bfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ xserver-xorg-video-cirrus (1:1.3.1-1) UNRELEASED; urgency=low
[ Brice Goglin ]
* New upstream release.
+ * Bump Standards-Version to 3.8.2.
- -- Brice Goglin <bgoglin@debian.org> Sun, 19 Jul 2009 23:50:20 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sun, 19 Jul 2009 23:51:59 +0200
xserver-xorg-video-cirrus (1:1.3.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 3c19df8..2462f4c 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-cirrus
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-cirrus.git
commit e029de457044f2d469fd6be70886805b76341460
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Jul 19 23:50:42 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 2ccae80..912b6ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+commit ecdf94e86d44bdbeff1bb944fb372da92d2fa907
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Jul 2 10:28:20 2009 -0400
+
+ cirrus 1.3.1
+
+commit 2939b59585d96bb9b6f852ddb1eaa5ffd4df1cfb
+Author: Dave Airlie <airlied@redhat.com>
+Date: Wed Jun 10 14:16:32 2009 +1000
+
+ cirrus: add inputstr.h explicitly
+
+ using inputInfo requires inputstr.h this got included by accident before
+
+commit f07b4a3c5dd3e6834367e223aa454054c34a2ac8
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu May 28 14:53:06 2009 -0400
+
+ Remove useless loader symbol lists.
+
commit 15b1632d4136d4d20e006626836fb1f73c5a61f7
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu May 7 06:56:57 2009 -0700
diff --git a/debian/changelog b/debian/changelog
index acc0116..19a373f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-xserver-xorg-video-cirrus (1:1.3.0-2) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.1-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Update debian/copyright from upstream's COPYING.
- -- Julien Cristau <jcristau@debian.org> Mon, 08 Jun 2009 18:21:18 +0200
+ [ Brice Goglin ]
+ * New upstream release.
+
+ -- Brice Goglin <bgoglin@debian.org> Sun, 19 Jul 2009 23:50:20 +0200
xserver-xorg-video-cirrus (1:1.3.0-1) unstable; urgency=low
commit 8a0d7ba8410d06dc0186707e1732b37bf631b3b0
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 8 18:21:32 2009 +0200
Update debian/copyright from upstream's COPYING.
diff --git a/debian/changelog b/debian/changelog
index c744a5b..acc0116 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-cirrus (1:1.3.0-2) UNRELEASED; urgency=low
+
+ * Update debian/copyright from upstream's COPYING.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 08 Jun 2009 18:21:18 +0200
+
xserver-xorg-video-cirrus (1:1.3.0-1) unstable; urgency=low
[ David Nusinow ]
diff --git a/debian/copyright b/debian/copyright
index bb283cf..a76e7d7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,30 @@
This package was downloaded from
http://xorg.freedesktop.org/releases/individual/driver/
+Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the XFree86
+Project.
+
Copyright 2000 by Egbert Eich
Permission to use, copy, modify, distribute, and sell this software and its
@@ -20,3 +44,24 @@ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
+
+Copyright 2007 George Sapountzis
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
commit 194ac77ad4f6ef01d007b761fbaacebbb40fe4c8
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 8 18:01:21 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 4d87f1c..c744a5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.3.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.0-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-cirrus (1:1.3.0-1) UNRELEASED; urgency=low
* New upstream release.
* Add README.source, bump Standards-Version to 3.8.1.
- -- David Nusinow <dnusinow@debian.org> Mon, 04 May 2009 21:50:40 -0400
+ -- Julien Cristau <jcristau@debian.org> Mon, 08 Jun 2009 18:00:08 +0200
xserver-xorg-video-cirrus (1:1.2.1-4) unstable; urgency=low
commit 3c15fe093509989a79b2a4e733e80c2d76753187
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 8 17:59:53 2009 +0200
Don't try to install the pci id list
diff --git a/debian/xserver-xorg-video-cirrus.install b/debian/xserver-xorg-video-cirrus.install
index a8fac35..daf7bfe 100644
--- a/debian/xserver-xorg-video-cirrus.install
+++ b/debian/xserver-xorg-video-cirrus.install
@@ -1,2 +1 @@
usr/lib/xorg/modules/drivers/*.so
-usr/share/xserver-xorg/pci/*
commit 54f7ce3a406b96eed6b49483e3bf61f05a79d061
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 8 17:58:18 2009 +0200
Bump Standards-Version
diff --git a/debian/changelog b/debian/changelog
index cd68cc6..4d87f1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-video-cirrus (1:1.3.0-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* New upstream release.
+ * Add README.source, bump Standards-Version to 3.8.1.
-- David Nusinow <dnusinow@debian.org> Mon, 04 May 2009 21:50:40 -0400
diff --git a/debian/control b/debian/control
index 5d3b8a6..3c19df8 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.1
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-cirrus
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-cirrus.git
commit 8dc8cbedb3c85a49cfee77b32ca9346294bd6894
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 8 17:57:38 2009 +0200
Update changelog
diff --git a/debian/changelog b/debian/changelog
index 43ce2e9..cd68cc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-xserver-xorg-video-cirrus (1:1.2.1-5) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.3.0-1) UNRELEASED; urgency=low
+ [ David Nusinow ]
* Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
pick a driver during autoconfig.
+ Disable patch system and remove quilt from build-dep
+ [ Julien Cristau ]
+ * New upstream release.
+
-- David Nusinow <dnusinow@debian.org> Mon, 04 May 2009 21:50:40 -0400
xserver-xorg-video-cirrus (1:1.2.1-4) unstable; urgency=low
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 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 5758ae416b4504d892e17b1f071a8c10d58ee5c5
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 4 21:51:42 2009 -0400
Remove 01_gen_pci_ids.diff.
The X server now uses an internal table to pick a driver during autoconfig.
Disable patch system and remove quilt from build-dep
diff --git a/debian/changelog b/debian/changelog
index 120f5f4..43ce2e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-cirrus (1:1.2.1-5) UNRELEASED; urgency=low
+
+ * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+ pick a driver during autoconfig.
+ + Disable patch system and remove quilt from build-dep
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 04 May 2009 21:50:40 -0400
+
xserver-xorg-video-cirrus (1:1.2.1-4) unstable; urgency=low
* Upload to unstable.
diff --git a/debian/control b/debian/control
index 130c387..5d3b8a6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org
Build-Depends:
debhelper (>= 5),
pkg-config,
- quilt,
xserver-xorg-dev (>= 2:1.5.99.901),
x11proto-video-dev,
x11proto-core-dev,
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index 707426b..0000000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: xserver-xorg-video-cirrus/src/cirrus.ids
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver-xorg-video-cirrus/src/cirrus.ids 2008-05-22 08:21:10.000000000 +0200
-@@ -0,0 +1,11 @@
-+101300A0
-+101300A4
-+101300A8
-+101300AC
-+101300B8
-+101300BC
-+101300D0
-+101300D4
-+101300D5
-+101300D6
-+10130038
-Index: xserver-xorg-video-cirrus/src/Makefile.am
-===================================================================
---- xserver-xorg-video-cirrus.orig/src/Makefile.am 2008-05-22 08:20:51.000000000 +0200
-+++ xserver-xorg-video-cirrus/src/Makefile.am 2008-05-22 08:21:10.000000000 +0200
-@@ -57,3 +57,6 @@
- lg_i2c.c \
- lg_xaa.c \
- lg_xaa.h
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = cirrus.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 1aad3af..8476ace 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-configure: $(STAMP_DIR)/patch
+configure:
dh_testdir
autoreconf -vfi
@@ -48,7 +48,7 @@ build-stamp: configure
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
>$@
-clean: xsfclean
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
commit 7514ee5cb4256b921ecb737ad14f2ec741983370
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 9 09:57:14 2009 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index f4ce803..120f5f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-cirrus (1:1.2.1-4) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 09 Apr 2009 09:57:09 +0100
+
xserver-xorg-video-cirrus (1:1.2.1-3) experimental; urgency=low
* Merge changes from 1:1.2.1-1.lenny1.
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 2ed171f9f390de4e97141c0016d3ba615e8c943e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Feb 17 17:20:42 2009 +0100
xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so
libx11's postinst was the only post-sarge user, and it's gone now.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 72efa95..8840ff9 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -719,72 +719,6 @@ run () {
fi
}
-register_x_lib_dir_with_ld_so () {
- # syntax: register_x_lib_dir_with_ld_so
- #
- # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared
- # libraries.
- #
- # Call this function from the postinst script of a package that places a
- # shared library in /usr/X11R6/lib, before invoking ldconfig.
-
- local dir ldsoconf
-
- dir="/usr/X11R6/lib"
- ldsoconf="/etc/ld.so.conf"
-
- # is the line not already present?
- if ! fgrep -qsx "$dir" "$ldsoconf"; then
- observe "adding $dir directory to $ldsoconf"
- echo "$dir" >> "$ldsoconf"
- fi
-}
-
-deregister_x_lib_dir_with_ld_so () {
- # syntax: deregister_x_lib_dir_with_ld_so
- #
- # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared
- # libraries, if and only if no shared libaries remain there.
- #
- # Call this function from the postrm script of a package that places a shared
- # library in /usr/X11R6/lib, in the event "$1" is "remove", and before
- # invoking ldconfig.
-
- local dir ldsoconf fgrep_status cmp_status
-
- dir="/usr/X11R6/lib"
- ldsoconf="/etc/ld.so.conf"
-
- # is the line present?
- if fgrep -qsx "$dir" "$ldsoconf"; then
- # are there any shared objects in the directory?
- if [ "$(echo "$dir"/lib*.so.*.*)" = "$dir/lib*.so.*.*" ]; then
- # glob expansion produced nothing, so no shared libraries are present
- observe "removing $dir directory from $ldsoconf"
- # rewrite the file (very carefully)
- set +e
- fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
- fgrep_status=$?
- set -e
- case $fgrep_status in
- 0|1) ;; # we don't actually care if any lines matched or not
- *) die "error reading \"$ldsoconf\"; fgrep exited with status" \
- "$fgrep_status" ;;
- esac
- set +e
- cmp -s "$ldsoconf.dpkg-tmp" "$ldsoconf"
- cmp_status=$?
- set -e
- case $cmp_status in
- 0) rm "$ldsoconf.dpkg-tmp" ;; # files are identical
- 1) mv "$ldsoconf.dpkg-tmp" "$ldsoconf" ;; # files differ
- *) die "error comparing \"$ldsoconf.dpkg-tmp\" to \"$ldsoconf\";" \
- "cmp exited with status $cmp_status" ;;
- esac
- fi
- fi
-}
-
make_symlink_sane () {
# syntax: make_symlink_sane symlink target
#
commit 84b7d5bf7a57cab80ba3696ce95028c2f67ba76d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 1 01:31:31 2009 +0100
xsfbs: add a repack script for uscan
This will automatically prune upstream tarballs
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
new file mode 100644
index 0000000..5935cc9
--- /dev/null
+++ b/debian/xsfbs/repack.sh
@@ -0,0 +1,32 @@
+#!/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
commit adadc6970fbf0a6afd671c31a0b31417108dfa1a
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 25 21:39:33 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 88b63d0..f4ce803 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-cirrus (1:1.2.1-3) UNRELEASED; urgency=low
+xserver-xorg-video-cirrus (1:1.2.1-3) experimental; urgency=low
* Merge changes from 1:1.2.1-1.lenny1.
* Run autoreconf on build. Build-depend on automake, libtool and
@@ -7,7 +7,7 @@ xserver-xorg-video-cirrus (1:1.2.1-3) UNRELEASED; urgency=low
* Build against xserver 1.6 rc1.
* Add myself to Uploaders.
- -- Julien Cristau <jcristau@debian.org> Sun, 25 Jan 2009 21:17:45 +0100
+ -- Julien Cristau <jcristau@debian.org> Sun, 25 Jan 2009 21:39:31 +0100
xserver-xorg-video-cirrus (1:1.2.1-2) experimental; urgency=low
commit e51c61965859ff06bbc67f9d7decc6a4ad30caa0
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 25 21:39:27 2009 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index f6c1514..88b63d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xserver-xorg-video-cirrus (1:1.2.1-3) UNRELEASED; urgency=low
xutils-dev.
* Handle parallel builds.
* Build against xserver 1.6 rc1.
+ * Add myself to Uploaders.
-- Julien Cristau <jcristau@debian.org> Sun, 25 Jan 2009 21:17:45 +0100
diff --git a/debian/control b/debian/control
index 4480513..130c387 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-cirrus
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>, Julien Cristau <jcristau@debian.org>
Build-Depends:
debhelper (>= 5),
pkg-config,
commit 2d3e738e3274eafcf9992e3703e5e8f9a0143595
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 25 21:35:41 2009 +0100
Build against xserver 1.6 rc1.
diff --git a/debian/changelog b/debian/changelog
index 2aa4838..f6c1514 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-cirrus (1:1.2.1-3) UNRELEASED; urgency=low
* Run autoreconf on build. Build-depend on automake, libtool and
xutils-dev.
* Handle parallel builds.
+ * Build against xserver 1.6 rc1.
-- Julien Cristau <jcristau@debian.org> Sun, 25 Jan 2009 21:17:45 +0100
diff --git a/debian/control b/debian/control
index 6a073aa..4480513 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 5),
pkg-config,
quilt,
- xserver-xorg-dev (>= 2:1.5),
+ xserver-xorg-dev (>= 2:1.5.99.901),
x11proto-video-dev,
x11proto-core-dev,
x11proto-fonts-dev,
commit 07b9d60b677f80ccd2654ee498ee34eed7bfbe88
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 25 21:33:46 2009 +0100
Delete generated files
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 3cc47f1..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,674 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
Reply to: