[bibtool] 06/06: Imported Debian patch 2.61+ds-1
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository bibtool.
commit 2d36a0faf49bf1e518bbe45bf7e886e1dc3d0baf
Author: Jerome Benoit <calculus@rezozer.net>
Date: Tue Jul 21 04:37:58 2015 +0200
Imported Debian patch 2.61+ds-1
---
debian/changelog | 9 ++++++---
debian/patches/debianization-build.patch | 6 +++---
debian/patches/debianization-clean.patch | 2 +-
debian/patches/debianization.patch | 2 +-
debian/patches/series | 1 -
debian/patches/typo-ustream-Changes_tex.patch | 12 ------------
6 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e19e5e7..da53f8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-bibtool (2.61+ds-1) UNRELEASED; urgency=medium
+bibtool (2.61+ds-1) unstable; urgency=medium
* New upstream version.
* Debianization:
@@ -7,9 +7,12 @@ bibtool (2.61+ds-1) UNRELEASED; urgency=medium
script debian/repack;
- refresh;
- debian/repack, discard (see above);
- - debian/watch, revisit (see above).
+ - debian/watch:
+ - revisit (see above);
+ - harden;
+ - debian/patches/typo-ustream-Changes_tex.patch, integrated.
- -- Jerome Benoit <calculus@rezozer.net> Tue, 21 Jul 2015 00:18:17 +0000
+ -- Jerome Benoit <calculus@rezozer.net> Tue, 21 Jul 2015 02:37:28 +0000
bibtool (2.60+ds-1) unstable; urgency=medium
diff --git a/debian/patches/debianization-build.patch b/debian/patches/debianization-build.patch
index 377e434..1521ea7 100644
--- a/debian/patches/debianization-build.patch
+++ b/debian/patches/debianization-build.patch
@@ -26,7 +26,7 @@ debianization: build part
# Defines to support (non-ANSI) C compilers.
# For Solaris 2 you may have to define HAVE_STRING_H
# For some versions of Cygwin you may have to define
-@@ -434,6 +452,8 @@
+@@ -433,6 +451,8 @@
# The main target
# -----------------------------------------------------------------------------
@@ -35,7 +35,7 @@ debianization: build part
default all: bibtool$(EXT)
bibtool$(EXT): $(OFILES) $(REGEX) $(KPATHSEA_STATIC)
-@@ -463,6 +483,22 @@
+@@ -462,6 +482,22 @@
.c$(OBJ):
$(CC) $(C_FLAGS) $(DONT_LINK) -c $< -o $@
@@ -58,7 +58,7 @@ debianization: build part
# __________________________________________________________________
# Include the makefile into the dependencies to force updates
# when the makefile is modified.
-@@ -502,6 +538,8 @@
+@@ -501,6 +537,8 @@
info:
diff --git a/debian/patches/debianization-clean.patch b/debian/patches/debianization-clean.patch
index 9392bae..ce49b63 100644
--- a/debian/patches/debianization-clean.patch
+++ b/debian/patches/debianization-clean.patch
@@ -1,7 +1,7 @@
debianization: clean part
--- a/AutoConf/makefile.in
+++ b/AutoConf/makefile.in
-@@ -526,11 +526,15 @@
+@@ -525,11 +525,15 @@
-cd test && $(MAKE) $(MFLAGS) clean
-cd BibTcl && $(MAKE) $(MFLAGS) clean
-$(RM) $(CLEAN_TARGETS)
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index caab048..cc65da5 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -39,7 +39,7 @@ debianization
# The ranlib program or : for nothing.
--- a/doc/make_version.pl
+++ b/doc/make_version.pl
-@@ -82,7 +82,7 @@
+@@ -74,7 +74,7 @@
%% Net: gene\@gerd-neugebauer.de
%%
%%********************************************************
diff --git a/debian/patches/series b/debian/patches/series
index 046739c..1c533e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-typo-ustream-Changes_tex.patch
cleanup-upstream.patch
rationalization-upstream-doc.patch
secure-upstream-doc.patch
diff --git a/debian/patches/typo-ustream-Changes_tex.patch b/debian/patches/typo-ustream-Changes_tex.patch
deleted file mode 100644
index b7159cd..0000000
--- a/debian/patches/typo-ustream-Changes_tex.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-minor typo correction in Changes.tex file.
---- a/Changes.tex
-+++ b/Changes.tex
-@@ -33,7 +33,7 @@
- \begin{Release}{2.60}{June 9, 2015}
- \begin{Fix}{gene}
- The field name and other symbols may start with any allowed character.
-- Non-alpha characters at the beginning are treated as warining only.
-+ Non-alpha characters at the beginning are treated as warning only.
- \end{Fix}
- \end{Release}
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/bibtool.git
Reply to: