[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-video-nv: Changes to 'debian-unstable'



 debian/changelog                   |    8 ++++++++
 debian/control                     |    3 ++-
 debian/patches/01_fix_linking.diff |   17 +++++++++++++++++
 debian/patches/series              |    1 +
 debian/rules                       |    4 ++--
 5 files changed, 30 insertions(+), 3 deletions(-)

New commits:
commit dd9f48bf3702b591106abce35e3506a7435005cb
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat May 15 13:39:00 2010 +0200

    Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index bd1d9ad..9ccf401 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-nv (1:2.1.17-3) UNRELEASED; urgency=low
+xserver-xorg-video-nv (1:2.1.17-3) unstable; urgency=low
 
   * Add patch to link against libpciaccess and libdrm, to ensure correct
     dependencies.
   * Make the libdrm-dev build-dep !hurd-i386.
 
- -- Julien Cristau <jcristau@debian.org>  Sat, 15 May 2010 13:30:05 +0200
+ -- Julien Cristau <jcristau@debian.org>  Sat, 15 May 2010 13:38:58 +0200
 
 xserver-xorg-video-nv (1:2.1.17-2) unstable; urgency=low
 

commit 97ac9e125a9d1d3c5d5fd642d0c2daec06447070
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat May 15 13:38:45 2010 +0200

    Also link against -lm for sin/cos

diff --git a/debian/patches/01_fix_linking.diff b/debian/patches/01_fix_linking.diff
index 69de179..bb98121 100644
--- a/debian/patches/01_fix_linking.diff
+++ b/debian/patches/01_fix_linking.diff
@@ -11,7 +11,7 @@ Index: xserver-xorg-video-nv/src/Makefile.am
  nv_drv_la_LTLIBRARIES = nv_drv.la
  nv_drv_la_LDFLAGS = -module -avoid-version
  nv_drv_ladir = @moduledir@/drivers
-+nv_drv_la_LIBADD = $(PCIACCESS_LIBS) $(LIBDRM_LIBS)
++nv_drv_la_LIBADD = $(PCIACCESS_LIBS) $(LIBDRM_LIBS) -lm
  
  nv_drv_la_SOURCES = $(nv_sources) $(riva_sources) $(g80_sources)
  

commit c9f31db2556a98612cf10196b2c4f594e98b94bd
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat May 15 13:31:09 2010 +0200

    Make the libdrm-dev build-dep !hurd-i386.
    
    No drm there.

diff --git a/debian/changelog b/debian/changelog
index 4b3f560..bd1d9ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-nv (1:2.1.17-3) UNRELEASED; urgency=low
 
   * Add patch to link against libpciaccess and libdrm, to ensure correct
     dependencies.
+  * Make the libdrm-dev build-dep !hurd-i386.
 
  -- Julien Cristau <jcristau@debian.org>  Sat, 15 May 2010 13:30:05 +0200
 
diff --git a/debian/control b/debian/control
index 09460ce..3bebcaf 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev,
- libdrm-dev (>= 2.4.3),
+ libdrm-dev (>= 2.4.3) [!hurd-i386],
  x11proto-xf86dri-dev,
  quilt,
 Standards-Version: 3.8.4

commit 42486a0e2897c06d3c4eb888176d860506425893
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat May 15 13:30:33 2010 +0200

    Add patch to link against libpciaccess and libdrm
    
    Ensures correct dependencies.

diff --git a/debian/changelog b/debian/changelog
index e6e01b7..4b3f560 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-nv (1:2.1.17-3) UNRELEASED; urgency=low
+
+  * Add patch to link against libpciaccess and libdrm, to ensure correct
+    dependencies.
+
+ -- Julien Cristau <jcristau@debian.org>  Sat, 15 May 2010 13:30:05 +0200
+
 xserver-xorg-video-nv (1:2.1.17-2) unstable; urgency=low
 
   * Merge upstream's master as of 17ab5dbea6. This includes the “Refuse to
diff --git a/debian/control b/debian/control
index 4ae7b36..09460ce 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Build-Depends:
  xutils-dev,
  libdrm-dev (>= 2.4.3),
  x11proto-xf86dri-dev,
+ quilt,
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git
diff --git a/debian/patches/01_fix_linking.diff b/debian/patches/01_fix_linking.diff
new file mode 100644
index 0000000..69de179
--- /dev/null
+++ b/debian/patches/01_fix_linking.diff
@@ -0,0 +1,17 @@
+From: Julien Cristau <jcristau@debian.org>
+Subject: Link against the libs we use
+
+Avoids undefined references, ensures correct package dependencies.
+
+Index: xserver-xorg-video-nv/src/Makefile.am
+===================================================================
+--- xserver-xorg-video-nv.orig/src/Makefile.am
++++ xserver-xorg-video-nv/src/Makefile.am
+@@ -27,6 +27,7 @@
+ nv_drv_la_LTLIBRARIES = nv_drv.la
+ nv_drv_la_LDFLAGS = -module -avoid-version
+ nv_drv_ladir = @moduledir@/drivers
++nv_drv_la_LIBADD = $(PCIACCESS_LIBS) $(LIBDRM_LIBS)
+ 
+ nv_drv_la_SOURCES = $(nv_sources) $(riva_sources) $(g80_sources)
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..459f02f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_fix_linking.diff
diff --git a/debian/rules b/debian/rules
index a06fbe2..bcb8a3f 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: 
+configure: $(STAMP_DIR)/patch
 	dh_testdir
 	autoreconf -vfi
 
@@ -50,7 +50,7 @@ build-stamp: build/config.status
 	cd build && $(MAKE)
 	>$@
 
-clean: 
+clean: xsfclean
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp


Reply to: