Package: audiofile
Version: 0.2.6-6
Severity: wishlist

I think .diff.gz shouldn't be /that/ big.

616     audiofile_0.2.6-6.dsc
298794  audiofile_0.2.6-6.diff.gz       <<<
374688  audiofile_0.2.6.orig.tar.gz

Please consider running autotools at build time.
This makes .diff.gz smaller as it should be and uses latest libtool
and autotools-dev automaticaly:

401     audiofile_0.2.6-5.99.dsc
13521   audiofile_0.2.6-5.99.diff.gz    <<<
374688  audiofile_0.2.6.orig.tar.gz

---8<---
audiofile (0.2.6-5.99) unstable; urgency=low

  * NEW! debian/patches/10_relibtoolize.dpatch
    + replaces 1.4M+ 10_update_libtool.dpatch diff w/_tiny_ 1.2k script
    + Added build-deps to autotools&co
    + ... cdbs, anybody? :)

 -- Andrey Mitrofanov <[EMAIL PROTECTED]>  Thu, 15 Sep 2005 10:05:17 +0400

--->8---

Attached below:
4011    audiofile_0.2.6-5.99--interdiff.diff

Don't forget to *remove* 1.4M+ debian/patches/10_update_libtool.dpatch !

Thanks!
...Be happy, take it easy, sayonara.
---abme at rambler dot ru
diff -u audiofile-0.2.6/debian/patches/00list 
audiofile-0.2.6/debian/patches/00list
--- audiofile-0.2.6/debian/patches/00list
+++ audiofile-0.2.6/debian/patches/00list
@@ -1,5 +1,5 @@
 10_update_docs
-10_update_libtool
+10_relibtoolize
 10_export_vfs
 10_pack_real_char3
 10_incorrect_wav_size
diff -u audiofile-0.2.6/debian/changelog audiofile-0.2.6/debian/changelog
--- audiofile-0.2.6/debian/changelog
+++ audiofile-0.2.6/debian/changelog
@@ -1,3 +1,12 @@
+audiofile (0.2.6-5.99) unstable; urgency=low
+
+  * NEW! debian/patches/10_relibtoolize.dpatch
+    + replaces 1.4M+ 10_update_libtool.dpatch diff w/_tiny_ 1.2k script
+    + Added build-deps to autotools&co
+    + ... cdbs, anyone? :)
+
+ -- Andrey Mitrofanov <[EMAIL PROTECTED]>  Thu, 15 Sep 2005 10:27:26 +0400
+
 audiofile (0.2.6-6) unstable; urgency=low
 
   * Added patches:
diff -u audiofile-0.2.6/debian/control audiofile-0.2.6/debian/control
--- audiofile-0.2.6/debian/control
+++ audiofile-0.2.6/debian/control
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Daniel Kobras <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.1.1), autotools-dev, dpatch
+Build-Depends: debhelper (>= 4.1.1), dpatch, automake1.7, libtool, autoconf
 Standards-Version: 3.6.1
 
 Package: libaudiofile-dev
diff -u audiofile-0.2.6/debian/rules audiofile-0.2.6/debian/rules
--- audiofile-0.2.6/debian/rules
+++ audiofile-0.2.6/debian/rules
@@ -40,17 +40,8 @@
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-       # Make sure we use the latest autotools helpers.
-       if test -f config.sub; then \
-                 mv config.sub config.sub.debsave; \
-        fi
-       if test -f config.guess; then \
-                 mv config.guess config.guess.debsave; \
-        fi
-
-       ln -sf /usr/share/misc/config.sub .
-       ln -sf /usr/share/misc/config.guess .
-
+# Make sure we use the latest autotools helpers.
+#-- Now its in `debian/patch/10_update_libtool.dpatch -patch`
 
        CFLAGS="$(CFLAGS)" ./configure $(audiofile_confflags) \
                --prefix=/usr --mandir=\$${prefix}/share/man \
@@ -81,18 +72,7 @@
 
        -$(MAKE) distclean
        
-       if test -L config.sub; then \
-                $(RM) config.sub; \
-               if test -e config.sub.debsave; then \
-                       mv config.sub.debsave config.sub; \
-               fi; \
-       fi
-       if test -L config.guess; then \
-                $(RM) config.guess; \
-               if test -e config.guess.debsave; then \
-                       mv config.guess.debsave config.guess; \
-               fi; \
-        fi
+#-- Now its in `debian/patch/10_update_libtool.dpatch -unpatch`
 
        dh_clean
 
only in patch2:
unchanged:
--- audiofile-0.2.6.orig/debian/patches/10_relibtoolize.dpatch
+++ audiofile-0.2.6/debian/patches/10_relibtoolize.dpatch
@@ -0,0 +1,49 @@
+#! /bin/sh -e
+## 10_relibtoolize.dpatch by Andrey Mitrofanov <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Re-libtoolize at build time: run 
aclocal-1.7+libtoolize+autoconf+automake-1.7
+## DP: Replaces 1.4M+ .dpatch
+
+## [!] Add "automake1.7, libtool, autoconf" to Build-Deps.
+
+if [ $# -lt 0 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+files="aclocal.m4 ltmain.sh config.guess config.sub configure `find -type f 
-name Makefile.in -printf " \"%p\""`"
+saveball="update_libtool.debsave.tar.gz"
+
+# [?] Place this value in debian/patches/00patch-opts ?
+# [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+AUTOMAKE_VER="-1.7"
+
+case "$1" in
+    -patch)
+      if [ ! -e "$saveball" ]; then
+       # Save
+       GZIP=-1 tar czf "$saveball" $files
+       # Here we go:
+       aclocal$AUTOMAKE_VER
+       libtoolize --force
+       autoconf
+       automake$AUTOMAKE_VER
+       rm -rf autom4te.cache/
+       fi
+      ;;
+    -unpatch)
+      if [ -e "$saveball" ]; then
+       # Clean up and get back saved
+       rm -f $files
+       tar xzf "$saveball"
+       # Remove saved (~save-stamp)
+       rm -f "$saveball"
+       fi
+      ;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0

Reply via email to