New Upstream Snapshot - aha
Ready changes
Summary
Merged new upstream version: 0.5.1+git20210920.1.5eaec96 (was: 0.5.1).
Resulting package
Built on 2022-04-28T21:09 (took 6m29s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots aha-dbgsymapt install -t fresh-snapshots aha
Lintian Result
Diff
diff --git a/.gitignore b/.gitignore
index 58cb1ec..c5964a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
aha
/.project
-/testcases/*
diff --git a/Makefile b/Makefile
index 8fb8767..064c7e0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,14 @@
.PHONY: all clean install
-PREFIX?=/usr/local
+platform := $(shell uname -s)
+
+PREFIX?=/usr/local
DATAROOTDIR?=$(PREFIX)/share
MANDIR?=$(DATAROOTDIR)/man
+INSTALL?=install -p
+MD=mkdir
BINMODE?=0755
MANMODE?=644
@@ -19,7 +23,12 @@ clean:
rm -f aha
install: aha
- install -d $(DESTDIR)$(PREFIX)/bin
- install -m $(BINMODE) aha $(DESTDIR)$(PREFIX)/bin
- install -d $(DESTDIR)$(MANDIR)/man1
- install -m $(MANMODE) aha.1 $(DESTDIR)$(MANDIR)/man1
+ifeq ($(platform), Darwin)
+ $(MD) -p $(DESTDIR)$(PREFIX)/bin/
+ $(MD) -p $(DESTDIR)$(MANDIR)/man1/
+ $(INSTALL) -m $(BINMODE) aha $(DESTDIR)$(PREFIX)/bin/aha
+ $(INSTALL) -m $(MANMODE) aha.1 $(DESTDIR)$(MANDIR)/man1/aha.1
+else
+ $(INSTALL) -D -m $(BINMODE) aha $(DESTDIR)$(PREFIX)/bin/aha
+ $(INSTALL) -D -m $(MANMODE) aha.1 $(DESTDIR)$(MANDIR)/man1/aha.1
+endif
diff --git a/README.md b/README.md
index 9863c42..c2c2e71 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,22 @@ Examples
Compilation / Installation
==========================
+## Installation Options
+
+### OSX - Homebrew
+
+* `brew install aha`
+
+### Conda
+
+* `conda install -n YOURENV -c conda-forge aha` (and if you wish to make conda 10x faster, <a href=https://github.com/mamba-org/mamba >use mamba</a>).
+
+### Build From Source
+
Aha has no dependencies except for a C compiler and `make`.
+Clone this repo `git clone https://github.com/theZiz/aha.git`.
+Move into the repo directory `cd aha`.
To compile just type `make`.
To install aha to `/usr/local/` type `make install`.
You can change the installation directory with `make install PREFIX=/your/path`.
diff --git a/aha.c b/aha.c
index e6ce1e1..46e43c0 100644
--- a/aha.c
+++ b/aha.c
@@ -511,17 +511,29 @@ void printHeader(const struct Options *opts)
if (opts->no_xml)
{
if (opts->lang)
- printf("<html lang=\"%s\">\n",opts->lang);
+ {
+ printf("<html lang=\"");
+ printHtml(opts->lang);
+ printf("\">\n");
+ }
else
+ {
printf("<html>\n");
+ }
printf("<head>\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\">\n", encoding);
}
else
{
if (opts->lang)
- printf("<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"%s\">\n",opts->lang);
+ {
+ printf("<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"");
+ printHtml(opts->lang);
+ printf("\">\n");
+ }
else
+ {
printf("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n");
+ }
printf("<head>\n<meta http-equiv=\"Content-Type\" content=\"application/xml+xhtml; charset=%s\"/>\n", encoding);
}
printf("<title>");
@@ -529,7 +541,11 @@ void printHeader(const struct Options *opts)
printf("</title>\n");
if (opts->css)
- printf("<link rel=\"stylesheet\" href=\"%s\" />\n", opts->css );
+ {
+ printf("<link rel=\"stylesheet\" href=\"");
+ printHtml(opts->css);
+ printf("\">\n");
+ }
int style_tag = 0;
if (opts->stylesheet)
@@ -637,7 +653,7 @@ void printHeader(const struct Options *opts)
}
if(opts->bodystyle) {
if(styles) printf(";");
- fputs(opts->bodystyle, stdout);
+ printHtml(opts->bodystyle);
}
printf("\"");
}
@@ -1142,8 +1158,10 @@ int main(int argc,char* args[])
newline=-1;
}
//I want fall throught, so I ignore the gcc warning for this switch
+ #if defined(__GNUC__) && __GNUC__ >= 5
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough="
+ #endif
switch (c)
{
case '&': printf("&"); break;
@@ -1159,7 +1177,9 @@ int main(int argc,char* args[])
else
printf("%c",c);
}
+ #if defined(__GNUC__) && __GNUC__ >= 5
#pragma GCC diagnostic pop
+ #endif
if (opts.iso>0) //only at ISOS
if ((c & 128)==128) //first bit set => there must be followbytes
{
diff --git a/debian/changelog b/debian/changelog
index 0495bc1..64234bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+aha (0.5.1+git20210920.1.5eaec96-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Thu, 28 Apr 2022 21:03:54 -0000
+
aha (0.5.1-3) unstable; urgency=medium
* Fix debian/watch AGAIN for changed Github web interface.
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/debug/.build-id/71/48b960dd21c54475b1c78db6e3b3dcf629931e.debug
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/debug/.build-id/4d/b4d9ddc6ae6ef2b80c0a591e5ec440af307952.debug
No differences were encountered between the control files of package aha
Control files of package aha-dbgsym: lines which differ (wdiff format)
Build-Ids: 4db4d9ddc6ae6ef2b80c0a591e5ec440af307952 7148b960dd21c54475b1c78db6e3b3dcf629931e