* Andreas Barth ([email protected]) [140824 16:07]:
> The libos*-packages are as they should. However, the programm misses
> the jade.mo-files, so something still needs to be done.
This is fixed by setting the domain in Makevars.
I intend to upload the NMU as below later today (generated files
removed from the diff). (I'll probably also add some more rm to
debian/rules clean target to remove generated files which are not
there currently.)
Andi
diff -Nru openjade-1.4devel1/configure.in openjade-1.4devel1/configure.in
--- openjade-1.4devel1/configure.in 2014-08-24 14:17:28.000000000 +0000
+++ openjade-1.4devel1/configure.in 2014-08-24 14:17:28.000000000 +0000
@@ -11,11 +11,13 @@
dnl
dnl Initialization
-AC_INIT(dsssl)
-AM_INIT_AUTOMAKE(OpenJade, 1.4devel, no-define)
-AM_CONFIG_HEADER(config.h)
+AC_INIT([OpenJade], [1.4devel], [], [OpenJade])
+AC_CONFIG_SRCDIR(dsssl)
+AM_INIT_AUTOMAKE([foreign])
+AM_CONFIG_HEADER([config.h])
AM_SANITY_CHECK
AM_MAINTAINER_MODE
+AC_USE_SYSTEM_EXTENSIONS
dnl Use different names than usually to avoid conflicts.
AC_DEFINE_UNQUOTED(OPENJADE_PACKAGE, "$PACKAGE", [Package name])
@@ -36,8 +38,8 @@
dnl Checks for libraries.
AC_CHECK_LIB(pthread,pthread_create,,AC_CHECK_LIB(threads,cthread_fork))
AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION
-AC_CHECK_HEADERS(locale.h)
+AM_GNU_GETTEXT_VERSION([0.19.2])
+AC_CHECK_HEADERS([locale.h])
AC_DEFINE_DIR(OPENJADE_LOCALE_DIR, datadir/locale, [location of message
catalogs])
OPENJADE_MESSAGE_DOMAIN=jade
AC_DEFINE_UNQUOTED(OPENJADE_MESSAGE_DOMAIN, "$OPENJADE_MESSAGE_DOMAIN",
[message domain])
@@ -46,13 +48,13 @@
dnl Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS(limits.h)
-AC_LANG_CPLUSPLUS
+AC_CHECK_HEADERS([limits.h])
+AC_LANG([C++])
AC_CHECK_HEADERS(new cassert)
dnl Checks for typedefs, structures and compiler characteristics.
AC_TYPE_SIZE_T
-AC_STRUCT_ST_BLKSIZE
+AC_CHECK_MEMBERS([struct stat.st_blksize])
AC_CACHE_CHECK(for sig_atomic_t in signal.h,
ac_cv_have_sig_atomic_t,
AC_TRY_LINK([#include <signal.h>],sig_atomic_t x;,
diff -Nru openjade-1.4devel1/debian/changelog
openjade-1.4devel1/debian/changelog
--- openjade-1.4devel1/debian/changelog 2014-08-24 14:17:28.000000000 +0000
+++ openjade-1.4devel1/debian/changelog 2014-08-24 14:17:28.000000000 +0000
@@ -1,3 +1,19 @@
+openjade (1.4devel1-21.1) unstable; urgency=medium
+
+ [ Wookey ]
+ * Add acinclude.m4 macro to find correct intlh header whether or
+ not gettext is present (Closes: #748626, ##759100)
+ * Update rules file to use dh-autoreconf rather than manual commands
+ and update configure.in enough for autoreconf to work
+
+ [ Andreas Barth ]
+ * Non-maintainer upload.
+ * Update configure.in to set PACKAGE_TARNAME to mixed case.
+ * Create po/Makevars with copyright hint to individual pot files
+ and DOMAIN=jade
+
+ -- Andreas Barth <[email protected]> Sun, 24 Aug 2014 12:47:55 +0000
+
openjade (1.4devel1-21) unstable; urgency=low
* Added dependency on libperl4-corelibs-perl for getopts.pl. (Closes:
diff -Nru openjade-1.4devel1/debian/control openjade-1.4devel1/debian/control
--- openjade-1.4devel1/debian/control 2014-08-24 14:17:28.000000000 +0000
+++ openjade-1.4devel1/debian/control 2014-08-24 14:17:28.000000000 +0000
@@ -4,7 +4,7 @@
Maintainer: Neil Roeth <[email protected]>
Homepage: http://openjade.sourceforge.net/
Standards-Version: 3.9.2.0
-Build-Depends: libosp-dev (>= 1.5.1.0-2.1), debhelper (>= 4.1.75),
autotools-dev, gettext, dh-buildinfo, libperl4-corelibs-perl
+Build-Depends: libosp-dev (>= 1.5.1.0-2.1), debhelper (>= 4.1.75),
dh-autoreconf, gettext, dh-buildinfo, libperl4-corelibs-perl
Package: openjade
Architecture: any
diff -Nru openjade-1.4devel1/debian/rules openjade-1.4devel1/debian/rules
--- openjade-1.4devel1/debian/rules 2014-08-24 14:17:28.000000000 +0000
+++ openjade-1.4devel1/debian/rules 2014-08-24 14:17:28.000000000 +0000
@@ -77,13 +77,6 @@
mv OpenJade-1.4devel/ChangeLog .
rm -r OpenJade-1.4devel
-autoinit:
- aclocal
- autoheader
- libtoolize --force --copy
- automake --add-missing --force-missing --copy
- autoconf
-
clean:
dh_testdir
rm -f debian/buildinfo
@@ -96,14 +89,11 @@
style/DssslAppMessages.h jade/JadeMessages.h \
jade/RtfMessages.h jade/HtmlMessages.h jade/TeXMessages.h \
jade/MifMessages.h
- # See /usr/share/doc/autotools-dev/README.Debian.gz
- -test -r /usr/share/misc/config.sub && \
- cp -f /usr/share/misc/config.sub config.sub
- -test -r /usr/share/misc/config.guess && \
- cp -f /usr/share/misc/config.guess config.guess
+ dh_autoreconf_clean
configure: configure-stamp
configure-stamp:
+ dh_autoreconf
dh_buildinfo generate cat
./configure --prefix=/usr --enable-http --enable-shared --enable-static
touch $@
diff -Nru openjade-1.4devel1/po/Makevars openjade-1.4devel1/po/Makevars
--- openjade-1.4devel1/po/Makevars 1970-01-01 00:00:00.000000000 +0000
+++ openjade-1.4devel1/po/Makevars 2014-08-24 14:17:28.000000000 +0000
@@ -0,0 +1,72 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = jade
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
+# package. (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.) Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright. The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = see po-files
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty. If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU =
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+# in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+# understood.
+# - Strings which make invalid assumptions about notation of date, time or
+# money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used. It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context. Possible values are "yes" and "no". Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+# --previous to keep previous msgids of translated messages,
+# --quiet to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed. Possible values are "yes" and "no". Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist". Possible values are "yes" and
+# "no". Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
