xserver-xorg-video-cirrus: Changes to 'debian-unstable'
ChangeLog | 45 +++++++++++++++++++
autogen.sh | 4 +
configure.ac | 3 -
debian/changelog | 8 +++
debian/compat | 2
debian/control | 2
debian/rules | 4 +
debian/upstream/signing-key.asc | 94 ++++++++++++++++++++++++++++++++++++++++
debian/watch | 1
src/Makefile.am | 10 +++-
src/alp_driver.c | 2
src/cir.h | 2
src/lg_driver.c | 2
13 files changed, 171 insertions(+), 8 deletions(-)
New commits:
commit 8639f7afc5ef41cabdc3003049d7770d04336c99
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 7 18:01:46 2015 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 343afca..a8b0e6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-cirrus (1:1.5.3-1) UNRELEASED; urgency=medium
+xserver-xorg-video-cirrus (1:1.5.3-1) unstable; urgency=medium
* New upstream release.
* Bump debhelper compat level to 9.
* Let uscan verify tarball signatures.
- -- Julien Cristau <jcristau@debian.org> Thu, 07 May 2015 17:57:48 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 07 May 2015 18:01:43 +0200
xserver-xorg-video-cirrus (1:1.5.2-2) unstable; urgency=medium
commit 744ceb8c4a64bf6416d5e3921e806caa050e283e
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 7 18:00:07 2015 +0200
Let uscan verify tarball signatures.
diff --git a/debian/changelog b/debian/changelog
index bc7418d..343afca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-cirrus (1:1.5.3-1) UNRELEASED; urgency=medium
* New upstream release.
* Bump debhelper compat level to 9.
+ * Let uscan verify tarball signatures.
-- Julien Cristau <jcristau@debian.org> Thu, 07 May 2015 17:57:48 +0200
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..3cf2356
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,94 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBEoIZDEBEAD5MrFJC9Hi4mXZ97HlFotHIrkMURIFkvl17XEuJ8Jh3hlzJD/q
+K1ByzQGHozzVcfbg4lP4lzqfdps6WCbusqtVYcTF61jjFhYo398lBgpKHUBbsEPC
+SfYp5WkoICa824zcmWO9qYizGqkpd1C6gdQtK6ZaGjLx3xt08M9oVZqj+E2SsPHz
+WaYLugCwCKhlbVTaP28OGy7tBRY6hcLtiZc2CNpr0YjZ53B7Ubs0BVYQutYxho7l
+u0ChE9zNesy4KaIOumXZjTUrMCLpxF/01M1tfzXArMMLAqx3F1M6QIuy18F1zJ2W
+LlkRwJi47NTiJ6jwLUYKBTN9T3nmy0oNAvv5v4B8nWgZAOjjDC2pFoVJa1O3K8Ab
+vSRA3L/N+80MxM9VK5bw451pDqNhxn5q0yeS+RBagmOb2PZSMIuw9adooMurAfDJ
+hsxqp3KaCTdYX5p+mCczNkoKMRUQiVUi250426o69IAmtpVi1q+MV0qWLl2tSvx4
+I4iph9XAhho7ycb4jziWf46ZljnhoGn54EU5GEqH0huakYcXK7XoNxU0XzS/eQuD
+qVy2NH2C945h3LAtMo4zr49VZXjNnFn++zZqCUHASDX6Y3h8uMpzIY6Eslu2S85W
+gpb+V4M5RvKPeuEJTuzxJOOW/B3nyoWFQfN6SXWGVW618dLEmFmQnyLBwwARAQAB
+tCxKdWxpZW4gQ3Jpc3RhdSA8anVsaWVuLmNyaXN0YXVAZW5zLWx5b24ub3JnPokC
+PAQTAQgAJgIbAwIeAQIXgAYLCQgHAwIGFQoJCAsCBRYCAwEABQJK4Fj7AhkBAAoJ
+EDEBgAUJBeQMu/wP/jmGDVXrXZXtNJ7Ov94iDBwcEBlLoNHUyH4FWQG05eW3CqT0
+w9ZOvZEQ/kKlSjpdZzPiYMjgunl7D78aoL4Il2qKyirlT+trt+v79rl5VkD2xJx/
+gi7iN34VJQ50iGBxyxPicUjkXUO17kpJ2/uw/7/pNG0buBDbLGPwYPQFyV3UVOv7
+R8chvmAqtujck1961gRffKPihiv6sj4zjGs8ukmLCO3EgLzpz3shBfJyq6GNMNmy
+aVX7hAcwhErKCrPeGVlzFpCLbtqIxpq6uPfxrDI20LhQkQ9NPD/4t1qkvenRCY77
+wqoiUBSYlpsKND2I2mywOE2FVMj34aBKvn96YsZWlj3Rkc++JvzdZQy09WQIUXt5
+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
+aXN0YXUgPGp1bGllbi5jcmlzdGF1QGVucy1seW9uLmZyPohJBDARAgAJBQJFjH+5
+Ah0gAAoJEJhL04CsX3AMIdgAoMDTrauaegRFs2hW/H4bEj5B8rSGAJ9zQRshjpCh
+IzPtJsMdSCyInONwnrQsSnVsaWVuIENyaXN0YXUgPGp1bGllbi5jcmlzdGF1QGVu
+cy1seW9uLm9yZz6IYQQTEQIAIQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAUCQddH
+owIZAQAKCRCYS9OArF9wDPcYAJ9vPsOBX05lUoEy/VT/sMzz884/bgCggGDqs5bR
+rLklhu/WRk4b6taKN/e5AQ0EQcwvOxAEAJEOGRr8ig7lAWPahsex4QOzacycxp1Q
+hqZj+A/5Il6fjSB7egXDt/trzT8hIfXYlwFULvMXSOeT8BqYAEJzWcZFxMP3pYy+
+W3zocT0+Pbms1tb2HB/P6slpsDt4ZbEygXKXQ7PmB50izQIFyd9BmfKJy1CnEwc+
+CPXel4yVZVGDAAMFA/92k0/xEVWK68CaQ6i+Amac2rnlgSEtZmVDvIzMaAe/yl7Z
+GttixkHR94Z66G+o76FNx9K2oWVlz7gQK6fm0Uelc40h83JR4WPbR5a72DBnSEgd
+9fxUbsekYRRmMc3aTgaaznMMLGa+dCXf3TBRpTjpadBCFO885xIveE9jrxAM2YhJ
+BBgRAgAJBQJBzC87AhsMAAoJEJhL04CsX3AM3yYAoMnXxWxRbAJsbAm1lyKQ1jGS
+F7K9AKDGJmrHIk0K7tS+zUqfd0rqBj35vg==
+=IiED
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 8219798..74e9629 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-cirrus
version=3
+opts="pgpsigurlmangle=s/$/.sig/" \
http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-cirrus-(.*)\.tar\.gz
commit a1df269601e25617713b6f2f57cb68589ae5bc32
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 7 17:59:29 2015 +0200
Bump debhelper compat level to 9.
diff --git a/debian/changelog b/debian/changelog
index 18b7206..bc7418d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-cirrus (1:1.5.3-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Bump debhelper compat level to 9.
-- Julien Cristau <jcristau@debian.org> Thu, 07 May 2015 17:57:48 +0200
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index a732a03..4039730 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 9),
dh-autoreconf,
quilt,
pkg-config,
diff --git a/debian/rules b/debian/rules
index 496a59a..bf3cf96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,9 @@
#!/usr/bin/make -f
override_dh_auto_configure:
- dh_auto_configure -- --disable-silent-rules
+ dh_auto_configure -- \
+ --disable-silent-rules \
+ --libdir=\$${exec_prefix}/lib
# Install in debian/tmp to retain control through dh_install:
override_dh_auto_install:
commit b470024ec4ebcd84970f8fd6a2b2cd2a05904714
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 7 17:57:56 2015 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index d730d78..47e3827 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+commit 3a2e2d9ef8512c265e3fc3311a69120d03a888b3
+Author: Julien Cristau <jcristau@debian.org>
+Date: Wed May 6 22:46:51 2015 +0200
+
+ cirrus 1.5.3
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit df389885adf71ed3b045c2fde9fd3ba4329e1a58
+Author: Dave Airlie <airlied@gmail.com>
+Date: Sat Sep 20 18:51:17 2014 +1000
+
+ cirrus: don't use pciTag
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit f0d278b48a659d4811f5494bf7de4a84e9c5880f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Nov 17 10:19:41 2013 -0800
+
+ Skip building xaa files when XAA is not supported
+
+ No point building & linking empty *.o files into the drivers.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 6504929481eab616f064b5d661a057de74b8b488
+Author: Colin Walters <walters@verbum.org>
+Date: Wed Jan 4 17:37:06 2012 -0500
+
+ autogen.sh: Implement GNOME Build API
+
+ http://people.gnome.org/~walters/docs/build-api.txt
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 0313bab7f16633a6a1b26e195255196fa69ac209
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Jan 16 13:18:23 2013 -0500
+
+ configure: Drop AM_MAINTAINER_MODE
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
commit e2bf5b255611de267bc1c56b2fccf51268d28f3d
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Jan 8 11:04:38 2013 +0100
diff --git a/debian/changelog b/debian/changelog
index 859f2d4..18b7206 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-cirrus (1:1.5.3-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 07 May 2015 17:57:48 +0200
+
xserver-xorg-video-cirrus (1:1.5.2-2) unstable; urgency=medium
* Remove Cyril Brulebois from Uploaders.
commit 3a2e2d9ef8512c265e3fc3311a69120d03a888b3
Author: Julien Cristau <jcristau@debian.org>
Date: Wed May 6 22:46:51 2015 +0200
cirrus 1.5.3
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/configure.ac b/configure.ac
index 9b3dcac..02285c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-cirrus],
- [1.5.2],
+ [1.5.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-cirrus])
AC_CONFIG_SRCDIR([Makefile.am])
commit df389885adf71ed3b045c2fde9fd3ba4329e1a58
Author: Dave Airlie <airlied@gmail.com>
Date: Sat Sep 20 18:51:17 2014 +1000
cirrus: don't use pciTag
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/src/alp_driver.c b/src/alp_driver.c
index 36f2039..bd5e52f 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -519,9 +519,11 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
pCir->Chipset = pCir->pEnt->chipset;
/* Find the PCI info for this screen */
pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo),
PCI_DEV_DEV(pCir->PciInfo),
PCI_DEV_FUNC(pCir->PciInfo));
+#endif
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
if (!xf86IsPc98())
diff --git a/src/cir.h b/src/cir.h
index 0a5d403..84f64b5 100644
--- a/src/cir.h
+++ b/src/cir.h
@@ -23,7 +23,9 @@ typedef struct {
ScrnInfoPtr pScrn;
CARD32 properties;
pciVideoPtr PciInfo;
+#ifndef XSERVER_LIBPCIACCESS
PCITAG PciTag;
+#endif
unsigned long PIOReg;
union {
struct lgRec *lg;
diff --git a/src/lg_driver.c b/src/lg_driver.c
index c20bbd0..589d14e 100644
--- a/src/lg_driver.c
+++ b/src/lg_driver.c
@@ -382,9 +382,11 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
/* Find the PCI info for this screen */
pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo),
PCI_DEV_DEV(pCir->PciInfo),
PCI_DEV_FUNC(pCir->PciInfo));
+#endif
if (xf86LoadSubModule(pScrn, "int10")) {
xf86Int10InfoPtr int10InfoPtr;
commit f0d278b48a659d4811f5494bf7de4a84e9c5880f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Nov 17 10:19:41 2013 -0800
Skip building xaa files when XAA is not supported
No point building & linking empty *.o files into the drivers.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index c649b3d..36b8d8b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,9 +44,12 @@ cirrus_alpine_la_SOURCES = \
alp_driver.c \
alp.h \
alp_hwcurs.c \
- alp_i2c.c \
+ alp_i2c.c
+if XAA
+cirrus_alpine_la_SOURCES += \
alp_xaa.c \
alp_xaam.c
+endif
cirrus_laguna_la_LTLIBRARIES = cirrus_laguna.la
cirrus_laguna_la_LDFLAGS = -module -avoid-version
@@ -55,6 +58,9 @@ cirrus_laguna_la_SOURCES = \
lg_driver.c \
lg.h \
lg_hwcurs.c \
- lg_i2c.c \
+ lg_i2c.c
+if XAA
+cirrus_laguna_la_SOURCES += \
lg_xaa.c \
lg_xaa.h
+endif
commit 6504929481eab616f064b5d661a057de74b8b488
Author: Colin Walters <walters@verbum.org>
Date: Wed Jan 4 17:37:06 2012 -0500
autogen.sh: Implement GNOME Build API
http://people.gnome.org/~walters/docs/build-api.txt
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/autogen.sh b/autogen.sh
index 904cd67..fc34bd5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,4 +9,6 @@ cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
-$srcdir/configure --enable-maintainer-mode "$@"
+if test -z "$NOCONFIGURE"; then
+ $srcdir/configure "$@"
+fi
commit 0313bab7f16633a6a1b26e195255196fa69ac209
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 16 13:18:23 2013 -0500
configure: Drop AM_MAINTAINER_MODE
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index 0e00305..9b3dcac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,6 @@ AC_CONFIG_AUX_DIR(.)
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
Reply to: