From 1a562b9e62211e82500a07e87c64237817febeca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 1 Jun 2017 21:14:48 +0200 Subject: Remove applied patches --- debian/changelog | 13 +++++++++++++ debian/patches/series | 14 +++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 207b2f0..7b28bc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +dmidecode (3.1-1) UNRELEASED; urgency=medium + + * New upstream release. + - Remove applied patches: + + debian/patches/0110-nosysfs.patch + + debian/patches/0115-no_smbios_DMI_entry_point.patch + + debian/patches/0120-return_actual_data_size.patch + + debian/patches/0125-use_read_file_to_read_DMI_table_from_sysfs.patch + + debian/patches/0130-use_DWORD_for_table_max_size.patch + + debian/patches/0135-hide_fixup_msg.patch + + -- Jörg Frings-Fürst Wed, 31 May 2017 23:27:55 +0200 + dmidecode (3.0-4) unstable; urgency=medium * debian/rules: Fix FTCBFS to pass suitable CC to make. (Closes: #835921). diff --git a/debian/patches/series b/debian/patches/series index 1916e4c..e06432c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,10 +1,10 @@ 0100-ansi-c.patch 0001-hurd.patch 0005-build.patch -0105-dmidecode-avoid-sigbus.patch -0110-nosysfs.patch -0115-no_smbios_DMI_entry_point.patch -0120-return_actual_data_size.patch -0125-use_read_file_to_read_DMI_table_from_sysfs.patch -0130-use_DWORD_for_table_max_size.patch -0135-hide_fixup_msg.patch +#0105-dmidecode-avoid-sigbus.patch +#0110-nosysfs.patch +#0115-no_smbios_DMI_entry_point.patch +#0120-return_actual_data_size.patch +#0125-use_read_file_to_read_DMI_table_from_sysfs.patch +#0130-use_DWORD_for_table_max_size.patch +#0135-hide_fixup_msg.patch -- cgit v1.2.3 From 66980ea05b9d86f9630e0afde9852f0db75e689f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 1 Jun 2017 21:19:42 +0200 Subject: d/copyright: change year and email addess --- debian/changelog | 3 +++ debian/copyright | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7b28bc5..dd2973e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ dmidecode (3.1-1) UNRELEASED; urgency=medium + debian/patches/0125-use_read_file_to_read_DMI_table_from_sysfs.patch + debian/patches/0130-use_DWORD_for_table_max_size.patch + debian/patches/0135-hide_fixup_msg.patch + * debian/copyright: + - Add year 2017. + - Change email address. -- Jörg Frings-Fürst Wed, 31 May 2017 23:27:55 +0200 diff --git a/debian/copyright b/debian/copyright index 6432a7c..d17d1db 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Upstream-Contact: dmidecode-devel@nongnu.org Source: http://download.savannah.gnu.org/releases/demidecode/ Files: * -Copyright: 2002-2016 Jean Delvare +Copyright: 2002-2017 Jean Delvare 2002 Alan Cox 2010 Anton Arapov 2015 Xie XiuQi @@ -13,7 +13,7 @@ License: GPL-2+ Files: debian/* Copyright: 2003-2007 Petter Reinholdtsen 2011-2012 Daniel Baumann - 2014-2016 Jörg Frings-Fürst + 2014-2017 Jörg Frings-Fürst License: GPL-2+ License: GPL-2+ -- cgit v1.2.3 From c081020b4f1a388c4808c87df05b51b423818baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 1 Jun 2017 21:36:11 +0200 Subject: Migrate to debhelper 10 --- debian/changelog | 3 +++ debian/compat | 2 +- debian/control | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index dd2973e..2ff7a0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ dmidecode (3.1-1) UNRELEASED; urgency=medium * debian/copyright: - Add year 2017. - Change email address. + * Migrate to debhelper 10: + - Change debian/compat to 10. + - Bump minimum debhelper version in debian/control to >= 10. -- Jörg Frings-Fürst Wed, 31 May 2017 23:27:55 +0200 diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 0cf55dc..41f4e41 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: dmidecode Section: utils Priority: optional Maintainer: Jörg Frings-Fürst -Build-Depends: debhelper (>= 9) +Build-Depends: debhelper (>= 10) Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/dmidecode.git Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/dmidecode.git -- cgit v1.2.3 From 6e261adebea09bddec754197dfa298730a3e259d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 1 Jun 2017 21:46:50 +0200 Subject: Use the automatic debug symbol packages --- debian/changelog | 3 +++ debian/control | 11 ----------- debian/rules | 3 --- 3 files changed, 3 insertions(+), 14 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2ff7a0f..f0b7d42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ dmidecode (3.1-1) UNRELEASED; urgency=medium * Migrate to debhelper 10: - Change debian/compat to 10. - Bump minimum debhelper version in debian/control to >= 10. + * Use the automatic debug symbol packages: + - Remove dmidecode-dbg section from debian/control. + - Remove override_dh_strip from debian/rules. -- Jörg Frings-Fürst Wed, 31 May 2017 23:27:55 +0200 diff --git a/debian/control b/debian/control index 41f4e41..e5e24a1 100644 --- a/debian/control +++ b/debian/control @@ -26,17 +26,6 @@ Description: SMBIOS/DMI table decoder Beware that DMI data have proven to be too unreliable to be blindly trusted. Dmidecode does not scan the hardware, it only reports what the BIOS told it to. -Package: dmidecode-dbg -Section: debug -Priority: extra -Architecture: any-amd64 arm64 armhf ia64 any-i386 -Depends: ${misc:Depends}, dmidecode (= ${binary:Version}) -Description: SMBIOS/DMI table decoder (debug) - Dmidecode reports information about the system's hardware as described in the - system BIOS according to the SMBIOS/DMI standard. - . - This package contains the debugging symbols. - Package: dmidecode-udeb Section: debian-installer Architecture: any-amd64 arm64 armhf ia64 any-i386 diff --git a/debian/rules b/debian/rules index fce1c6c..a0cbc4d 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,3 @@ override_dh_auto_install: override_dh_install: dh_install --fail-missing - -override_dh_strip: - dh_strip --dbg-package=dmidecode-dbg -- cgit v1.2.3 From 2559777e162a9f0cab42a153f1f7bf09a18093a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 1 Jun 2017 22:49:04 +0200 Subject: Change Homepage --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f0b7d42..07fcfa2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ dmidecode (3.1-1) UNRELEASED; urgency=medium * debian/copyright: - Add year 2017. - Change email address. + * debian/control: + - Change Homepage. * Migrate to debhelper 10: - Change debian/compat to 10. - Bump minimum debhelper version in debian/control to >= 10. diff --git a/debian/control b/debian/control index e5e24a1..570a179 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 10) Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/dmidecode.git Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/dmidecode.git -Homepage: https://dmidecode.nongnu.org/ +Homepage: http://nongnu.org/dmidecode/ Package: dmidecode Priority: important -- cgit v1.2.3 From b0014a4780ac89669f95212c6e6a600af6c45172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 6 Jun 2017 17:55:34 +0200 Subject: Add LP: #1688162 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 07fcfa2..67e5b5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ dmidecode (3.1-1) UNRELEASED; urgency=medium - * New upstream release. + * New upstream release (LP: #1688162): - Remove applied patches: + debian/patches/0110-nosysfs.patch + debian/patches/0115-no_smbios_DMI_entry_point.patch -- cgit v1.2.3 From 181a0ebb69213f3efea9b9cbae36c81d99f3b226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 10 Jun 2017 14:51:00 +0200 Subject: New README.source to explain the branching model used --- debian/README.source | 18 ++++++++++++++++++ debian/changelog | 1 + 2 files changed, 19 insertions(+) create mode 100644 debian/README.source (limited to 'debian') diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..e4f2b3d --- /dev/null +++ b/debian/README.source @@ -0,0 +1,18 @@ +Hello, + +now I use the branching model from Vincent Driessen[1]. + +I use the gitflow-avh[2]. with the Documentation[3]. +The Debian package can be found here[4]. + +Please upload unattended uploads use a branch feature/. + + +Many thanks. + + -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 + +[1] http://nvie.com/posts/a-successful-git-branching-model/ +[2] https://github.com/petervanderdoes/gitflow-avh +[3] https://github.com/petervanderdoes/gitflow-avh/wiki +[4] https://tracker.debian.org/pkg/git-flow diff --git a/debian/changelog b/debian/changelog index 67e5b5c..47c44d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ dmidecode (3.1-1) UNRELEASED; urgency=medium * Use the automatic debug symbol packages: - Remove dmidecode-dbg section from debian/control. - Remove override_dh_strip from debian/rules. + * New README.source to explain the branching model used. -- Jörg Frings-Fürst Wed, 31 May 2017 23:27:55 +0200 -- cgit v1.2.3 From b635896046b344589dac699537dad07fc564d0c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 24 Jun 2017 18:35:14 +0200 Subject: Declare compliance with Debian Policy 4.0.0 --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 47c44d4..7dddc77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ dmidecode (3.1-1) UNRELEASED; urgency=medium + debian/patches/0135-hide_fixup_msg.patch * debian/copyright: - Add year 2017. - - Change email address. + - Change upstream email address. * debian/control: - Change Homepage. * Migrate to debhelper 10: @@ -20,6 +20,7 @@ dmidecode (3.1-1) UNRELEASED; urgency=medium - Remove dmidecode-dbg section from debian/control. - Remove override_dh_strip from debian/rules. * New README.source to explain the branching model used. + * Declare compliance with Debian Policy 4.0.0. (No changes needed). -- Jörg Frings-Fürst Wed, 31 May 2017 23:27:55 +0200 diff --git a/debian/control b/debian/control index 570a179..b078c61 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: debhelper (>= 10) -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/dmidecode.git Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/dmidecode.git Homepage: http://nongnu.org/dmidecode/ -- cgit v1.2.3 From cbda69b295122262360b0899ad2f5275ace1179d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 24 Jun 2017 23:03:54 +0200 Subject: Close bug #860897 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7dddc77..b8609a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ dmidecode (3.1-1) UNRELEASED; urgency=medium - * New upstream release (LP: #1688162): + * New upstream release (LP: #1688162) (Closes: #860897): - Remove applied patches: + debian/patches/0110-nosysfs.patch + debian/patches/0115-no_smbios_DMI_entry_point.patch -- cgit v1.2.3