[saods9] 02/03: Merge branch 'debian-unstable' into debian

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository saods9.

commit d3de60607b933ce9eadb06981b4e0235afd0510e
Merge: 6e3645f 2a5782e
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Sep 28 15:54:14 2013 +0200

    Merge branch 'debian-unstable' into debian
    
    Conflicts:
    	debian/changelog
    	debian/clean

 debian/changelog                |    6 +++++
 debian/clean                    |    1 +
 debian/control                  |    1 +
 debian/patches/htmlwidget.patch |   47 ++++++++++++++++-----------------------
 debian/rules                    |    5 ++++-
 5 files changed, 31 insertions(+), 29 deletions(-)

diff --cc debian/changelog
index 8dab300,169b482..86eee9b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ saods9 (7.2+dfsg-3) unstable; urgency=low
+ 
+   * Re-create htmlwidget/configure. Fixes FTBS on MIPS.
+ 
+  -- Ole Streicher <debian at liska.ath.cx>  Sat, 28 Sep 2013 15:29:28 +0200
+ 
 +saods9 (7.3~b3+dfsg-1~exp1) experimental; urgency=low
 +
 +  * New (beta) upstream version
 +
 + -- Ole Streicher <debian at liska.ath.cx>  Thu, 26 Sep 2013 19:14:34 +0200
 +
  saods9 (7.2+dfsg-2) unstable; urgency=low
  
    * Create make.linux on clean, closes: #724082
diff --cc debian/clean
index 6d4ad1d,088e5a5..9c66ef7
--- a/debian/clean
+++ b/debian/clean
@@@ -5,5 -5,13 +5,6 @@@ ds9/ds9tk.
  ds9/ds9.1
  bin/ds9
  make.include
 -blt3.0.1/demos/Makefile
 -blt3.0.1/library/afm/Makefile
 -blt3.0.1/library/Makefile
 -blt3.0.1/man/Makefile
 -blt3.0.1/src/Makefile
 -blt3.0.1/src/bltHash.h
 -blt3.0.1/src/config.h
 -blt3.0.1/src/shared/Makefile
 -blt3.0.1/src/*.o
 +unix/libxxlib.a
 +unix/rotstr.o
+ htmlwidget/configure

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/saods9.git