[SCM] liblo/master: Merge branch 'no-sparc'

[fsateler at users.alioth.debian.org]

Remove .la file, not depended upon
Release to unstable
Regen debian control
Depend on doxygen, not doxygen-latex
Do not build on sparc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2209c4e7644641a7e52427de37ee5ed7acafab6d
X-Git-Newrev: 0f519b93e12055bd6690ede63234407a82fe32e5

The following commit has been merged in the master branch:
commit 921896b4430c800716918da1f8c7480b3e518a37
Merge: ca82b7c34733cf860a5991df9d6367d40a5e621c 29b3e2268caccbeccc8df56b156c0595ba6d5f89
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Jan 31 13:09:42 2014 -0300

    Merge branch 'no-sparc'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/rules

diff --combined debian/changelog
index d0eb22f,3bb40ad..10b9716
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,19 @@@
 +liblo (0.28~rc-1) experimental; urgency=low
 +
 +  * New upstream release candidate
 +    - Temporary patch to avoid stripping -Werror from CFLAGS,
 +      upstream already has a better one.
 +    - Add new symbols to symbols file.
 +
 + -- Felipe Sateler <fsateler at debian.org>  Thu, 28 Nov 2013 20:44:01 -0300
 +
+ liblo (0.26~repack-8) unstable; urgency=low
+ 
+   * Forcibly fail on sparc, doesn't work and never has.
+   * Drop build dependency on doxygen-latex
+ 
+  -- Felipe Sateler <fsateler at debian.org>  Thu, 28 Nov 2013 21:05:36 -0300
+ 
  liblo (0.26~repack-7) unstable; urgency=low
  
    * Update copyright file: Rewrite w/ Subversion draft rev.173 of DEP5.
diff --combined debian/control
index 40c7bf3,23c2df6..c83ceda
--- a/debian/control
+++ b/debian/control
@@@ -4,14 -4,15 +4,15 @@@ Section: lib
  Build-Depends: cdbs,
   autotools-dev,
   debhelper,
-  dh-buildinfo
+  dh-buildinfo,
+  doxygen
  Homepage: http://liblo.sourceforge.net/
  Standards-Version: 3.9.1
  Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
  Uploaders: Felipe Sateler <fsateler at debian.org>,
   Jonas Smedegaard <dr at jones.dk>
 -Vcs-Git: git://git.debian.org/git/pkg-multimedia/liblo.git
 -Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/liblo.git
 +Vcs-Git: git://anonscm.debian.org/pkg-multimedia/liblo.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/liblo.git
  
  Package: liblo-dev
  Section: libdevel
diff --combined debian/rules
index 41e6df0,96214dd..64de84a
--- a/debian/rules
+++ b/debian/rules
@@@ -1,7 -1,7 +1,7 @@@
  #!/usr/bin/make -f
  # -*- mode: makefile; coding: utf-8 -*-
  # Copyright © 2004-2006 Robert Jordens <rjo at gmx.de>
 -# Copyright © 2008-2009 Felipe Sateler <fsateler at gmail.com>
 +# Copyright © 2008-2013 Felipe Sateler <fsateler at debian.org>
  # Copyright © 2010-2011 Jonas Smedegaard <dr at jones.dk>
  # Description: Main Debian packaging script for LibLO
  #
@@@ -27,10 -27,20 +27,16 @@@ include /usr/share/cdbs/1/rules/debhelp
  CDBS_BUILD_DEPENDS_rules_upstream-tarball =
  CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
  
+ pre-build::
+ 	test "$(DEB_HOST_ARCH_CPU)" != "sparc"
+ 	test "$(DEB_HOST_ARCH_CPU)" != "sparc64"
+ 
+ CDBS_BUILD_DEPENDS += , doxygen
+ 
  DEB_UPSTREAM_URL = http://downloads.sourceforge.net/liblo
  
 -# FIXME: remove this section before next upstream release (and adjust
 -# watch file too!), to use default "dfsg" instead
 -DEB_UPSTREAM_REPACKAGE_TAG = repack
 -
 -# sourceless binary useful only for windows builds
 -DEB_UPSTREAM_REPACKAGE_EXCLUDE = build/premake4.exe
 +DEB_UPSTREAM_TARBALL_MD5 = 3d83e0f8c9ab67a783ab60fcb227170d
  
  #DEB_SHLIBDEPS_INCLUDE = lib/.libs
  DEB_CONFIGURE_USER_FLAGS = --enable-static
 +DEB_MAKE_CHECK_TARGET=test

-- 
liblo packaging