diff -u adabrowse-4.0.3/debian/changelog adabrowse-4.0.3/debian/changelog --- adabrowse-4.0.3/debian/changelog +++ adabrowse-4.0.3/debian/changelog @@ -1,15 +1,14 @@ -adabrowse (4.0.3-5ubuntu2) utopic; urgency=medium +adabrowse (4.0.3-6) unstable; urgency=medium - * Build-depend on libasis2014-dev instead of libasis2013-dev. + * Update debian/copyright file + * Update to Standards-Version 3.9.6 (no changes) + * Rebuild with gnat-4.9 and asis 2014 (Closes: #747557) + * Add debian/watch file + * Enable dpkg-buildflags hardening options + * Simplify debian/rules + * Update to debhelper 9 - -- Matthias Klose Mon, 06 Oct 2014 06:59:47 +0200 - -adabrowse (4.0.3-5ubuntu1) utopic; urgency=medium - - * Build-depend on libasis2013-dev instead of libasis2010-dev. - * (Build-)depend on gnat4.9 instead of gnat4.6. - - -- Logan Rosen Sun, 11 May 2014 22:03:43 -0400 + -- Adrian-Ken Rueegsegger Sun, 19 Oct 2014 12:43:15 +0200 adabrowse (4.0.3-5) unstable; urgency=low diff -u adabrowse-4.0.3/debian/compat adabrowse-4.0.3/debian/compat --- adabrowse-4.0.3/debian/compat +++ adabrowse-4.0.3/debian/compat @@ -1 +1 @@ -8 +9 diff -u adabrowse-4.0.3/debian/control adabrowse-4.0.3/debian/control --- adabrowse-4.0.3/debian/control +++ adabrowse-4.0.3/debian/control @@ -1,17 +1,16 @@ Source: adabrowse Section: devel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Adrian-Ken Rueegsegger -Build-Depends: debhelper (>= 8), gnat-4.9, libasis2014-dev, quilt -Standards-Version: 3.9.2 +Maintainer: Adrian-Ken Rueegsegger +Build-Depends: debhelper (>= 9), gnat, gnat-4.9, libasis2014-dev, quilt +Standards-Version: 3.9.6 Homepage: http://home.datacomm.ch/t_wolf/tw/ada95/adabrowse/ Vcs-Browser: http://git.codelabs.ch/?p=debian/adabrowse.git Vcs-Git: http://git.codelabs.ch/git/debian/adabrowse.git Package: adabrowse Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gnat-4.9 +Depends: ${shlibs:Depends}, ${misc:Depends} Description: HTML generator for Ada 95 library unit specifications AdaBrowse is a javadoc-like HTML generator for Ada 95 library unit specifications. It can also generate XML output; a DTD is included in diff -u adabrowse-4.0.3/debian/copyright adabrowse-4.0.3/debian/copyright --- adabrowse-4.0.3/debian/copyright +++ adabrowse-4.0.3/debian/copyright @@ -1,5 +1,7 @@ -Author: Thomas Wolf -Download: http://home.tiscalinet.ch/t_wolf/tw/ada95/adabrowse/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: AdaBrowse +Upstream-Contact: Thomas Wolf +Source: http://home.datacomm.ch/t_wolf/tw/ada95/adabrowse/ Files: * Copyright: (C) 2002-2005 Thomas Wolf @@ -22,7 +24,9 @@ can be found in /usr/share/common-licenses/GPL-2 file. Files: debian/* -Copyright: (C) 2009-2011 Adrian-Ken Rueegsegger +Copyright: + (C) 2004-2008 Ludovic Brenta + (C) 2008-2014 Adrian-Ken Rueegsegger License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -u adabrowse-4.0.3/debian/misc/adabrowse.gpr adabrowse-4.0.3/debian/misc/adabrowse.gpr --- adabrowse-4.0.3/debian/misc/adabrowse.gpr +++ adabrowse-4.0.3/debian/misc/adabrowse.gpr @@ -21,6 +21,15 @@ for Main use ("adabrowse"); + + Extra_Flags := External_As_List ("ADAFLAGS", " "); + package Compiler is - for Default_Switches ("Ada") - use ("-O2", "-gnatafno", "-gnatVa", "-gnatwa", "-gnaty3abefhiklmprt"); + for Default_Switches ("Ada") use + ("-O2", "-gnatafno", "-gnatVa", "-gnatwa", + "-gnaty3abefhiklmprt") & Extra_Flags; end Compiler; + + package Linker is + for Default_Switches ("Ada") use External_As_List ("LDFLAGS", " "); + end Linker; + end Adabrowse; diff -u adabrowse-4.0.3/debian/rules adabrowse-4.0.3/debian/rules --- adabrowse-4.0.3/debian/rules +++ adabrowse-4.0.3/debian/rules @@ -5,51 +5,26 @@ +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + +ADAFLAGS := $(filter-out -Wformat -Werror=format-security, $(CFLAGS)) +export ADAFLAGS + CPUS := $(shell getconf _NPROCESSORS_ONLN) CC := gcc -clean: unpatch - dh_testdir - dh_testroot +%: + dh ${@} +override_dh_auto_clean: rm -rf obj adabrowse sdefault.adb ad-projects-impl_yes-get_parent.adb - rm -f build-stamp - dh_clean -build: build-arch build-indep - -build-arch: build-stamp - -build-indep: build-stamp - -build-stamp: $(QUILT_STAMPFN) - dh_testdir - +override_dh_auto_build: mkdir -p obj - $(CC) -c util-nl.c -o obj/util-nl.o -O2 + $(CC) -c util-nl.c -o obj/util-nl.o $(CFLAGS) gnatmake -j$(CPUS) -Pdebian/misc/adabrowse.gpr - touch build-stamp - -install: - -binary: binary-arch +override_dh_auto_test: +override_dh_auto_install: -binary-arch: build - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_install - dh_installman - dh_strip +override_dh_compress: dh_compress -X.ads -X.adb - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: - -.PHONY: clean build build-arch build-indep install binary binary-arch binary-indep only in patch2: unchanged: --- adabrowse-4.0.3.orig/debian/watch +++ adabrowse-4.0.3/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://home.datacomm.ch/t_wolf/tw/ada95/adabrowse/ adabrowse[_\-\.](\d.*)_src\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))