diff -Nru ding-1.8.1/debian/changelog ding-1.8.1/debian/changelog --- ding-1.8.1/debian/changelog 2019-01-05 12:08:26.000000000 +0000 +++ ding-1.8.1/debian/changelog 2019-02-01 21:43:30.000000000 +0000 @@ -1,3 +1,13 @@ +ding (1.8.1-7) unstable; urgency=medium + + * Add buildlog to gitlab-ci test pipeline. + * 23_Verlaengerung: Fix typo in Verlängerungsschnüre (Closes: #920808). + * Build-depend on debhelper-compat (= 12) instead of using d/compat. + * Generate xpm icons and a 64x64 icon on build time using imagemagick. + * d/gitlab-ci.yml stripped down using pipline-jobs.yml + + -- Roland Rosenfeld Fri, 01 Feb 2019 22:43:30 +0100 + ding (1.8.1-6) unstable; urgency=medium [ Ondřej Nový ] diff -Nru ding-1.8.1/debian/compat ding-1.8.1/debian/compat --- ding-1.8.1/debian/compat 2019-01-05 12:08:26.000000000 +0000 +++ ding-1.8.1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -12 diff -Nru ding-1.8.1/debian/control ding-1.8.1/debian/control --- ding-1.8.1/debian/control 2019-01-05 12:08:26.000000000 +0000 +++ ding-1.8.1/debian/control 2019-02-01 21:43:30.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Roland Rosenfeld Standards-Version: 4.3.0 -Build-Depends: debhelper (>= 12~) +Build-Depends: debhelper-compat (= 12), imagemagick Build-Depends-Indep: bsdmainutils, dictfmt (>= 1.10.1), dictzip, man-db Homepage: https://www-user.tu-chemnitz.de/~fri/ding/ Vcs-Git: https://salsa.debian.org/debian/ding.git diff -Nru ding-1.8.1/debian/dbook.xpm ding-1.8.1/debian/dbook.xpm --- ding-1.8.1/debian/dbook.xpm 2019-01-05 12:08:26.000000000 +0000 +++ ding-1.8.1/debian/dbook.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -/* XPM */ -static char * dbook_xpm[] = { -"32 32 6 1", -" c None", -". c #C0C0C0", -"+ c #000000", -"@ c #FFFFFF", -"# c #F27C0E", -"$ c #808080", -" ", -" ", -" ", -" ", -" ......... ........... ", -" +++++++++++ ++++++++++++. ", -" +@@@@@@@@@@+++@@@@@@@@@@++## ", -" ##+@@@@...@@@.+.@@@@@@@@@@++## ", -" ##+@@@++++.@@+++@@@@@@@@@@++## ", -" ##+@@.+++++@@+++@++++++++@++## ", -" ##+@@++@.++.@+++@@@@@@@@@@++## ", -" ##+@@++@@++.@+++@@@@@@@@@@++## ", -" ##+@@..@@++.@+++@@@++++++@++## ", -" ##+@@@@@+++@@+++@@@@@@@@@@++## ", -" ##+@@@@+++.@@+++@@@@@@@@@@++## ", -" ##+@@@@++.@@@+++@@@@@@@@@@++## ", -" ##+@@@@+.@@@@+++@++++@+++@++## ", -" ##+@@@@@@@@@@+++@@@@@@@@@@++## ", -" ##+@@@+++@@@@+++@@@@@@@@@@++## ", -" ##+@@.+++.@@@+++@@@@@@++++++## ", -" ##+@@@+++@@@@+++@@@@@.+@@+++## ", -" ##+@@@@.@@@@@+++@@@@@.+@+.++## ", -" ##+@@@@@@@@@@+++@@@@@.++..++## ", -" ##++++++++++@.+.@+++++++++++## ", -" ##+.........+.+.+.........++## ", -" ##+..........+++..........++## ", -" ##+++++++++++###+++++++++++### ", -" ############################## ", -" ############ #############$ ", -" ", -" ", -" "}; diff -Nru ding-1.8.1/debian/dirs ding-1.8.1/debian/dirs --- ding-1.8.1/debian/dirs 2019-01-05 12:08:26.000000000 +0000 +++ ding-1.8.1/debian/dirs 2019-02-01 21:43:30.000000000 +0000 @@ -2,5 +2,6 @@ usr/share/applications usr/share/doc/ding/html usr/share/icons/hicolor/32x32/apps +usr/share/icons/hicolor/64x64/apps usr/share/man/man1 usr/share/pixmaps diff -Nru ding-1.8.1/debian/gitlab-ci.yml ding-1.8.1/debian/gitlab-ci.yml --- ding-1.8.1/debian/gitlab-ci.yml 2019-01-05 12:08:26.000000000 +0000 +++ ding-1.8.1/debian/gitlab-ci.yml 2019-02-01 21:43:30.000000000 +0000 @@ -1,16 +1,6 @@ -include: https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml -build: - extends: .build-unstable - -reprotest: - extends: .test-reprotest - -lintian: - extends: .test-lintian - -autopkgtest: - extends: .test-autopkgtest - -piuparts: - extends: .test-piuparts +variables: + RELEASE: 'unstable' diff -Nru ding-1.8.1/debian/patches/23_Verlaengerung.patch ding-1.8.1/debian/patches/23_Verlaengerung.patch --- ding-1.8.1/debian/patches/23_Verlaengerung.patch 1970-01-01 00:00:00.000000000 +0000 +++ ding-1.8.1/debian/patches/23_Verlaengerung.patch 2019-02-01 21:43:30.000000000 +0000 @@ -0,0 +1,16 @@ +From: Axel Beckert +Date: Tue, 29 Jan 2019 13:48:40 +0100 +Subject: Fix typo Verländerungsschnüre -> Verlängerungsschnüre +Bug-Debian: https://bugs.debian.org/920808 + +--- a/de-en.txt ++++ b/de-en.txt +@@ -106280,7 +106280,7 @@ Verlängerung {f} | Verlängerungen {pl} + Verlängerung {f} | Verlängerungen {pl} :: lengthening | lengthenings + Verlängerung {f} (der Gültigkeit) [adm.] | Verlängerungen {pl} | Abonnementverlängerung {f} | die Verlängerung eines Personalausweises | Der Vertrag steht zur Verlängerung an. :: renewal (of the validity) | renewals | renewal of the subscription | the renewal of an identity card | The contract is up for renewal. + Verlängerungsglied {n} (Zeit) | Verlängerungsglieder {pl} :: pulse-stretching element | pulse-stretching elements +-Verlängerungskabel {n}; Verlängerungsschnur {f} [ugs.]; Verlängerung {f} [ugs.] [electr.] | Verlängerungskabel {pl}; Verländerungsschnüre {pl}; Verlängerungen {pl} :: extension cable [Br.]; extension lead [Br.]; extension flex [Br.]; extension cord [Am.]; extension [coll.] | extension cables; extension leads; extension flexes; extension cords; extensions ++Verlängerungskabel {n}; Verlängerungsschnur {f} [ugs.]; Verlängerung {f} [ugs.] [electr.] | Verlängerungskabel {pl}; Verlängerungsschnüre {pl}; Verlängerungen {pl} :: extension cable [Br.]; extension lead [Br.]; extension flex [Br.]; extension cord [Am.]; extension [coll.] | extension cables; extension leads; extension flexes; extension cords; extensions + Verlängerungsstück {n} | Verlängerungsstücke {pl} :: extension piece | extension pieces + Verlässlichkeit {f} :: sure-handedness + Verladeschein {m} [econ.] [adm.] | Verladescheine {pl} :: shipping note | shipping notes diff -Nru ding-1.8.1/debian/patches/series ding-1.8.1/debian/patches/series --- ding-1.8.1/debian/patches/series 2019-01-05 12:08:26.000000000 +0000 +++ ding-1.8.1/debian/patches/series 2019-02-01 21:43:30.000000000 +0000 @@ -15,3 +15,4 @@ 20_tre-agrep.patch 21_Primarschule.patch 22_Stegreif.patch +23_Verlaengerung.patch diff -Nru ding-1.8.1/debian/rules ding-1.8.1/debian/rules --- ding-1.8.1/debian/rules 2019-01-05 12:08:26.000000000 +0000 +++ ding-1.8.1/debian/rules 2019-02-01 21:43:30.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/make -f # -# (C) 1999-2018 Roland Rosenfeld , based on +# (C) 1999-2019 Roland Rosenfeld , based on # Sample debian/rules that uses debhelper. # This file is public domain software, originally written by Joey Hess. # @@ -43,11 +43,13 @@ install -m644 ding.desktop \ $(DINGDIR)/usr/share/applications/ding.desktop - install -m644 debian/dbook.xpm \ + convert ding.png -geometry 32x32 -colors 6 \ $(DINGDIR)/usr/share/pixmaps/dbook.xpm install -m644 debian/mini-dbook.xpm \ $(DINGDIR)/usr/share/pixmaps/mini-dbook.xpm install -m644 ding.png $(DINGDIR)/usr/share/icons/hicolor/32x32/apps/ + convert ding.png -geometry 64x64 \ + $(DINGDIR)/usr/share/icons/hicolor/64x64/apps/ding.png install -m644 debian/html/* $(DINGDIR)/usr/share/doc/ding/html/ env -u LANG LC_ALL=C MANWIDTH=80 MAN_DISABLE_SECCOMP=1 \ diff -Nru ding-1.8.1/debian/tests/control ding-1.8.1/debian/tests/control --- ding-1.8.1/debian/tests/control 2019-01-05 12:08:26.000000000 +0000 +++ ding-1.8.1/debian/tests/control 2019-02-01 21:43:30.000000000 +0000 @@ -2,7 +2,7 @@ Depends: ding Tests: desktop-file-validate -Depends: ding, desktop-file-utils +Depends: desktop-file-utils, ding Tests: dictd -Depends: dict-de-en, dict, dictd, dpkg-dev +Depends: dict, dict-de-en, dictd, dpkg-dev