-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I advocate for the acceptance of unac-1.8.0-5[1] into Squeeze because it * fixes a normal bug[2] that make it crash on x86-64 * lintian warnings * converts to CDBS to simplify the debian/rules file as demonstrated by the attached diff. Thank you for your attention and more importantly for the work you're doing to stabilize this new Debian release. [1] http://qa.debian.org/developer.php?packages=unac [2] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=556379 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.13 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkyZywYACgkQ8dLMyEl6F20qWQCguuiI9rn8gBPgGzzkDgN7BODG nbkAoJfVw9NuBbQhK7u8+iIuoAWWYovJ =oJZI -----END PGP SIGNATURE-----
diff -Nru a/unac-1.8.0/debian/changelog b/unac-1.8.0/debian/changelog
--- a/unac-1.8.0/debian/changelog 2010-09-22 10:48:06.000000000 +0200
+++ b/unac-1.8.0/debian/changelog 2010-09-22 10:48:24.000000000 +0200
@@ -1,3 +1,33 @@
+unac (1.8.0-5) unstable; urgency=low
+
+ * add usr/lib/pkgconfig, usr/lib/*.{a,la} to libunac1-dev.install
+ (closes: #597425)
+ * add ${misc:Depends} to libunac1, libunac1-dev, unaccent
+ * convert copyright to utf8
+ * reference /usr/share/common-licenses/GPL-2 in copyright instead of
+ versionless file and update copyright notice with "or later" and
+ recent FSF address
+ * add copyright notice
+ * change ${Source-Version} to ${binary:Version} in control
+
+ -- Loic Dachary <loic@dachary.org> Mon, 20 Sep 2010 10:17:18 +0200
+
+unac (1.8.0-4) unstable; urgency=low
+
+ * replace libunac1-dev.files with libunac1-dev.install and
+ libunac1.files with libunac1.install
+
+ -- Loic Dachary <loic@dachary.org> Sat, 18 Sep 2010 10:53:42 +0200
+
+unac (1.8.0-3) unstable; urgency=low
+
+ * applied suggested patch + fixed additional related compilation warning
+ patches/gcc-4-fix-bug-556379.patch (closes: #556379)
+
+ * simplify ancient debian/rules by converting it to cdbs
+
+ -- Loic Dachary <loic@dachary.org> Fri, 17 Sep 2010 10:20:30 +0200
+
unac (1.8.0-2) unstable; urgency=low
* libunac1-dev is in libdevel instead of devel
diff -Nru a/unac-1.8.0/debian/compat b/unac-1.8.0/debian/compat
--- a/unac-1.8.0/debian/compat 1970-01-01 01:00:00.000000000 +0100
+++ b/unac-1.8.0/debian/compat 2010-09-22 10:48:24.000000000 +0200
@@ -0,0 +1 @@
+5
diff -Nru a/unac-1.8.0/debian/control b/unac-1.8.0/debian/control
--- a/unac-1.8.0/debian/control 2010-09-22 10:48:06.000000000 +0200
+++ b/unac-1.8.0/debian/control 2010-09-22 10:48:24.000000000 +0200
@@ -2,14 +2,14 @@
Section: devel
Priority: optional
Maintainer: Loic Dachary (OuoU) <loic@debian.org>
-Build-Depends: debhelper (>> 3.0.0)
-Standards-Version: 3.6.1
+Build-Depends: , debhelper (>= 5.0.37.2), automake, cdbs, debconf | debconf-2.0
+Standards-Version: 3.8.4
Package: libunac1
Section: libs
Priority: optional
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: The unac programming library - runtime version
Unac is a C programmer's library that removes accents from a string.
.
@@ -21,7 +21,7 @@
Package: libunac1-dev
Section: libdevel
Architecture: any
-Depends: libunac1 (= ${Source-Version}), libc6-dev
+Depends: ${misc:Depends}, libunac1 (= ${binary:Version}), libc6-dev
Description: A C programmer's library that removes accents from a string
Unac is a C programmer's library that removes accents from a string.
For instance the string été will become ete. It provides a command
@@ -35,7 +35,7 @@
Package: unaccent
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Replace accented letters by their unaccented equivalent
read data from stdin, replace accented letters by their unaccented
equivalent and write the result on stdout.
diff -Nru a/unac-1.8.0/debian/copyright b/unac-1.8.0/debian/copyright
--- a/unac-1.8.0/debian/copyright 2010-09-22 10:48:06.000000000 +0200
+++ b/unac-1.8.0/debian/copyright 2010-09-22 10:48:24.000000000 +0200
@@ -1,25 +1,25 @@
-This package was debianized by Rémi Perrot <remi.perrot@mail.dotcom.fr> on
+This package was debianized by Rémi Perrot <remi.perrot@mail.dotcom.fr> on
Sat, 30 Sep 2000 02:35:03 +0200
It was downloaded from http://www.senga.org/unac/
Upstream Author: Loic Dachary <loic@senga.org>
-Copyright:
+Copyright 2000 Loic Dachary <loic@dachary.org> :
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 dated June, 1991.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
On Debian systems the full text of these two licences can be found
-in /usr/share/common-licenses/GPL files.
+in /usr/share/common-licenses/GPL-2 files.
diff -Nru a/unac-1.8.0/debian/libunac1-dev.files b/unac-1.8.0/debian/libunac1-dev.files
--- a/unac-1.8.0/debian/libunac1-dev.files 2010-09-22 10:48:06.000000000 +0200
+++ b/unac-1.8.0/debian/libunac1-dev.files 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-usr/share/man/man3
-usr/include
-usr/lib
diff -Nru a/unac-1.8.0/debian/libunac1-dev.install b/unac-1.8.0/debian/libunac1-dev.install
--- a/unac-1.8.0/debian/libunac1-dev.install 1970-01-01 01:00:00.000000000 +0100
+++ b/unac-1.8.0/debian/libunac1-dev.install 2010-09-22 10:48:24.000000000 +0200
@@ -0,0 +1,7 @@
+debian/tmp/usr/share/man/man3
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/*.so
+debian/tmp/usr/lib/*.a
+debian/tmp/usr/lib/*.la
+debian/tmp/usr/lib/pkgconfig/*
+
diff -Nru a/unac-1.8.0/debian/libunac1.files b/unac-1.8.0/debian/libunac1.files
--- a/unac-1.8.0/debian/libunac1.files 2010-09-22 10:48:06.000000000 +0200
+++ b/unac-1.8.0/debian/libunac1.files 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/*.so.*
-
diff -Nru a/unac-1.8.0/debian/libunac1.install b/unac-1.8.0/debian/libunac1.install
--- a/unac-1.8.0/debian/libunac1.install 1970-01-01 01:00:00.000000000 +0100
+++ b/unac-1.8.0/debian/libunac1.install 2010-09-22 10:48:24.000000000 +0200
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.*
diff -Nru a/unac-1.8.0/debian/patches/gcc-4-fix-bug-556379.patch b/unac-1.8.0/debian/patches/gcc-4-fix-bug-556379.patch
--- a/unac-1.8.0/debian/patches/gcc-4-fix-bug-556379.patch 1970-01-01 01:00:00.000000000 +0100
+++ b/unac-1.8.0/debian/patches/gcc-4-fix-bug-556379.patch 2010-09-22 10:48:24.000000000 +0200
@@ -0,0 +1,45 @@
+diff -r fd7eb0d70970 unac-1.8.0/unac.c
+--- a/unac-1.8.0/unac.c Fri Sep 17 10:35:14 2010 +0200
++++ b/unac-1.8.0/unac.c Fri Sep 17 10:36:07 2010 +0200
+@@ -13873,9 +13873,9 @@
+ *out_lengthp = 0;
+ } else {
+ char* utf16 = 0;
+- int utf16_length = 0;
++ size_t utf16_length = 0;
+ char* utf16_unaccented = 0;
+- int utf16_unaccented_length = 0;
++ size_t utf16_unaccented_length = 0;
+
+ if(convert(charset, utf16be(), in, in_length, &utf16, &utf16_length) < 0) {
+ return -1;
+diff -r fd7eb0d70970 unac-1.8.0/unaccent.c
+--- a/unac-1.8.0/unaccent.c Fri Sep 17 10:35:14 2010 +0200
++++ b/unac-1.8.0/unaccent.c Fri Sep 17 10:40:34 2010 +0200
+@@ -90,7 +90,7 @@
+ const char* charset = argv[optind++];
+
+ char* unaccented = 0;
+- int unaccented_length = 0;
++ size_t unaccented_length = 0;
+
+ if(optind >= argc) {
+ #define BUFFER_SIZE 10240
+@@ -101,7 +101,7 @@
+ perror("");
+ exit(1);
+ }
+- printf("%.*s", unaccented_length, unaccented);
++ printf("%.*s", (int)unaccented_length, unaccented);
+ }
+ } else {
+ const char* string = argv[optind++];
+@@ -114,7 +114,7 @@
+
+ if(debug_level > UNAC_DEBUG_NONE)
+ fprintf(stderr, "unaccented version is ");
+- printf("%.*s\n", unaccented_length, unaccented);
++ printf("%.*s\n", (int)unaccented_length, unaccented);
+
+ if(optind < argc) {
+ const char* expected = argv[optind++];
diff -Nru a/unac-1.8.0/debian/rules b/unac-1.8.0/debian/rules
--- a/unac-1.8.0/debian/rules 2010-09-22 10:48:06.000000000 +0200
+++ b/unac-1.8.0/debian/rules 2010-09-22 10:48:24.000000000 +0200
@@ -1,91 +1,6 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# -*- makefile -*-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-version=`ls src/.libs/lib*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-major=`ls src/.libs/lib*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- /bin/sh ./configure --prefix=/usr --mandir=\$${prefix}/share/man
-
- touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE) CFLAGS=-O6
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) distclean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- @# Add here commands to install the package into debian/tmp
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_movefiles
-
-# dh_installdebconf
- dh_installdocs
-# dh_installexamples
-# dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
- dh_installman
-# dh_installinfo
-# dh_undocumented
- dh_installchangelogs ChangeLog
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
-# dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
Attachment:
1.patch.sig
Description: PGP signature
begin:vcard fn:Loic Dachary n:Dachary;Loic org:pokersource adr:;;12 bd Magenta;Paris;;75010;France email;internet:loic@dachary.org title:Senior Developer tel;work:+33 4 84 25 08 05 tel;home:+33 9 51 18 43 38 tel;cell:+33 6 64 03 29 07 x-mozilla-html:FALSE url:http://dachary.org/ version:2.1 end:vcard