Bug#700839: Have a patch for git package :D bloat!
\\.0\\.txt
10
$ ls -Gg /usr/share/doc/git/RelNotes/2.3* |head -5
-rw-r--r-- 1 12859 Aug 13 01:02 /usr/share/doc/git/RelNotes/2.3.0.txt
-rw-r--r-- 1 1998 Aug 13 01:02 /usr/share/doc/git/RelNotes/2.3.1.txt
-rw-r--r-- 1 3009 Aug 13 01:02 /usr/share/doc/git/RelNotes/2.3.2.txt
-rw-r--r-- 1 1522 Aug 13 01:02 /usr/share/doc/git/RelNotes/2.3.3.txt
-rw-r--r-- 1 1150 Aug 13 01:02 /usr/share/doc/git/RelNotes/2.3.4.txt
(*bloat) Like from 21.1M to 12.7M (as of version 2.0~) just by packing
.deb-s w/xz -9e. And now with the symlinks patch - from 12.5 MB to
5.2 MB (@ xz -9e; 6.4M @ xz -1e) in total resulting binary packages
size. From 25.6 MB (2.5.3-1 @ unstable) to 18.5 MB in installed
size for a git package. Yes, that is 38% or 2.4x bloat in current
Debian packaging!
Yet more: 615 KB to _1_KB_ in installed size of git-all package as
an extreme example.
--
Be seeing you. Andrey.
...Be happy, take it easy, sayonara.--- git-2.5.0/debian/changelog 2015-07-28 20:47:24.0 +0300
+++ git-2.4.8/debian/changelog 2015-08-13 00:55:16.0 +0300
@@ -1,3 +1,29 @@
+git (1:2.4.8-0.1~abm0) wheezy-sloppy-abm; urgency=low
+
+ * And 2.4.8 just after it.
++ -0.1~abm0 version is for git-man << + >> 2-deps. :/
+ * Symlink matching:
+. binaries from /usr/bin to usr/lib/git-core/
+. deb-docs (/usr/share/doc) "up" to git-man package (*->git->git-man).
+ + The %.deb-docs rule in debian/implicit is split accordingly.
+
+ -- abm Thu, 13 Aug 2015 00:55:13 +0300
+
+git (1:2.4.6-0~abm0) wheezy-sloppy-abm; urgency=low
+
+ * Built this upstream tarball with 2.5.0-1 debian/ from exp.
+- Changelog.upstream is for 2.5.0, but the source is 2.4.6. ;)
++ Re-applied "Pack w/xz" + make .debian.tar.xz.
+
+ -- abm Tue, 11 Aug 2015 16:04:10 +0300
+
+git (1:2.1.3-0.1~abm0) wheezy-sloppy-abm; urgency=low
+
+ * Got new upstream version built.
++ Pack w/xz.
+
+ -- Andrey Mitrofanov Thu, 30 Oct 2014 23:38:15 +0300
+
git (1:2.5.0-1) unstable; urgency=low
* new upstream release (see RelNotes/2.5.0.txt).
--- git-2.5.0/debian/implicit 2015-07-28 20:45:55.0 +0300
+++ git-2.4.8/debian/implicit 2015-08-13 00:55:07.0 +0300
@@ -15,8 +15,8 @@
@test -d debian/$* || sh -cx '! : directory debian/$* missing'
@test "`id -u`" -eq 0 || sh -cx '! : need root privileges'
-%.deb-docs-base: %.install
- : implicit
+git-man.deb-docs-base: %.deb-docs-base: %.install
+ : implicit- git-man+
@rm -f debian/$*/usr/share/doc/$*/* || :
@install -d -m0755 debian/$*/usr/share/doc/$*
: debian/$*/usr/share/doc/$*/
@@ -33,7 +33,35 @@
debian/$*/usr/share/doc/$*/changelog'
@test -s debian/$*/usr/share/doc/$*/changelog || \
sh -cx 'rm -f debian/$*/usr/share/doc/$*/changelog'
- @gzip -9 debian/$*/usr/share/doc/$*/changelog*
+ @gzip -9n debian/$*/usr/share/doc/$*/changelog*
+
+%.deb-links:
+ @rm -f debian/$*/usr/share/doc/$*/* || :
+ @install -d -m0755 debian/$*/usr/share/doc/$*
+ : debian/$*/usr/share/doc/$*/
+ #/abm +$*+
+# ls -ld debian/$*/usr/bin/* debian/$*/usr/lib/git-core/* ||:
+ #/abm: symlink binaries to /usr/lib/git-core, if match; same package
+ for t in debian/$*/usr/bin/*; do \
+ [ -h "$$t" ] && continue; \
+ f="$${t%/usr/bin/*}/usr/lib/git-core/$${t##*/}"; echo "|$$t| => +$$f+"; \
+ if cmp --quiet "$$f" "$$t" 2>/dev/null; then \
+ echo "MATCHED. SYMLINKING $${t##*/} to /usr/lib/git-core/ in $$t"; \
+ ls -ld "$$t" "$$f"; \
+ ln -snf "../lib/git-core/$${t##*/}" "$$t"; ls -l "$$t"; \
+ fi; \
+ done
+# ls -l debian/$*/usr/share/doc/$*/ debian/git-man/usr/share/doc/git-man/ ||:
+ [ -h 'debian/$*/usr/share/doc/$*' ] || \
+ for n in changelog.Debian.gz changelog.gz copyright; do \
+ ln -s ../git-man/$$n debian/$*/usr/share/doc/$*/$$n; \
+ done
+# ls -l debian/$*/usr/share/doc/$*/ ||:
+ : debian/$*/usr/share/doc/$*/
+
+%.deb-docs-base: %.install %.deb-links
+ : implicit $*
+
%.deb-docs-docs: %.deb-docs-base
@for i in `cat debian/$*.docs 2>/dev/null || :`; do \
if test -d $$i; then \
@@ -53,7 +81,7 @@
@if test -r debian/$*.NEWS.Debian; then \
sh -cx 'install -m0644 debian/$*.NEWS.Debian \
debian/$*/usr/share/doc/$*/NEWS.Debian && \
- gzip -9 debian/$*/usr/share/doc/$*/NEWS.Debian'; \
+ gzip -9n debian/$*/usr/share/doc/$*/NEWS.Debian'; \
fi
%.deb-docs-examples: %.deb-docs-docs
@rm -rf debian/$*/usr/share/doc/$*/examples
--- git-2.5.0/debian/rules 2015-07-28 20:45:55.0 +0300
+++ git-2.4.8/debian/rules 2015-08-12 21:22:52.0 +0300
@@ -353,12 +353,12 @@
rm -f debian/substvars
dpkg-shlibdeps '$(GIT)'/usr/bin/* '$(GIT)'/usr/lib/git-core/*
dpkg-gencontrol -isp -pgit -P'$(GIT)'
- dpkg -b '$(GIT)' ..
+ XZ_OPT=-ev dpkg-deb -b -z9 -Zxz &
Bug#691027: src:iceape: please use xz compression for source and binaries
Source: iceape
Version: 2.7.9-1
Severity: normal
User: ans...@debian.org
Usertags: xz-for-wheezy
Hi, pkg-mozilla-maintainers and everyone concerned!
Please use xz complession for iceape package source and
binaries to save mirror space, user download and insattation
times, even some wasted polycarbonate rounds :) in the end.
I made that in several easy ;) steps while doing a rebuild
of iceape 2.7.9-1 for squeeze.
* Unpack the current, 2.7.9-1 in my case, source.
* Repacking .orig.tar-s from bz2 to xz got me impressive 22.5Mb
off out of 109Mb. Tthats -20.7%!
+ Somth.like this would do:
$ for f in *.orig*.tar.bz2; do bunzip2 $f; xz -9ev ${f%.bz2}; done
* Add debian/source/options and override_dh_builddeb clause like
in the patch attached.
First will make a .debian.tar.xz w/even more imressive -25.4% gain in
size - from the venerable .gz (not that "big" in :) megabytes thou).
Second will do the better compression of the binary packages at the
re-buld time. Got me -54.9Mb or -34.8% (of original 157.8Mb) in my
28 i386+all .deb-s rebuild (and yeah, 51.9Mb of them -- off one
iceape-dbg package.)
* Pack the source package back.
* Rebuild it. (I used pbuilder and some local backports mix.)
+ Check the ressuling data.tar in .deb-s is xz compressed:
$ ar tv abm0+xz/iceape-dbg_*.deb
rw-r--r-- 0/0 4 Oct 17 23:18 2012 debian-binary
rw-r--r-- 0/0 1075 Oct 17 23:18 2012 control.tar.gz
rw-r--r-- 0/0 74228460 Oct 17 23:23 2012 data.tar.xz
I gained total of -77.6Mb / -29%for src+i386+all off orignal 266.8Mb.
Guess other Debian binary archs would add some more to this will the
proposed change make its way to the archive.
As for extra resources used to achieve this... Several minutes maybe
of CPU time for more intensive uncompression of source and compression
of the result is neglectable camparing to overall 1h+ build time, and
is a clear win considering multiple download time gains for the users.
Memory consumption for source xz unpack (64+Mb for the sources packed
with -9e option as above) and .deb compress (94+Mb for the campression
level I got in my build -- dont know :) how to coerce build-deb to use
-9e maximum compression, and resulting data.tar.xz-s seem to be
compressed w/some default needing 8Mb+ for decompression, thus the 94Mb
figure as for man xz) is at least comparable to memory usage of the
actual build. User time used for unpacking of these xz compreaased
.deb-s increases slightly though (like 3.2s -> 9.9s on my test machine
for the [cache-hot] {z,xz}cat data.tar.{z,zx} >/dev/null for that
_largest -dbg package).
New archivers is such a recreative topic dont you agree? :))
And many thanks for the stable Mozilla Suite Dabian package!
...Be happy, take it easy, sayonara.
---abme at rambler dot ru+ * Use xz:
-+ repack .orig.tar-s (114,094,052 -> 90,418,964, 24Mb+ off)
++ add debian/source/options
++ debian/riles += override_dh_builddeb with -Zxz.
--- ../debian/rules 2012-10-14 11:30:00.0 +0400
+++ debian/rules 2012-10-16 23:37:35.0 +0400
@@ -227,6 +227,9 @@
override_dh_bugfiles:
dh_bugfiles -A
+override_dh_builddeb:
+ dh_builddeb -- -Zxz
+
debian/patches:
ifdef REVLIST
rm -rf $@
--- ../debian/source/options 1970-01-01 03:00:00.0 +0300
+++ debian/source/options 2012-06-11 09:11:30.0 +0400
@@ -0,0 +1 @@
+compression = "xz"
Bug#611907: Simple fix for "MD5 mis-match" problem
Package: postal
Version: 0.70
Severity: normal
I've just seen that rabid ran to fetch mails sent by postal
reports "MD5 mis-match" on every one of them.
It seems the problem is that the two programs are checksumming
two _different_ sets of data. Postal summing subj+msgid+date header
lines and the message body while rabid compares it to only subj+body
hash. Simple patch -
--- postal-0.70.orig/smtp.cpp
+++ postal-0.70/smtp.cpp
@@ -287,9 +287,9 @@
subject += m_data->randomString(60);
m_md5.addData(subject);
string date = m_data->date();
- m_md5.addData(date);
+// m_md5.addData(date);
string msgId = m_data->msgId(from.c_str(), getThreadNum());
- m_md5.addData(msgId);
+// m_md5.addData(msgId);
string str = string("To: ") + to + "\r\n"
+ subject + date + msgId + "From: " + from + "\r\n"
+ m_data->postalMsg();
fixes the problem still leaving date and msgid headers unchecked.
Thanks!
-- System Information:
Debian Release: 5.0.2
APT prefers stable
APT policy: (500, 'stable')
Architecture: i386 (x86_64)
Kernel: Linux 2.6.32-bpo.5-amd64 (SMP w/1 CPU core)
Locale: LANG=ru_RU.UTF-8, LC_CTYPE=ru_RU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages postal depends on:
ii libc6 2.7-18lenny7 GNU C Library: Shared
libraries
ii libgcc1 1:4.3.2-1.1GCC support library
ii libgcrypt11 1.4.1-1LGPL Crypto library -
runtime libr
ii libgnutls26 2.4.2-6+lenny1 the GNU TLS library -
runtime libr
ii libstdc++64.3.2-1.1 The GNU Standard C++
Library v3
postal recommends no packages.
postal suggests no packages.
-- debconf-show failed
...Be happy, take it easy, sayonara.
---abme at rambler dot ru
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#586118: mongrel server breaks with rails 2.3
Package: mongrel Version: 1.1.5-5 After rails package upgraded from 2.2.3-2 to 2.3.5-1 rails app breaks when run in mongrel_cluster with a log record like this: Wed Jun 16 18:24:51 +0400 2010: Error calling Dispatcher.dispatch # /usr/lib/ruby/1.8/mongrel/cgi.rb:108:in `send_cookies' /usr/lib/ruby/1.8/mongrel/cgi.rb:136:in `out' /usr/lib/ruby/1.8/mongrel/http_response.rb:65:in `start' /usr/lib/ruby/1.8/mongrel/cgi.rb:135:in `out' /usr/lib/ruby/1.8/mongrel/rails.rb:81:in `process' /usr/lib/ruby/1.8/mongrel.rb:159:in `process_client' /usr/lib/ruby/1.8/mongrel.rb:158:in `each' /usr/lib/ruby/1.8/mongrel.rb:158:in `process_client' /usr/lib/ruby/1.8/mongrel.rb:285:in `run' /usr/lib/ruby/1.8/mongrel.rb:285:in `initialize' /usr/lib/ruby/1.8/mongrel.rb:285:in `new' /usr/lib/ruby/1.8/mongrel.rb:285:in `run' /usr/lib/ruby/1.8/mongrel.rb:268:in `initialize' /usr/lib/ruby/1.8/mongrel.rb:268:in `new' /usr/lib/ruby/1.8/mongrel.rb:268:in `run' /usr/lib/ruby/1.8/mongrel/configurator.rb:282:in `run' /usr/lib/ruby/1.8/mongrel/configurator.rb:281:in `each' /usr/lib/ruby/1.8/mongrel/configurator.rb:281:in `run' /usr/bin/mongrel_rails:129:in `run' /usr/lib/ruby/1.8/mongrel/command.rb:212:in `run' /usr/bin/mongrel_rails:282 A quick search shows that the problem is discussed at https://rails.lighthouseapp.com/projects/8994/tickets/4690-mongrel-doesnt-work-with-rails-238 Patch rails238_mongrel115_patch.diff from the ticket above applied to /usr/lib/ruby/1.8/mongrel/cgi.rb fixed the problem for me. Thanks! ...Be happy, take it easy, sayonara. ---abme at rambler dot ru -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#415975: fixed in wine-doc 0.9.52-1
* Ove Kaaven <[EMAIL PROTECTED]> [Sat, 29 Dec 2007 01:32:14 +]: Source: wine-doc Source-Version: 0.9.52-1 We believe that the bug you reported is fixed in the latest version of wine-doc, which is due to be installed in the Debian FTP archive: wine-doc (0.9.52-1) unstable; urgency=low * Documentation snapshot for the Wine 0.9.52 release. (Yeah, looks like it's been a while since I last updated the docs package...) Closes: #415975. And how about fixing documentation in _stable_ _Etch_ for wine 0.9.25-1, which apears to have been released "out of sync" with released _program_ package? Wouldn't upload of 0.9.25 version of _wine-doc_ to etch-proposed-update be the right thing? Or is it just a wont-fix for _stable_? I attached the diff below... ~ diff -Naur -x"CVS" wine-docs-0.9 wine-docs-0.9.25 |filterdiff Thanks! --- wine-docs-0.9/en/winedev-coding.sgml2005-10-22 15:14:10.0 +0400 +++ wine-docs-0.9.25/en/winedev-coding.sgml 2006-08-26 17:43:16.0 +0400 @@ -35,7 +35,7 @@ -The patch in diff -u format +The patch in Git format @@ -43,33 +43,23 @@ -cvs diff -u works great for the common case - where a file is edited. However, if you add or remove a file -cvs diff will not report that correctly so -make sure you explicitly take care of this rare case. +To generate a patch using Git, first commit it to your local tree. -For additions simply include them by appending the -diff -u /dev/null /my/new/file output of - them to any cvs diff -u output you may - have. Alternatively, use diff -Nu olddir/ - newdir/ in case of multiple new files to add. +Each file that you change needs to be updated with + git update . If you are adding or removing +a file, use git update --add or +git update --remove respectively. +After updating the index, commit the change using + git commit . The commit message will be +sent with your patch, and recored in the ChangeLog. + + +After committing the patch, you can extract it using +git format-patch and send it to wine-patches +using git imap-send or simply attaching it +to you mail manually. - -For removals, clearly list the files in the description of the - patch. - - -Since wine is constantly changing due to development it is - strongly recommended that you use cvs for patches, if you - cannot use cvs for some reason, you can submit patches against - the latest tarball. To do this make a copy of the files that - you will be modifying and diff -u against - the old file. I.E. - - -diff -u file.old file.c > file.txt - @@ -215,11 +205,11 @@ can build on it and it will not go stale?") -Make sure your patch applies to the current CVS head -revisions. If a bunch of patches are committed to CVS that may +Make sure your patch applies to the current Git HEAD +revisions. If a bunch of patches are committed that may affect whether your patch will apply cleanly then verify that -your patch does apply! cvs update is your -friend! +your patch does apply! git fetch; git rebase origin +is your friend! Save yourself some embarrassment and run your patched code --- wine-docs-0.9/en/winedev-debugger.sgml 2005-10-17 08:50:37.0 +0400 +++ wine-docs-0.9.25/en/winedev-debugger.sgml 2006-03-23 07:30:30.0 +0300 @@ -2004,6 +2004,12 @@ + info all-regs + + prints the value of the CPU and Floating Point registers + + + info segment--- wine-docs-0.9/en/winedev-ole.sgml 2005-09-25 20:13:41.0 +0400 +++ wine-docs-0.9.25/en/winedev-ole.sgml2005-10-30 17:55:22.0 +0300 @@ -620,8 +620,7 @@ - DCOM is theoretically an internet RFC - http://www.grimes.demon.co.uk/DCOM/DCOMSpec.htm";>[2] and is + DCOM is theoretically an internet RFC and is specced out, but in reality the only implementation of it apart from ours is Microsoft's, and as a result there are lots of interfaces which can be used if you want to customize or --- wine-docs-0.9/en/winedev-opengl.sgml2005-09-25 20:13:41.0 +0400 +++ wine-docs-0.9.25/en/winedev-opengl.sgml 2006-08-28 07:41:39.0 +0400 @@ -159,7 +159,7 @@ The thunks are the Wine code that does the calling convention translation and they are auto-generated by a Perl
Bug#455084: sa-compile dependencies
Just seen the same dependency problem at Planet Debian - http://blog.drinsama.de/erich/en/linux/2007122403-spamassassin-precompiled-rules.html I think rather different dependencies of ...bin/sa-compile could be solved by splitting it into a separate binary package -- with its own set of deps. Thanks, Andrey. ...Be happy, take it easy, sayonara. ---abme at rambler dot ru -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Bug#420236: A patch for "tkvnc: dies with message..."
Hi, everybody!
Just upgraded my desktop PC to 4.0 "Etch" release and got the
same problem with tkvnc.
Quick search in Google for ("unknown option" Tk) suggested that
options passed to Tk should now have a minus sign in front of
them. So, here's the patch that runs tkvnc on Etch.
--- tkvnc0 2004-09-08 02:05:05.0 +0400
+++ tkvnc2 2007-05-08 15:16:14.0 +0400
@@ -68,16 +68,16 @@
$mw = MainWindow->new;
$mw->title("tkvnc 0.6");
-$mbar = $mw->Frame(-width=>200, height =>25, -relief=>'ridge',
+$mbar = $mw->Frame(-width=>200, -height =>25, -relief=>'ridge',
-borderwidth=>2)->pack(
-fill=>'x',
-side=>'top');
-$mw->Label(-text=>"Select machine to control:")->pack(-side=>'top',
-expand=>0, fill=>'none');
+$mw->Label(-text=>"Select machine to control:")->pack(-side=>'top',
-expand=>0, -fill=>'none');
$buttonframe = $mw->Frame->pack(-fill=>'both', -side=>'bottom');
-$bt = $buttonframe->Scrolled("Text", width =>23, -scrollbars
=>'oe') ->pack(-expand=>1, fill=>'both');
+$bt = $buttonframe->Scrolled("Text", width =>23, -scrollbars
=>'oe') ->pack(-expand=>1, -fill=>'both');
$bt ->configure(-state =>'disabled'); # no typing allowed!
$mbar->Menubutton(-text => "File",
@@ -103,7 +103,7 @@
foreach $key (sort keys (%machines)){
- $buttitem = $bt->Button(-text=>"$key", -width =>20, height
=>1,-command=>[\&do_launch, $machines{$key}]);
+ $buttitem = $bt->Button(-text=>"$key", -width =>20, -height
=>1,-command=>[\&do_launch, $machines{$key}]);
$bt->windowCreate('end', -window => $buttitem);
$bt->insert('end',"\n");
}
Thanks!
Bye. Andrey.
...Be happy, take it easy, sayonara.
---abme at rambler dot ru
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Bug#415975: wine-doc: new upstream version is available
Package: wine-doc Version: 0.9-1 Severity: wishlist Please update wine-doc in etch. http://ibiblio.org/pub/linux/system/emulators/wine/?C=M;O=D 0.9.33 is the newest one ATM (though it is not changed since 0.9.31, or earlier). Changes are - + CVS to Git transition + URLs brought up-to-date (docs, download, external projects) + minor language fixes and more... Thanks! Bye. Andrey. ...Be happy, take it easy, sayonara. ---abme at rambler dot ru -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Bug#336526: openvrml - FTBFS: needs awful amounts of memory to build
The build got killed by the OOM killer after using any ram and swap on the machine. This Gentoo bug seem very similar to the bug: http://bugs.gentoo.org/show_bug.cgi?id=147533 OOM killer takes out gcc 4.1+ while it compiles some large source file with lots of inline functions and optimization flag set to -O3. Please check if this is also the case with openvrml. Bye. Andrey. ...Be happy, take it easy, sayonara. ---abme at rambler dot ru -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Bug#330499: Get missing documentation back in binary package
Package: ifhp Version: 3.5.20-4 Tags: patch upstream I think 3.5.20-2 fix for Bug#308982 mistakenly left .html and .pdf docs out of binary package, though they are present in upstream source tarball verbatim. This happened due to overlooked upstream filename and directory structure change after sarge release, going from 3.5.10 to 3.5.20. IFHP-HOWTO is now called IFHP-Reference and moved from HOWTO/ directory to DOCS/ in the source. Below are two patches to get documentation back in binary package and fix some upstream references to "HOWTO". I don't touch po/ files to keep the changes to the minimum. Thanks! ...Be happy, take it easy, sayonara. ---abme at rambler dot ru ifhp_3.5.20-docs-debian.patch Description: Binary data ifhp_3.5.20-docs-upstream.patch Description: Binary data
Bug#328417: "Lose .diff.gz fa-a-at, run autotools" patch
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:
4011audiofile_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$AU
