xserver-xorg-video-savage: Changes to 'debian-unstable'
debian/changelog | 17 +++++++++++-
debian/control | 2 -
debian/patches/01_gen_pci_ids.diff | 39 ++++++++++++++++++++++++++++
debian/patches/series | 1
debian/rules | 2 -
debian/xserver-xorg-video-savage.install | 1
src/Makefile.in | 42 ++++++++++++++++++++++++-------
7 files changed, 91 insertions(+), 13 deletions(-)
New commits:
commit 4decfe03f8d2592ad93975fccf497c7dd9848251
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Sep 16 16:18:39 2007 -0400
* Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 235fd18..ee28b9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-savage (1:2.1.3-3) unstable; urgency=low
+
+ * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 16 Sep 2007 15:43:47 -0400
+
xserver-xorg-video-savage (1:2.1.3-2) experimental; urgency=low
[ Brice Goglin ]
commit c3e06ad850cf7f857b2c44903522922b216176b7
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Sep 13 20:41:36 2007 -0400
* Build against X server 1.4 and build-dep on it as well
diff --git a/debian/changelog b/debian/changelog
index d5c0bb9..235fd18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,12 +5,12 @@ xserver-xorg-video-savage (1:2.1.3-2) experimental; urgency=low
thanks Tormod Volden, closes: #438975.
[ David Nusinow ]
- * Build against X server 1.3.99.0 and build-dep on it as well
+ * Build against X server 1.4 and build-dep on it as well
* Add 01_gen_pci_ids.diff. This patch provides a set of pci id's that this
driver supports so that the server can automatically load it
* Exclude savage_drv.la from dh_install
- -- David Nusinow <dnusinow@debian.org> Fri, 31 Aug 2007 18:09:56 -0400
+ -- David Nusinow <dnusinow@debian.org> Thu, 13 Sep 2007 20:40:23 -0400
xserver-xorg-video-savage (1:2.1.3-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index a0264c9..7114062 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>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.3.99.0), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt
Standards-Version: 3.7.2.0
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git
commit 23e26098563ab2c9090dd765ef51eb8c92edd19a
Author: David Nusinow <dnusinow@debian.org>
Date: Fri Aug 31 18:11:42 2007 -0400
Exclude savage_drv.la from dh_install
diff --git a/debian/changelog b/debian/changelog
index 97abd67..d5c0bb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ xserver-xorg-video-savage (1:2.1.3-2) experimental; urgency=low
* Build against X server 1.3.99.0 and build-dep on it as well
* Add 01_gen_pci_ids.diff. This patch provides a set of pci id's that this
driver supports so that the server can automatically load it
+ * Exclude savage_drv.la from dh_install
- -- David Nusinow <dnusinow@debian.org> Fri, 31 Aug 2007 18:04:25 -0400
+ -- David Nusinow <dnusinow@debian.org> Fri, 31 Aug 2007 18:09:56 -0400
xserver-xorg-video-savage (1:2.1.3-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 0dfa1a3..9af5d18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,7 +72,7 @@ binary-arch: build install serverabi
dh_installdocs
dh_installchangelogs ChangeLog
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install --sourcedir=debian/tmp --list-missing --exclude=savage_drv.la
dh_link
dh_strip
dh_compress
commit 96703c6c0448e969f2fd78a9e2b0e3bbc40f3827
Author: David Nusinow <dnusinow@debian.org>
Date: Fri Aug 31 18:09:08 2007 -0400
Add 01_gen_pci_ids.diff.
This patch provides a set of pci id's that this driver supports so that
the server can automatically load it
Autoreconf
diff --git a/debian/changelog b/debian/changelog
index fd81cc8..97abd67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-savage (1:2.1.3-2) UNRELEASED; urgency=low
+xserver-xorg-video-savage (1:2.1.3-2) experimental; urgency=low
[ Brice Goglin ]
* Drop the obsolete src/savage_image.c from the .diff.gz,
@@ -6,6 +6,8 @@ xserver-xorg-video-savage (1:2.1.3-2) UNRELEASED; urgency=low
[ David Nusinow ]
* Build against X server 1.3.99.0 and build-dep on it as well
+ * Add 01_gen_pci_ids.diff. This patch provides a set of pci id's that this
+ driver supports so that the server can automatically load it
-- David Nusinow <dnusinow@debian.org> Fri, 31 Aug 2007 18:04:25 -0400
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
new file mode 100644
index 0000000..d1d3811
--- /dev/null
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -0,0 +1,39 @@
+Index: xserver-xorg-video-savage/src/savage.ids
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xserver-xorg-video-savage/src/savage.ids 2007-08-31 18:03:03.000000000 -0400
+@@ -0,0 +1,23 @@
++53338A22
++53338A20
++53338A21
++53339102
++53338C10
++53338C11
++53338C12
++53338C13
++53338A25
++53338A26
++53338D01
++53338D02
++53338C22
++53338C24
++53338C26
++53338C2A
++53338C2B
++53338C2C
++53338C2D
++53338C2E
++53338C2F
++53338D03
++53338D04
+Index: xserver-xorg-video-savage/src/Makefile.am
+===================================================================
+--- xserver-xorg-video-savage.orig/src/Makefile.am 2007-08-31 18:03:21.000000000 -0400
++++ xserver-xorg-video-savage/src/Makefile.am 2007-08-31 18:04:03.000000000 -0400
+@@ -56,3 +56,6 @@
+ savage_dri.h \
+ savage_dripriv.h
+ endif
++
++pcidatadir = $(datadir)/xserver-xorg/pci
++pcidata_DATA = savage.ids
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..b55d79f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_gen_pci_ids.diff
diff --git a/debian/xserver-xorg-video-savage.install b/debian/xserver-xorg-video-savage.install
index 614cfb4..8a9f4ba 100644
--- a/debian/xserver-xorg-video-savage.install
+++ b/debian/xserver-xorg-video-savage.install
@@ -1,2 +1,3 @@
usr/lib/xorg/modules/drivers/*.so
usr/share/man/man4/*
+usr/share/xserver-xorg/pci/*
diff --git a/src/Makefile.in b/src/Makefile.in
index da42165..1988bdb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -34,6 +34,7 @@
# 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.
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -73,7 +74,8 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(savage_drv_ladir)"
+am__installdirs = "$(DESTDIR)$(savage_drv_ladir)" \
+ "$(DESTDIR)$(pcidatadir)"
savage_drv_laLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(savage_drv_la_LTLIBRARIES)
savage_drv_la_LIBADD =
@@ -107,6 +109,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(savage_drv_la_SOURCES)
DIST_SOURCES = $(am__savage_drv_la_SOURCES_DIST)
+pcidataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pcidata_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -252,6 +256,8 @@ savage_drv_la_SOURCES = savage_accel.c savage_xaa.c savage_exa.c \
savage_regs.h savage_sarea.h savage_shadow.c savage_streams.c \
savage_streams.h savage_vbe.c savage_vbe.h savage_video.c \
$(am__append_1)
+pcidatadir = $(datadir)/xserver-xorg/pci
+pcidata_DATA = savage.ids
all: all-am
.SUFFIXES:
@@ -361,6 +367,23 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
+install-pcidataDATA: $(pcidata_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(pcidatadir)" || $(MKDIR_P) "$(DESTDIR)$(pcidatadir)"
+ @list='$(pcidata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(pcidataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pcidatadir)/$$f'"; \
+ $(pcidataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pcidatadir)/$$f"; \
+ done
+
+uninstall-pcidataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pcidata_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(pcidatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pcidatadir)/$$f"; \
+ done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -438,9 +461,9 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LTLIBRARIES) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(savage_drv_ladir)"; do \
+ for dir in "$(DESTDIR)$(savage_drv_ladir)" "$(DESTDIR)$(pcidatadir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -488,7 +511,7 @@ info: info-am
info-am:
-install-data-am: install-savage_drv_laLTLIBRARIES
+install-data-am: install-pcidataDATA install-savage_drv_laLTLIBRARIES
install-dvi: install-dvi-am
@@ -524,7 +547,7 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-savage_drv_laLTLIBRARIES
+uninstall-am: uninstall-pcidataDATA uninstall-savage_drv_laLTLIBRARIES
.MAKE: install-am install-strip
@@ -535,12 +558,13 @@ uninstall-am: uninstall-savage_drv_laLTLIBRARIES
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-savage_drv_laLTLIBRARIES install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ install-pcidataDATA install-pdf install-pdf-am install-ps \
+ install-ps-am install-savage_drv_laLTLIBRARIES install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-savage_drv_laLTLIBRARIES
+ tags uninstall uninstall-am uninstall-pcidataDATA \
+ uninstall-savage_drv_laLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
commit cb39294c5d588db5805a02c7ead4a703f9d9e44a
Author: David Nusinow <dnusinow@debian.org>
Date: Fri Aug 31 18:04:46 2007 -0400
* Build against X server 1.3.99.0 and build-dep on it as well
diff --git a/debian/changelog b/debian/changelog
index ccc953a..fd81cc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
xserver-xorg-video-savage (1:2.1.3-2) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Drop the obsolete src/savage_image.c from the .diff.gz,
thanks Tormod Volden, closes: #438975.
- -- Brice Goglin <bgoglin@debian.org> Tue, 21 Aug 2007 20:27:33 +0200
+ [ David Nusinow ]
+ * Build against X server 1.3.99.0 and build-dep on it as well
+
+ -- David Nusinow <dnusinow@debian.org> Fri, 31 Aug 2007 18:04:25 -0400
xserver-xorg-video-savage (1:2.1.3-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 4b87f6a..a0264c9 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>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.3.99.0), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt
Standards-Version: 3.7.2.0
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git
Reply to: