diff --git a/debian/changelog b/debian/changelog index 785cb63..b80f4ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +libhdate (1.6-2.2) unstable; urgency=medium + + * Non-maintainer upload with maintainer's permission + * Add dh-autoreconf to fix FTBFS on ppc64el. Closes: #757112, #757136 + * Add multi-arch. Closes: #757113, #727006 + + -- Andreas Barth Wed, 10 Sep 2014 15:03:37 +0000 + +libhdate (1.6-2.1) unstable; urgency=medium + + [ Damyan Ivanov ] + * Non-maintainer upload with maintainer's permission + + [ gregor herrmann ] + * Fix "hardcodes /usr/lib/perl5" + - use $Config{vendorarch} in debian/rules and debian/libhdate-perl.* + - make the latter two executable + (Closes: #752348) + + -- Damyan Ivanov Tue, 29 Jul 2014 06:38:35 +0000 + libhdate (1.6-2) unstable; urgency=low * Patch fix_3: fix an endless loop with hcal -3 (Closes: #692039). diff --git a/debian/control b/debian/control index 6961f23..a2318fa 100644 --- a/debian/control +++ b/debian/control @@ -5,12 +5,13 @@ Uploaders: Baruch Even , Lior Kaplan , Shachar Shemesh , Tzafrir Cohen Vcs-Svn: svn://anonscm.debian.org/debian-hebrew/pkg/libhdate Vcs-Browser: http://anonscm.debian.org/viewvc/debian-hebrew/pkg/libhdate -Build-Depends: debhelper (>= 9), swig, python-dev (>= 2.6.6-3~), autotools-dev +Build-Depends: debhelper (>= 9), swig, python-dev (>= 2.6.6-3~), dh-autoreconf Standards-Version: 3.9.4 Homepage: http://libhdate.sourceforge.net/ Package: libhdate-dev Architecture: any +Multi-Arch: same Depends: libhdate1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Provides a library that help use hebrew dates (development files) LibHdate is a small C,C++ library for Hebrew dates, @@ -25,6 +26,7 @@ Package: python-hdate Section: python Architecture: any +Multi-Arch: foreign Provides: ${python:Provides} Depends: libhdate1 (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} Description: Provides a library that help use hebrew dates (python bindings) @@ -52,6 +54,8 @@ Package: libhdate1 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: multiarch-support Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libhdate0 Replaces: libhdate0 @@ -61,3 +65,15 @@ the source code from Amos Shapir's "hdate" package fixed and patched by Nadav Har'El. The Torah reading sequence is from tables by Zvi Har'El. + +Package: hdate +Section: utils +Architecture: any +Depends: libhdate1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: libhdate0 (<< 1.6-1ubuntu1) +Description: Provides the hcal and hdate binaries that help use hebrew dates + LibHdate is a small C,C++ library for Hebrew dates, + holidays, and reading sequence (parasha). It is using + the source code from Amos Shapir's "hdate" package fixed + and patched by Nadav Har'El. The Torah reading sequence + is from tables by Zvi Har'El. diff --git a/debian/hdate.install b/debian/hdate.install new file mode 100644 index 0000000..68671de --- /dev/null +++ b/debian/hdate.install @@ -0,0 +1,2 @@ +usr/bin/* +usr/share/man/man1/* diff --git a/debian/libhdate-perl.dirs b/debian/libhdate-perl.dirs index 92105be..105d79d 100644 --- a/debian/libhdate-perl.dirs +++ b/debian/libhdate-perl.dirs @@ -1 +1,3 @@ -usr/lib/perl5 +#!/usr/bin/perl -w +use Config; +print substr($Config{vendorarch}, 1) . "\n"; diff --git a/debian/libhdate-perl.install b/debian/libhdate-perl.install index c1a78d7..105d79d 100644 --- a/debian/libhdate-perl.install +++ b/debian/libhdate-perl.install @@ -1 +1,3 @@ -usr/lib/perl5/* +#!/usr/bin/perl -w +use Config; +print substr($Config{vendorarch}, 1) . "\n"; diff --git a/debian/libhdate1.dirs b/debian/libhdate1.dirs index 2f02a29..5dbe786 100644 --- a/debian/libhdate1.dirs +++ b/debian/libhdate1.dirs @@ -1,4 +1,2 @@ usr/lib -usr/bin -usr/share/man usr/share/locale diff --git a/debian/libhdate1.install b/debian/libhdate1.install index cb10a8d..303709d 100644 --- a/debian/libhdate1.install +++ b/debian/libhdate1.install @@ -1,4 +1,2 @@ usr/lib/*/lib*.so.* -usr/bin/* -usr/share/man/man1/* usr/share/locale/* diff --git a/debian/rules b/debian/rules index 9900396..f957256 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +1,12 @@ #!/usr/bin/make -f +ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}') + %: - dh $* --with python2,autotools_dev + dh $* --with python2,autoreconf override_dh_auto_configure: - dh_auto_configure -- --with-perl-sitelib-dir=/usr/lib/perl5 + dh_auto_configure -- --with-perl-sitelib-dir=$(ARCHLIB) override_dh_python2: dh_python2 -s --no-guessing-versions