[Debian-hebrew-package] r1074 - in /pkg/libhdate/trunk/debian: changelog patches/cflags.patch patches/clang.patch patches/docdir.patch patches/fix_3 patches/manpage.patch patches/missing_format.patch patches/nested_extern.patch patches/series patches/size_t.patch
tzafrir at users.alioth.debian.org
tzafrir at users.alioth.debian.org
Tue Jan 24 16:54:15 UTC 2017
Author: tzafrir
Date: Tue Jan 24 16:54:15 2017
New Revision: 1074
URL: http://svn.debian.org/wsvn/debian-hebrew/?sc=1&rev=1074
Log:
New upstream release: 1.6.02
- manpage.patch dropped (merged upstream)
- patch fix_3 dropped (merged upstream)
- nested_extern.patch dropped (merged upstream)
- missing_format.patch dropped (merged upstream)'
Removed:
pkg/libhdate/trunk/debian/patches/fix_3
pkg/libhdate/trunk/debian/patches/manpage.patch
pkg/libhdate/trunk/debian/patches/missing_format.patch
pkg/libhdate/trunk/debian/patches/nested_extern.patch
Modified:
pkg/libhdate/trunk/debian/changelog
pkg/libhdate/trunk/debian/patches/cflags.patch
pkg/libhdate/trunk/debian/patches/clang.patch
pkg/libhdate/trunk/debian/patches/docdir.patch
pkg/libhdate/trunk/debian/patches/series
pkg/libhdate/trunk/debian/patches/size_t.patch
Modified: pkg/libhdate/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/libhdate/trunk/debian/changelog?rev=1074&op=diff
==============================================================================
--- pkg/libhdate/trunk/debian/changelog (original)
+++ pkg/libhdate/trunk/debian/changelog Tue Jan 24 16:54:15 2017
@@ -1,5 +1,10 @@
-libhdate (1.6-4) UNRELEASED; urgency=medium
-
+libhdate (1.6.02-1) UNRELEASED; urgency=medium
+
+ * New upstream release:
+ - manpage.patch dropped (merged upstream)
+ - patch fix_3 dropped (merged upstream)
+ - nested_extern.patch dropped (merged upstream)
+ - missing_format.patch dropped (merged upstream)
* Remove some Multiarch settings. A temporary workaround for now.
(Closes: #807516, #818539)
* misc:Pre-Depends' instead of multiarch-support
Modified: pkg/libhdate/trunk/debian/patches/cflags.patch
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/libhdate/trunk/debian/patches/cflags.patch?rev=1074&op=diff
==============================================================================
--- pkg/libhdate/trunk/debian/patches/cflags.patch (original)
+++ pkg/libhdate/trunk/debian/patches/cflags.patch Tue Jan 24 16:54:15 2017
@@ -8,26 +8,6 @@
* The perl and python bindings were not using the values of those
variables.
---- a/configure.in
-+++ b/configure.in
-@@ -33,7 +33,6 @@ AC_C_CONST
- AC_CONFIG_MACRO_DIR([m4])
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
--CFLAGS=
- LIBS=-lm
-
- dnl =======================================================================================
---- a/configure
-+++ b/configure
-@@ -12466,7 +12466,6 @@ fi
-
-
-
--CFLAGS=
- LIBS=-lm
-
-
--- a/bindings/perl/Makefile.am
+++ b/bindings/perl/Makefile.am
@@ -11,8 +11,8 @@ all-am: hdate.so
@@ -43,7 +23,208 @@
swig -perl -c++ hdate.i
--- a/bindings/perl/Makefile.in
+++ b/bindings/perl/Makefile.in
-@@ -402,8 +402,8 @@ uninstall-am:
+@@ -1,9 +1,8 @@
+-# Makefile.in generated by automake 1.11.6 from Makefile.am.
++# Makefile.in generated by automake 1.15 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+-# Foundation, Inc.
++# Copyright (C) 1994-2014 Free Software Foundation, Inc.
++
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,23 +14,61 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
+-am__make_dryrun = \
+- { \
+- am__dry=no; \
++am__is_gnu_make = { \
++ if test -z '$(MAKELEVEL)'; then \
++ false; \
++ elif test -n '$(MAKE_HOST)'; then \
++ true; \
++ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++ true; \
++ else \
++ false; \
++ fi; \
++}
++am__make_running_with_option = \
++ case $${target_option-} in \
++ ?) ;; \
++ *) echo "am__make_running_with_option: internal error: invalid" \
++ "target option '$${target_option-}' specified" >&2; \
++ exit 1;; \
++ esac; \
++ has_opt=no; \
++ sane_makeflags=$$MAKEFLAGS; \
++ if $(am__is_gnu_make); then \
++ sane_makeflags=$$MFLAGS; \
++ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+- *) \
+- for am__flg in $$MAKEFLAGS; do \
+- case $$am__flg in \
+- *=*|--*) ;; \
+- *n*) am__dry=yes; break;; \
+- esac; \
+- done;; \
++ bs=\\; \
++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
++ esac; \
++ fi; \
++ skip_next=no; \
++ strip_trailopt () \
++ { \
++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
++ }; \
++ for flg in $$sane_makeflags; do \
++ test $$skip_next = yes && { skip_next=no; continue; }; \
++ case $$flg in \
++ *=*|--*) continue;; \
++ -*I) strip_trailopt 'I'; skip_next=yes;; \
++ -*I?*) strip_trailopt 'I';; \
++ -*O) strip_trailopt 'O'; skip_next=yes;; \
++ -*O?*) strip_trailopt 'O';; \
++ -*l) strip_trailopt 'l'; skip_next=yes;; \
++ -*l?*) strip_trailopt 'l';; \
++ -[dEDm]) skip_next=yes;; \
++ -[JT]) skip_next=yes;; \
++ esac; \
++ case $$flg in \
++ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+- test $$am__dry = yes; \
+- }
++ done; \
++ test $$has_opt = yes
++am__make_dryrun = (target_option=n; $(am__make_running_with_option))
++am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -51,7 +88,6 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ subdir = bindings/perl
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+@@ -63,9 +99,22 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/g
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
++AM_V_P = $(am__v_P_ at AM_V@)
++am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
++am__v_P_0 = false
++am__v_P_1 = :
++AM_V_GEN = $(am__v_GEN_ at AM_V@)
++am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
++am__v_GEN_0 = @echo " GEN " $@;
++am__v_GEN_1 =
++AM_V_at = $(am__v_at_ at AM_V@)
++am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
++am__v_at_0 = @
++am__v_at_1 =
+ SOURCES =
+ DIST_SOURCES =
+ am__can_run_installinfo = \
+@@ -73,9 +122,12 @@ am__can_run_installinfo = \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
++am__DIST_COMMON = $(srcdir)/Makefile.in
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+@@ -123,6 +175,7 @@ LN_S = @LN_S@
+ LTLIBICONV = @LTLIBICONV@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+@@ -222,6 +275,7 @@ pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++runstatedir = @runstatedir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+@@ -248,7 +302,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bindings/perl/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu bindings/perl/Makefile
+-.PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+@@ -272,11 +325,11 @@ mostlyclean-libtool:
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-tags: TAGS
+-TAGS:
++tags TAGS:
++
++ctags CTAGS:
+
+-ctags: CTAGS
+-CTAGS:
++cscope cscopelist:
+
+
+ distdir: $(DISTFILES)
+@@ -414,23 +467,26 @@ uninstall-am:
+ .MAKE: install-am install-strip
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+- distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-local install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am
++ cscopelist-am ctags-am distclean distclean-generic \
++ distclean-libtool distdir dvi dvi-am html html-am info info-am \
++ install install-am install-data install-data-am \
++ install-data-local install-dvi install-dvi-am install-exec \
++ install-exec-am install-html install-html-am install-info \
++ install-info-am install-man install-pdf install-pdf-am \
++ install-ps install-ps-am install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
++ uninstall-am
++
++.PRECIOUS: Makefile
+
+
@WITH_PERL_TRUE at all-am: hdate.so
@WITH_PERL_TRUE at hdate.so: hdate_wrap.cxx
@@ -69,7 +250,208 @@
swig -python -c++ hdate.i
--- a/bindings/python/Makefile.in
+++ b/bindings/python/Makefile.in
-@@ -402,8 +402,8 @@ uninstall-am:
+@@ -1,9 +1,8 @@
+-# Makefile.in generated by automake 1.11.6 from Makefile.am.
++# Makefile.in generated by automake 1.15 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+-# Foundation, Inc.
++# Copyright (C) 1994-2014 Free Software Foundation, Inc.
++
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,23 +14,61 @@
+
+ @SET_MAKE@
+ VPATH = @srcdir@
+-am__make_dryrun = \
+- { \
+- am__dry=no; \
++am__is_gnu_make = { \
++ if test -z '$(MAKELEVEL)'; then \
++ false; \
++ elif test -n '$(MAKE_HOST)'; then \
++ true; \
++ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
++ true; \
++ else \
++ false; \
++ fi; \
++}
++am__make_running_with_option = \
++ case $${target_option-} in \
++ ?) ;; \
++ *) echo "am__make_running_with_option: internal error: invalid" \
++ "target option '$${target_option-}' specified" >&2; \
++ exit 1;; \
++ esac; \
++ has_opt=no; \
++ sane_makeflags=$$MAKEFLAGS; \
++ if $(am__is_gnu_make); then \
++ sane_makeflags=$$MFLAGS; \
++ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+- *) \
+- for am__flg in $$MAKEFLAGS; do \
+- case $$am__flg in \
+- *=*|--*) ;; \
+- *n*) am__dry=yes; break;; \
+- esac; \
+- done;; \
++ bs=\\; \
++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
++ esac; \
++ fi; \
++ skip_next=no; \
++ strip_trailopt () \
++ { \
++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
++ }; \
++ for flg in $$sane_makeflags; do \
++ test $$skip_next = yes && { skip_next=no; continue; }; \
++ case $$flg in \
++ *=*|--*) continue;; \
++ -*I) strip_trailopt 'I'; skip_next=yes;; \
++ -*I?*) strip_trailopt 'I';; \
++ -*O) strip_trailopt 'O'; skip_next=yes;; \
++ -*O?*) strip_trailopt 'O';; \
++ -*l) strip_trailopt 'l'; skip_next=yes;; \
++ -*l?*) strip_trailopt 'l';; \
++ -[dEDm]) skip_next=yes;; \
++ -[JT]) skip_next=yes;; \
++ esac; \
++ case $$flg in \
++ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+- test $$am__dry = yes; \
+- }
++ done; \
++ test $$has_opt = yes
++am__make_dryrun = (target_option=n; $(am__make_running_with_option))
++am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -51,7 +88,6 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ subdir = bindings/python
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+@@ -63,9 +99,22 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/g
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
++AM_V_P = $(am__v_P_ at AM_V@)
++am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
++am__v_P_0 = false
++am__v_P_1 = :
++AM_V_GEN = $(am__v_GEN_ at AM_V@)
++am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
++am__v_GEN_0 = @echo " GEN " $@;
++am__v_GEN_1 =
++AM_V_at = $(am__v_at_ at AM_V@)
++am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
++am__v_at_0 = @
++am__v_at_1 =
+ SOURCES =
+ DIST_SOURCES =
+ am__can_run_installinfo = \
+@@ -73,9 +122,12 @@ am__can_run_installinfo = \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
++am__DIST_COMMON = $(srcdir)/Makefile.in
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+@@ -123,6 +175,7 @@ LN_S = @LN_S@
+ LTLIBICONV = @LTLIBICONV@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+@@ -222,6 +275,7 @@ pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
++runstatedir = @runstatedir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+@@ -248,7 +302,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bindings/python/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu bindings/python/Makefile
+-.PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+@@ -272,11 +325,11 @@ mostlyclean-libtool:
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-tags: TAGS
+-TAGS:
++tags TAGS:
++
++ctags CTAGS:
+
+-ctags: CTAGS
+-CTAGS:
++cscope cscopelist:
+
+
+ distdir: $(DISTFILES)
+@@ -414,23 +467,26 @@ uninstall-am:
+ .MAKE: install-am install-strip
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+- distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-local install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am
++ cscopelist-am ctags-am distclean distclean-generic \
++ distclean-libtool distdir dvi dvi-am html html-am info info-am \
++ install install-am install-data install-data-am \
++ install-data-local install-dvi install-dvi-am install-exec \
++ install-exec-am install-html install-html-am install-info \
++ install-info-am install-man install-pdf install-pdf-am \
++ install-ps install-ps-am install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
++ uninstall-am
++
++.PRECIOUS: Makefile
+
+
@WITH_PYTHON_TRUE at all-am: _hdate.so
@WITH_PYTHON_TRUE at _hdate.so: hdate_wrap.cxx
@@ -80,3 +462,13 @@
@WITH_PYTHON_TRUE at hdate_wrap.cxx: hdate.i
@WITH_PYTHON_TRUE@ swig -python -c++ hdate.i
+--- a/configure.in
++++ b/configure.in
+@@ -33,7 +33,6 @@ AC_C_CONST
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+-CFLAGS=" -Wall -g -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -O1 -fstack-protector --param ssp-buffer-size=4 -fPIE -pie"
+ LIBS=-lm
+
+ dnl =======================================================================================
Modified: pkg/libhdate/trunk/debian/patches/clang.patch
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/libhdate/trunk/debian/patches/clang.patch?rev=1074&op=diff
==============================================================================
--- pkg/libhdate/trunk/debian/patches/clang.patch (original)
+++ pkg/libhdate/trunk/debian/patches/clang.patch Tue Jan 24 16:54:15 2017
@@ -32,7 +32,7 @@
if (colorize) colorize_element(ELEMENT_WEEKDAY_NAMES);
for (column = 1; column < 7; column++) print_dow_column(column);
if (colorize) colorize_element(ELEMENT_SHABBAT_NAME);
-@@ -1149,27 +1149,15 @@ void print_week( int jd, const int month
+@@ -1149,31 +1149,15 @@ void print_week( int jd, const int month
@@ -44,9 +44,13 @@
- hdate_struct h;
- int calendar_line;
- int max_calendar_lines = 4;
-- int previous_month, next_month;
+- /// the initializations on next line aren't truly necessary, but they do
+- /// suppress warning "may be used uninitialized in this function [-Wmaybe-uninitialized]"
+- int previous_month = 1, next_month = 1;
- int previous_year, next_year;
-- int jd_current_month, jd_previous_month, jd_next_month;
+- /// the initializations on next line aren't truly necessary, but they do
+- /// suppress warning "may be used uninitialized in this function [-Wmaybe-uninitialized]"
+- int jd_current_month, jd_previous_month = 1, jd_next_month = 1;
-
- void how_many_calendar_lines( int month, int start_dow )
+void how_many_calendar_lines( int month, int start_dow, int *max_calendar_lines )
@@ -63,7 +67,7 @@
break;
case 1:
case 3:
-@@ -1177,12 +1165,24 @@ int print_calendar ( const int current_m
+@@ -1177,14 +1165,30 @@ int print_calendar ( const int current_m
case 7:
case 8:
case 10:
@@ -72,6 +76,9 @@
+ case 12: if (start_dow > 5) *max_calendar_lines = 6;
+ else if (*max_calendar_lines == 4) *max_calendar_lines = 5;
break;
+- case 2: if (start_dow > 1 && max_calendar_lines == 4) max_calendar_lines = 5;
++ case 2: if (start_dow > 1 && *max_calendar_lines == 4) *max_calendar_lines = 5;
+ break;
}
}
@@ -83,9 +90,13 @@
+ hdate_struct h;
+ int calendar_line;
+ int max_calendar_lines = 4;
-+ int previous_month, next_month;
++ /// the initializations on next line aren't truly necessary, but they do
++ /// suppress warning "may be used uninitialized in this function [-Wmaybe-uninitialized]"
++ int previous_month = 1, next_month = 1;
+ int previous_year, next_year;
-+ int jd_current_month, jd_previous_month, jd_next_month;
++ /// the initializations on next line aren't truly necessary, but they do
++ /// suppress warning "may be used uninitialized in this function [-Wmaybe-uninitialized]"
++ int jd_current_month, jd_previous_month = 1, jd_next_month = 1;
+
/*********************************************************
* Preliminaries:
@@ -120,8 +131,8 @@
--- a/examples/hcal/local_functions.c
+++ b/examples/hcal/local_functions.c
@@ -646,62 +646,50 @@ file. Attempting to create a config file
- #include <sys/stat.h>
- #include <sys/types.h> // for mkdir,
+ }
+
-/************************************************************
-* Open config file, or create one
Modified: pkg/libhdate/trunk/debian/patches/docdir.patch
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/libhdate/trunk/debian/patches/docdir.patch?rev=1074&op=diff
==============================================================================
--- pkg/libhdate/trunk/debian/patches/docdir.patch (original)
+++ pkg/libhdate/trunk/debian/patches/docdir.patch Tue Jan 24 16:54:15 2017
@@ -4,8 +4,8 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ SUBDIRS = po docs src examples bindings
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libhdate.pc
+ libhdate_LDFLAGS = -z relro -z now
+
-libhdatedocdir = ${prefix}/share/doc/libhdate
+libhdatedocdir = ${prefix}/share/doc/libhdate1
Modified: pkg/libhdate/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/libhdate/trunk/debian/patches/series?rev=1074&op=diff
==============================================================================
--- pkg/libhdate/trunk/debian/patches/series (original)
+++ pkg/libhdate/trunk/debian/patches/series Tue Jan 24 16:54:15 2017
@@ -1,12 +1,8 @@
docdir.patch
ld-as-needed.patch
-manpage.patch
-fix_3
time_t.patch
typos.patch
cflags.patch
duplicate_gnu_source.patch
size_t.patch
-nested_extern.patch
-missing_format.patch
clang.patch
Modified: pkg/libhdate/trunk/debian/patches/size_t.patch
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/libhdate/trunk/debian/patches/size_t.patch?rev=1074&op=diff
==============================================================================
--- pkg/libhdate/trunk/debian/patches/size_t.patch (original)
+++ pkg/libhdate/trunk/debian/patches/size_t.patch Tue Jan 24 16:54:15 2017
@@ -6,12 +6,12 @@
#define DEBUG 0
#if DEBUG
--printf("\nrevstr: entry: sourcelen = %d, source = %s\n",source_len, source);
+-printf("\nrevstr: entry: sourcelen = %ld, source = %s\n",source_len, source);
+printf("\nrevstr: entry: sourcelen = %zd, source = %s\n",source_len, source);
#endif
if (source == NULL) {error(0,0,"revstr: source buffer pointer is NULL"); exit(0);};
-- if (source_len <= 0) {error(0,0,"revstr: source_len parameter invalid, %d",source_len); exit(0);};
+- if (source_len <= 0) {error(0,0,"revstr: source_len parameter invalid, %ld",source_len); exit(0);};
+ if (source_len <= 0) {error(0,0,"revstr: source_len parameter invalid, %zd",source_len); exit(0);};
size_t i,j;
@@ -20,28 +20,8 @@
memcpy(source, temp_buff, source_len);
source[source_len] = '\0';
#if DEBUG
--printf("\nrevstr: before free(tempbuff): sourcelen = %d, source = %s\n",source_len, source);
+-printf("\nrevstr: before free(tempbuff): sourcelen = %ld, source = %s\n",source_len, source);
+printf("\nrevstr: before free(tempbuff): sourcelen = %zd, source = %s\n",source_len, source);
#endif
free(temp_buff);
return;
---- a/examples/hcal/hcal.c
-+++ b/examples/hcal/hcal.c
-@@ -1135,7 +1135,7 @@ void print_week( int jd, const int month
- // padding - FIXME - spaces are single-byte, while
- // the Hebrew characters are two bytes
- const int margin_max = 15;
-- printf("%*s%s", (margin_max - shabbat_name_str_len/2)," ", shabbat_name_buffer);
-+ printf("%*s%s", (int) (margin_max - shabbat_name_str_len/2)," ", shabbat_name_buffer);
-
- free(shabbat_name_buffer);
- }
-@@ -1344,7 +1344,7 @@ int print_month ( const int month, const
- // padding - FIXME - spaces are single-byte, while
- // the Hebrew characters are two bytes
- const int margin_max = 16; // 15 fails because of jabotinsky in july
-- printf("%*s%s\n", (margin_max - holiday_str_len/2)," ", holiday_buffer);
-+ printf("%*s%s\n", (int) (margin_max - holiday_str_len/2)," ", holiday_buffer);
-
- free(holiday_buffer);
- }
More information about the Debian-hebrew-package
mailing list