debian/changelog        |    4 ++++
 debian/libx11-6.symbols |   10 +++++-----
 debian/rules            |   10 +++++-----
 3 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit 0eeb6123667cfc0020fc0ac685dbb67352fda41e
Author: Julien Cristau <jcris...@debian.org>
Date:   Sat Jan 16 16:51:02 2010 +0000

    Update symbols file for sparc64 (closes: #560400).  Thanks, Aurélien Jarno!

diff --git a/debian/changelog b/debian/changelog
index 3936edb..3b80dff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ libx11 (2:1.3.2-2) UNRELEASED; urgency=low
     libx11-6.symbols accordingly.
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
     good reason.  Thanks, Colin Watson!
+  * Update symbols file for sparc64 (closes: #560400).  Thanks, Aurélien
+    Jarno!
 
  -- Julien Cristau <jcris...@debian.org>  Mon, 07 Dec 2009 15:17:13 +0100
 
diff --git a/debian/libx11-6.symbols b/debian/libx11-6.symbols
index 638c7b7..eb52212 100644
--- a/debian/libx11-6.symbols
+++ b/debian/libx11-6.symbols
@@ -791,7 +791,7 @@ libX11.so.6 libx11-6 #MINVER#
  _xcopyeventcoo...@base 2:1.2.99.901
  (optional)_xcopyto...@base 0 1
  _xcreatemutex...@base 0
- (arch=alpha amd64 kfreebsd-amd64 ia64)_xdat...@base 0
+ (arch=alpha amd64 kfreebsd-amd64 ia64 sparc64)_xdat...@base 0
  _xdefaulter...@base 0
  _xdefaultioer...@base 0
  (optional)_xdefaultope...@base 0 1
@@ -853,7 +853,7 @@ libX11.so.6 libx11-6 #MINVER#
  _xprocessinternalconnect...@base 0
  _xprocesswindowattribu...@base 0
  _xputbackev...@base 0
- (arch=alpha amd64 kfreebsd-amd64 ia64)_xrea...@base 0
+ (arch=alpha amd64 kfreebsd-amd64 ia64 sparc64)_xrea...@base 0
  _xr...@base 0
  _xreadeve...@base 0
  _xread...@base 0
@@ -1103,9 +1103,9 @@ libX11.so.6 libx11-6 #MINVER#
  (optional)_xkbinternatomf...@base 0 1
  (optional)_xkbnotecoremapchan...@base 0 1
  (optional)_xkbpeekatreadbuf...@base 0 1
- (optional|arch=alpha amd64 kfreebsd-amd64 ia64)_xkbreadbuffercop...@base 0 1
+ (optional|arch=alpha amd64 kfreebsd-amd64 ia64 
sparc64)_xkbreadbuffercop...@base 0 1
  (optional)_xkbreadbuffercopykeys...@base 0 1
- (optional|arch=alpha amd64 kfreebsd-amd64 ia64)_xkbreadcopydat...@base 0 1
+ (optional|arch=alpha amd64 kfreebsd-amd64 ia64 
sparc64)_xkbreadcopydat...@base 0 1
  (optional)_xkbreadcopykeys...@base 0 1
  (optional)_xkbreadgetcompatmapre...@base 0 1
  (optional)_xkbreadgetgeometryre...@base 0 1
@@ -1114,7 +1114,7 @@ libX11.so.6 libx11-6 #MINVER#
  (optional)_xkbreadgetnamesre...@base 0 1
  (optional)_xkbreload...@base 0 1
  (optional)_xkbskipreadbufferd...@base 0 1
- (optional|arch=alpha amd64 kfreebsd-amd64 ia64)_xkbwritecopydat...@base 0 1
+ (optional|arch=alpha amd64 kfreebsd-amd64 ia64 
sparc64)_xkbwritecopydat...@base 0 1
  (optional)_xkbwritecopykeys...@base 0 1
  (optional)_xkeyta...@base 0 1
  (optional)_xlcad...@base 0 1

commit afd64b9bcba19b997f2a74b90e89d92c981eb203
Author: Julien Cristau <jcris...@debian.org>
Date:   Sat Jan 16 16:48:54 2010 +0000

    Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good 
reason.  Thanks, Colin Watson!

diff --git a/debian/changelog b/debian/changelog
index d254678..3936edb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libx11 (2:1.3.2-2) UNRELEASED; urgency=low
 
   * xtrans has been fixed to not make us export a weak in6addr_any.  Adjust
     libx11-6.symbols accordingly.
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+    good reason.  Thanks, Colin Watson!
 
  -- Julien Cristau <jcris...@debian.org>  Mon, 07 Dec 2009 15:17:13 +0100
 
diff --git a/debian/rules b/debian/rules
index 406822d..cfa5502 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,8 +52,8 @@ build: build-stamp
 build-stamp: configure $(STAMP_DIR)/genscripts
        dh_testdir
 
-       mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
-       cd obj-$(DEB_BUILD_GNU_TYPE) && \
+       mkdir -p build
+       cd build && \
        ../configure \
                --prefix=/usr \
                --mandir=\$${prefix}/share/man \
@@ -61,7 +61,7 @@ build-stamp: configure $(STAMP_DIR)/genscripts
                --enable-specs \
                $(confflags) \
                CFLAGS="$(CFLAGS)"
-       cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+       cd build && $(MAKE)
        >$@
 
 clean: xsfclean
@@ -73,7 +73,7 @@ clean: xsfclean
        rm -f */config.cache */config.log */config.status
        rm -f conftest* */conftest*
        rm -rf autom4te.cache */autom4te.cache
-       rm -rf obj-*
+       rm -rf build
        rm -f aclocal.m4 compile config.guess config.sub configure
        rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
        rm -f src/config.h.in
@@ -89,7 +89,7 @@ install: build
        dh_clean -k
        dh_installdirs
 
-       cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install
+       cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
        # groff seems to produce ugly html, so only include the pdf and txt
        # versions
        rm -f debian/tmp/usr/share/doc/libX11/*.html


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to