[med-svn] [libtecla] 05/15: Import Debian changes 1.6.1-4

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libtecla.

commit 1ba812999f651e81df4e7e8eabc3950b985f17a2
Author: Andreas Tille <tille at debian.org>
Date:   Wed Dec 14 08:08:44 2011 +0100

    Import Debian changes 1.6.1-4
    
    libtecla (1.6.1-4) unstable; urgency=low
    
      * debian/patches/kfreebsd+hurd.patch:
        - Next try to fix FTBGS on kfreebsd
          Closes: #621887
        - Add "*-*-gnu*" as further case to configure.in to enable
          building on GNU/Hurd
          Closes: #651937
---
 debian/changelog                                       | 11 +++++++++++
 debian/patches/{kfreebsd.patch => kfreebsd+hurd.patch} | 16 ++++++++++------
 debian/patches/series                                  |  2 +-
 debian/rules                                           |  2 +-
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3d41b87..0417b26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libtecla (1.6.1-4) unstable; urgency=low
+
+  * debian/patches/kfreebsd+hurd.patch:
+    - Next try to fix FTBGS on kfreebsd
+      Closes: #621887
+    - Add "*-*-gnu*" as further case to configure.in to enable
+      building on GNU/Hurd
+      Closes: #651937
+
+ -- Andreas Tille <tille at debian.org>  Wed, 14 Dec 2011 08:08:44 +0100
+
 libtecla (1.6.1-3) unstable; urgency=low
 
   * Use autotools properly (and for simplicity move to short
diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd+hurd.patch
similarity index 99%
rename from debian/patches/kfreebsd.patch
rename to debian/patches/kfreebsd+hurd.patch
index 40bbbf4..a403882 100644
--- a/debian/patches/kfreebsd.patch
+++ b/debian/patches/kfreebsd+hurd.patch
@@ -1,10 +1,14 @@
 Author: Andreas Tille <tille at debian.org>
-Bug-Debian: http://bugs.debian.org/621887
+Bug-Debian: http://bugs.debian.org/621887,
+	    http://bugs.debian.org/651937
 Forwarded: no
-Last-Update: Tue, 13 Dec 2011 11:00:44 +0100
+Last-Update: Wed, 14 Dec 2011 08:08:44 +0100
 Description: Follow a hint of Cyril Brulebois <kibi at debian.org>
- (thanks Cyril) to add "kfreebsd-*" where only "*linux*" was mentioned
- in configure.in and run `autoreconf -vfi` afterwards
+ (thanks Cyril) to add "*kfreebsd-*" where only "*linux*" was mentioned
+ in configure.in and run `autoreconf -vfi` afterwards.
+ .
+ In the same line was the patch supplied by Pino Toscano <pino at debian.org>
+ to build properly on GNU/Hurd
 
 --- libtecla-1.6.1.orig/configure.in
 +++ libtecla-1.6.1/configure.in
@@ -13,7 +17,7 @@ Description: Follow a hint of Cyril Brulebois <kibi at debian.org>
    FILE_MANEXT="4"
    ;;
 -*linux*)
-+*linux*|kfreebsd-*)
++*linux*|*kfreebsd-*|*-*-gnu*)
    SHARED_EXT=".so.${MAJOR_VER}.${MINOR_VER}.${MICRO_VER}"
    SHARED_ALT=".so .so.${MAJOR_VER}"
  
@@ -5998,7 +6002,7 @@ Description: Follow a hint of Cyril Brulebois <kibi at debian.org>
    FILE_MANEXT="4"
    ;;
 -*linux*)
-+*linux*|kfreebsd-*)
++*linux*|*kfreebsd-*|*-*-gnu*)
    SHARED_EXT=".so.${MAJOR_VER}.${MINOR_VER}.${MICRO_VER}"
    SHARED_ALT=".so .so.${MAJOR_VER}"
  
diff --git a/debian/patches/series b/debian/patches/series
index e36c395..fefbafc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 add-destdir.patch
 manpage-fix.patch
-kfreebsd.patch
+kfreebsd+hurd.patch
diff --git a/debian/rules b/debian/rules
index 8af6519..5e4eeda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 export DH_VERBOSE=1
 
 %:
-	dh $@ -with autotools-dev
+	dh $@ --with autotools-dev
 
 pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 name := $(pkg)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libtecla.git