diff --git a/debian/changelog b/debian/changelog
index 99ba1c1..3df27c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+hdate-applet (0.15.11-4) unstable; urgency=medium
+
+ * extern.patch: fix build with GCC-10 (Closes: #968131)
+ * compat level 13; cdbs => dh (Closes: #965580)
+ * replace_INCLUDES.patch: INCLUDE => AM_CPPFLAGS
+ * A DEP-5 copyright file
+
+ -- Tzafrir Cohen <tzafrir@debian.org> Sun, 07 Feb 2021 23:54:33 +0200
+
hdate-applet (0.15.11-3) unstable; urgency=medium
* Update maintainer address (Closes: #899534)
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..516f9e7
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,6 @@
+po/sv.gmo
+config.log
+hdate-applet.server
+po/Makefile.in
+po/POTFILES
+
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7ed6ff8..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/debian/control b/debian/control
index 96e2fae..fc8649f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,12 @@ Section: gnome
Priority: optional
Maintainer: Debian Hebrew Packaging Team <team+hebrew@tracker.debian.org>
Uploaders: Lior Kaplan <kaplan@debian.org>, Shachar Shemesh <shachar@debian.org>, Tzafrir Cohen <tzafrir@debian.org>
-Build-Depends: debhelper (>= 5.0.0), cdbs, libhdate-dev, libgtk2.0-dev
+Build-Depends: debhelper-compat (= 13), libhdate-dev, libgtk2.0-dev
Standards-Version: 3.9.1
Vcs-Browser: https://salsa.debian.org/hebrew-team/hdate-applet
Vcs-Git: https://salsa.debian.org/hebrew-team/hdate-applet.git
Homepage: http://hdateapplet.sourceforge.net/
+Rules-Requires-Root: no
Package: hdate-applet
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 2317753..8c1c4d0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,34 +1,35 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: hspell-gui
+Upstream-Contact: Yaacov Zamir <kzamir@walla.co.il>
+Source: http://hspell-gui.sourceforge.net/
+
+Files: *
+Copyright: 2004-2010 Yaacov Zamir <kzamir@walla.co.il>
+License: GPL-2+
+
+Files: debian/*
+Copyright:
+ 2005-2007 Baruch Even <baruch@ev-en.org>
+ 2005-2018 Lior Kaplan <kaplan@debian.org>
+ 2021 Tzafrir Cohen <tzafrir@debian.org>
+License: GPL-2+
+
+License: GPL-2+
+ 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; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ 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 program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
This package was debianized by kobi <kzamir@walla.co.il> on
Sun, 20 Mar 2005 19:42:55 +0200.
-
-It was downloaded from http://hdateapplet.sf.net
-
-Upstream Author:
-
- Yaacov Zamir <kzamir@walla.co.il>
-
-Copyright:
-
- Copyright (C) 2004-2010 Yaacov Zamir <kzamir@walla.co.il>
-
-License:
-
- 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 3 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, see <http://www.gnu.org/licenses/>.
-
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is Copyright (C) 2008-2010, Lior Kaplan <kaplan@debian.org> and
-is licensed under the GPL, see above.
diff --git a/debian/patches/desktop-file b/debian/patches/desktop-file
index 5d069e9..4b7c32a 100644
--- a/debian/patches/desktop-file
+++ b/debian/patches/desktop-file
@@ -1,8 +1,10 @@
Description: Fix for lintain's desktop-entry-contains-encoding-key
Author: Debian Hebrew Packaging Team <debian-hebrew-package@lists.alioth.debian.org>
---- a/ghcal.desktop
-+++ b/ghcal.desktop
+Index: hdate-applet/ghcal.desktop
+===================================================================
+--- hdate-applet.orig/ghcal.desktop 2021-02-07 23:50:18.518932025 +0200
++++ hdate-applet/ghcal.desktop 2021-02-07 23:51:14.235211475 +0200
@@ -1,6 +1,5 @@
[Desktop Entry]
Version=1.0
@@ -10,7 +12,7 @@ Author: Debian Hebrew Packaging Team <debian-hebrew-package@lists.alioth.debian.
Name=Hdate
Name[he]=לוח שנה עברי
Comment=Hebrew desktop calendar
-@@ -8,7 +7,7 @@
+@@ -8,7 +7,8 @@
Exec=ghcal
Terminal=false
Type=Application
@@ -19,3 +21,4 @@ Author: Debian Hebrew Packaging Team <debian-hebrew-package@lists.alioth.debian.
Categories=GNOME;GTK;Utility;Calendar;
StartupNotify=false
GenericName[en_US]=
++Keywords=calendar;jewish
diff --git a/debian/patches/extern.patch b/debian/patches/extern.patch
new file mode 100644
index 0000000..9be9619
--- /dev/null
+++ b/debian/patches/extern.patch
@@ -0,0 +1,67 @@
+externalize headers declerations for GCC-10
+
+Index: hdate-applet/src/ghcal-interface.h
+===================================================================
+--- hdate-applet.orig/src/ghcal-interface.h 2021-02-07 21:00:01.346877258 +0200
++++ hdate-applet/src/ghcal-interface.h 2021-02-07 21:09:55.244108718 +0200
+@@ -42,16 +42,16 @@
+ # define N_(String) (String)
+ #endif
+
+-hdate_struct today;
+-GtkWidget *label_month;
+-GtkWidget *label_year;
+-GtkWidget *combobox_month;
+-GtkWidget *spinbutton_year;
+-GtkWidget *label_hebrew_month_and_year;
+-int index_day_of_month[42];
+-hdate_struct hdate_day_of_month[42];
+-GtkWidget *label_day_of_month[42];
+-GtkWidget *event_box_day_of_month[42];
+-GtkTooltips *tooltip_day_of_month[42];
++extern hdate_struct today;
++extern GtkWidget *label_month;
++extern GtkWidget *label_year;
++extern GtkWidget *combobox_month;
++extern GtkWidget *spinbutton_year;
++extern GtkWidget *label_hebrew_month_and_year;
++extern int index_day_of_month[42];
++extern hdate_struct hdate_day_of_month[42];
++extern GtkWidget *label_day_of_month[42];
++extern GtkWidget *event_box_day_of_month[42];
++extern GtkTooltips *tooltip_day_of_month[42];
+
+ GtkWidget *create_window (void);
+Index: hdate-applet/src/ghcal-interface.c
+===================================================================
+--- hdate-applet.orig/src/ghcal-interface.c 2021-02-07 21:00:01.346877258 +0200
++++ hdate-applet/src/ghcal-interface.c 2021-02-07 21:18:07.933559085 +0200
+@@ -33,6 +33,15 @@
+ #include "ghcal-callbacks.h"
+ #include "ghcal-interface.h"
+
++GtkWidget *label_month;
++GtkWidget *label_year;
++GtkWidget *label_hebrew_month_and_year;
++int index_day_of_month[42];
++hdate_struct hdate_day_of_month[42];
++GtkWidget *label_day_of_month[42];
++GtkWidget *event_box_day_of_month[42];
++GtkTooltips *tooltip_day_of_month[42];
++
+ GtkWidget *
+ create_window (void)
+ {
+Index: hdate-applet/src/ghcal-callbacks.c
+===================================================================
+--- hdate-applet.orig/src/ghcal-callbacks.c 2021-02-07 21:01:03.000000000 +0200
++++ hdate-applet/src/ghcal-callbacks.c 2021-02-07 21:11:04.396837054 +0200
+@@ -39,6 +39,8 @@
+
+ #define MAX_STRING_SIZE 250
+
++hdate_struct today;
++
+ gboolean
+ on_arrow_prev_month_button_press_event (GtkWidget *
+ widget,
diff --git a/debian/patches/replace_INCLUDES.patch b/debian/patches/replace_INCLUDES.patch
new file mode 100644
index 0000000..406a928
--- /dev/null
+++ b/debian/patches/replace_INCLUDES.patch
@@ -0,0 +1,18 @@
+From: Tzafrir Cohen <tzafrir@debian.org>
+Subject: INCLUDES => AM_CPPFLAGS
+
+INCLUDES is an obsolete automate variable.
+
+Index: hdate-applet/src/Makefile.am
+===================================================================
+--- hdate-applet.orig/src/Makefile.am 2021-02-07 21:00:01.346877258 +0200
++++ hdate-applet/src/Makefile.am 2021-02-07 22:54:22.869873801 +0200
+@@ -3,7 +3,7 @@
+ EXTRA_DIST = \
+ ghcal-he
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -DPIXMAP_DIR=\"$(DESTDIR)$(datadir)/pixmaps/$(PACKAGE)\" \
+ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
diff --git a/debian/patches/series b/debian/patches/series
index 5eec641..cb9d410 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@ hebrew-translation
swedish-translation
use-locale
no-bonobo.patch
+extern.patch
+replace_INCLUDES.patch
diff --git a/debian/patches/swedish-translation b/debian/patches/swedish-translation
index 9ac5e26..7cf2536 100644
--- a/debian/patches/swedish-translation
+++ b/debian/patches/swedish-translation
@@ -1,16 +1,5 @@
Description: Swedish (sv) translation
Author: Daniel Nylander <po@danielnylander.se>
---- a/configure
-+++ b/configure
-@@ -6126,7 +6126,7 @@
- _ACEOF
-
-
--ALL_LINGUAS="he"
-+ALL_LINGUAS="he sv"
- # On IRIX 5.3, sys/types and inttypes.h are conflicting.
- for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
--- a/configure.in
+++ b/configure.in
@@ -55,7 +55,7 @@
diff --git a/debian/rules b/debian/rules
index 3364b73..c79e5a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,29 @@
#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
# -*- makefile -*-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --without-systray --without-gnome --without-evolution
+%:
+ dh $@
-clean::
- rm -f po/*.gmo config.log hdate-applet.server po/Makefile.in po/POTFILES
- chmod +x mkinstalldirs
+SAVED_FILES = \
+ mkinstalldirs INSTALL Makefile.in aclocal.m4 config.h.in configure \
+ depcomp install-sh missing scripts/Makefile.in src/Makefile.in po/he.gmo
+SAVED_ARCHIVE = debian/saved.tar
+
+override_dh_autoreconf:
+ if [ ! -f $(SAVED_ARCHIVE) ]; then \
+ tar cf $(SAVED_ARCHIVE) $(SAVED_FILES); \
+ fi
+ dh_autoreconf
+
+override_dh_autoreconf_clean:
+ dh_autoreconf_clean
+ if [ -f $(SAVED_ARCHIVE) ]; then \
+ tar xf $(SAVED_ARCHIVE); \
+ rm -f $(SAVED_ARCHIVE); \
+ fi
+
+override_dh_auto_configure:
+ dh_auto_configure -- --without-systray --without-gnome --without-evolution
diff --git a/debian/watch b/debian/watch
index 69a220d..5711ed4 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
-http://sf.net/hdateapplet/hdate-applet-(.*)\.tar\.bz2
+version=4
+http://sf.net/hdateapplet/hdate-applet-(.*)\.tar\.bz2 debian uupdate
