Control: tags 631057 + pending Control: tags 817375 + patch Control: tags 817375 + pending
Dear maintainer,
I've prepared an NMU for bibcursed (versioned as 2.0.0-6.1) and
uploaded it to DELAYED/15. Please feel free to tell me if I
should delay it longer.
Regards.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for bibcursed-2.0.0 bibcursed-2.0.0
bibcursed.c | 6 +-
debian/changelog | 15 +++++
debian/clean | 1
debian/compat | 2
debian/control | 6 +-
debian/install | 1
debian/manpages | 1
debian/patches/fix-address-field.patch | 15 +++++
debian/patches/fix-bolding-behaviour.patch | 15 +++++
debian/patches/fix-manpage.patch | 15 +++++
debian/patches/ignore-case.patch | 15 +++++
debian/patches/series | 4 +
debian/rules | 81 ++---------------------------
debian/source/format | 1
14 files changed, 98 insertions(+), 80 deletions(-)
diff -Nru bibcursed-2.0.0/bibcursed.c bibcursed-2.0.0/bibcursed.c
--- bibcursed-2.0.0/bibcursed.c 2017-03-13 14:02:14.000000000 +0100
+++ bibcursed-2.0.0/bibcursed.c 2002-06-08 13:59:10.000000000 +0200
@@ -279,7 +279,7 @@
}
else
printw("%s","1. Address ");
- if (set_address == 1) addch('*');
+ if (set_author == 1) addch('*');
print_pos++;
}
if (use_annote != 0)
@@ -345,7 +345,7 @@
if (use_edition != 0)
{
move(print_pos,5);
- if (use_edition == 1)
+ if (use_edition != 1)
{
attron(A_BOLD);
printw("%s","7. Edition ");
@@ -526,7 +526,7 @@
}
/* Check to see if we have all the info we need */
- if (lch == 'z')
+ if (ch == 'z')
{
not_done =0;
if (use_address==1 && set_address == 0)
diff -Nru bibcursed-2.0.0/debian/changelog bibcursed-2.0.0/debian/changelog
--- bibcursed-2.0.0/debian/changelog 2017-03-13 14:02:14.000000000 +0100
+++ bibcursed-2.0.0/debian/changelog 2017-03-13 13:55:29.000000000 +0100
@@ -1,3 +1,18 @@
+bibcursed (2.0.0-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use source format 3.0 (quilt).
+ * Turn directly applied patches into single quilt patches in debian/patches.
+ * Fix syntax error in the manpage.
+ * Fix build with -Wl,--as-needed. Closes: #631057
+ * Rewrite debian/rules using the dh sequencer.
+ * Bump debhelper compat level to 10. Closes: #817375
+ * Bump Standards-Version to 3.9.8.
+ * Fix cross building.
+ * Do not start the synopsis with an article.
+
+ -- Mattia Rizzolo <mat...@debian.org> Mon, 13 Mar 2017 13:55:29 +0100
+
bibcursed (2.0.0-6) unstable; urgency=low
* debian/control:
diff -Nru bibcursed-2.0.0/debian/clean bibcursed-2.0.0/debian/clean
--- bibcursed-2.0.0/debian/clean 1970-01-01 01:00:00.000000000 +0100
+++ bibcursed-2.0.0/debian/clean 2017-03-13 11:37:21.000000000 +0100
@@ -0,0 +1 @@
+bibcursed
diff -Nru bibcursed-2.0.0/debian/compat bibcursed-2.0.0/debian/compat
--- bibcursed-2.0.0/debian/compat 2017-03-13 14:02:14.000000000 +0100
+++ bibcursed-2.0.0/debian/compat 2017-03-13 11:39:50.000000000 +0100
@@ -1 +1 @@
-4
+10
diff -Nru bibcursed-2.0.0/debian/control bibcursed-2.0.0/debian/control
--- bibcursed-2.0.0/debian/control 2017-03-13 14:02:14.000000000 +0100
+++ bibcursed-2.0.0/debian/control 2017-03-13 13:53:14.000000000 +0100
@@ -2,13 +2,13 @@
Section: tex
Priority: optional
Maintainer: John Wright <j...@debian.org>
-Build-Depends: debhelper (>= 4), libncurses5-dev
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 10), libncurses5-dev
+Standards-Version: 3.9.8
Package: bibcursed
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: An interactive program to edit BibTeX bibliographies
+Description: Interactive program to edit BibTeX bibliographies
Bibcursed is a simple program to make life a little easier when using
BibTeX bibliographies. It currently provides these main functions:
.
diff -Nru bibcursed-2.0.0/debian/install bibcursed-2.0.0/debian/install
--- bibcursed-2.0.0/debian/install 1970-01-01 01:00:00.000000000 +0100
+++ bibcursed-2.0.0/debian/install 2017-03-13 11:40:25.000000000 +0100
@@ -0,0 +1 @@
+bibcursed usr/bin
diff -Nru bibcursed-2.0.0/debian/manpages bibcursed-2.0.0/debian/manpages
--- bibcursed-2.0.0/debian/manpages 1970-01-01 01:00:00.000000000 +0100
+++ bibcursed-2.0.0/debian/manpages 2017-03-13 11:47:37.000000000 +0100
@@ -0,0 +1 @@
+bibcursed.1
diff -Nru bibcursed-2.0.0/debian/patches/fix-address-field.patch bibcursed-2.0.0/debian/patches/fix-address-field.patch
--- bibcursed-2.0.0/debian/patches/fix-address-field.patch 1970-01-01 01:00:00.000000000 +0100
+++ bibcursed-2.0.0/debian/patches/fix-address-field.patch 2017-03-13 11:14:19.000000000 +0100
@@ -0,0 +1,15 @@
+Description: correct behavior for marking the address field
+Author: Christopher Nelson
+Bug-Debian: https://bugs.debian.org/366872
+
+--- bibcursed-2.0.0.orig/bibcursed.c
++++ bibcursed-2.0.0/bibcursed.c
+@@ -279,7 +279,7 @@ add_entry()
+ }
+ else
+ printw("%s","1. Address ");
+- if (set_author == 1) addch('*');
++ if (set_address == 1) addch('*');
+ print_pos++;
+ }
+ if (use_annote != 0)
diff -Nru bibcursed-2.0.0/debian/patches/fix-bolding-behaviour.patch bibcursed-2.0.0/debian/patches/fix-bolding-behaviour.patch
--- bibcursed-2.0.0/debian/patches/fix-bolding-behaviour.patch 1970-01-01 01:00:00.000000000 +0100
+++ bibcursed-2.0.0/debian/patches/fix-bolding-behaviour.patch 2017-03-13 11:14:57.000000000 +0100
@@ -0,0 +1,15 @@
+Description: correct bolding behavior for the edition field
+Author: Christopher Nelson
+Bug-Debian: https://bugs.debian.org/366877
+
+--- bibcursed-2.0.0.orig/bibcursed.c
++++ bibcursed-2.0.0/bibcursed.c
+@@ -345,7 +345,7 @@ add_entry()
+ if (use_edition != 0)
+ {
+ move(print_pos,5);
+- if (use_edition != 1)
++ if (use_edition == 1)
+ {
+ attron(A_BOLD);
+ printw("%s","7. Edition ");
diff -Nru bibcursed-2.0.0/debian/patches/fix-manpage.patch bibcursed-2.0.0/debian/patches/fix-manpage.patch
--- bibcursed-2.0.0/debian/patches/fix-manpage.patch 1970-01-01 01:00:00.000000000 +0100
+++ bibcursed-2.0.0/debian/patches/fix-manpage.patch 2017-03-13 11:48:17.000000000 +0100
@@ -0,0 +1,15 @@
+Description: Remove undefined macro from manpage
+Author: Mattia Rizzolo <mat...@debian.org>
+Last-Update: 2017-03-13
+Forwarded: no
+
+--- a/bibcursed.1
++++ b/bibcursed.1
+@@ -11,7 +11,6 @@
+ .\" domi...@rampant.cx
+ .\"
+ .TH BIBCURSED 1 "8th June, 2002"
+-.LO 1
+
+ .SH NAME
+ bibcursed \- manipulate BibTeX files
diff -Nru bibcursed-2.0.0/debian/patches/ignore-case.patch bibcursed-2.0.0/debian/patches/ignore-case.patch
--- bibcursed-2.0.0/debian/patches/ignore-case.patch 1970-01-01 01:00:00.000000000 +0100
+++ bibcursed-2.0.0/debian/patches/ignore-case.patch 2017-03-13 11:15:04.000000000 +0100
@@ -0,0 +1,15 @@
+Description: allow using either upper-or-lower-case 'z' to finish an entry
+Author: Christopher Nelson
+Bug-Debian: https://bugs.debian.org/366619
+
+--- bibcursed-2.0.0.orig/bibcursed.c
++++ bibcursed-2.0.0/bibcursed.c
+@@ -526,7 +526,7 @@ add_entry()
+ }
+
+ /* Check to see if we have all the info we need */
+- if (ch == 'z')
++ if (lch == 'z')
+ {
+ not_done =0;
+ if (use_address==1 && set_address == 0)
diff -Nru bibcursed-2.0.0/debian/patches/series bibcursed-2.0.0/debian/patches/series
--- bibcursed-2.0.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ bibcursed-2.0.0/debian/patches/series 2017-03-13 11:46:35.000000000 +0100
@@ -0,0 +1,4 @@
+fix-address-field.patch
+fix-bolding-behaviour.patch
+ignore-case.patch
+fix-manpage.patch
diff -Nru bibcursed-2.0.0/debian/rules bibcursed-2.0.0/debian/rules
--- bibcursed-2.0.0/debian/rules 2017-03-13 14:02:14.000000000 +0100
+++ bibcursed-2.0.0/debian/rules 2017-03-13 13:52:11.000000000 +0100
@@ -1,82 +1,17 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-ifndef CC
- CC = gcc
-endif
-ifeq ($(CC),)
- CC = gcc
-endif
+include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/architecture.mk
-CFLAGS += -Wall -Wshadow -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
+ifeq ($(origin CC),default)
+ CC := $(DEB_HOST_GNU_TYPE)-gcc
endif
-clean:
- dh_testdir
- dh_testroot
- -rm -f build-stamp
- -rm -f bibcursed
-
- # If we're not in a mercurial repository, make sure no hg metadata is
- # lying around
- if ! [ -d .hg ]; then \
- rm -f .hg*; \
- fi
-
- dh_clean
-
-
-build: build-stamp
-build-stamp:
- dh_testdir
+%:
+ dh $@
+override_dh_auto_build-arch:
# Add here commands to compile the package.
- $(CC) $(CFLAGS) -lncurses -o bibcursed bibcursed.c
-
- touch build-stamp
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- install -D -m 0755 $(CURDIR)/bibcursed \
- $(CURDIR)/debian/bibcursed/usr/bin/bibcursed
- install -D -m 0644 $(CURDIR)/bibcursed.1 \
- $(CURDIR)/debian/bibcursed/usr/share/man/man1/bibcursed.1
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installexamples
- dh_installmenu
- dh_installman
- dh_installchangelogs
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+ $(CC) $(CFLAGS) -Wshadow -o bibcursed bibcursed.c -lncurses $(LDFLAGS)
diff -Nru bibcursed-2.0.0/debian/source/format bibcursed-2.0.0/debian/source/format
--- bibcursed-2.0.0/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ bibcursed-2.0.0/debian/source/format 2017-03-13 11:07:24.000000000 +0100
@@ -0,0 +1 @@
+3.0 (quilt)
signature.asc
Description: PGP signature
