Bug#470969: alps-light1: diff for NMU version 1.2.2-2.2
tags 442488 + patch thanks Here's an updated nmudiff for #470969 that closes the double-build bug too. (The only change is to debian/changelog.) diff -u alps-light1-1.2.2/debian/rules alps-light1-1.2.2/debian/rules --- alps-light1-1.2.2/debian/rules +++ alps-light1-1.2.2/debian/rules @@ -12,6 +12,10 @@ DEB_INSTALL_DOCS_ALL := $(shell cat debian/docs) DEB_DH_MAKESHLIBS_ARGS_ALL := -V +clean:: rm-config-cache +rm-config-cache: + rm -f config/config.cache + $(patsubst %,binary-predeb/%,$(DEB_PACKAGES)) :: binary-predeb/%: binary-fixup/% cat debian/common-description >> debian/$(cdbs_curpkg).substvars diff -u alps-light1-1.2.2/debian/changelog alps-light1-1.2.2/debian/changelog --- alps-light1-1.2.2/debian/changelog +++ alps-light1-1.2.2/debian/changelog @@ -1,3 +1,17 @@ +alps-light1 (1.2.2-2.2) unstable; urgency=low + + * Non-maintainer upload. + * #include to fix FTBFS with g++-4.3 as g++ (Closes: #470969). +(debian/patches/cstring.patch added) + * Fix double build by removing nonexistent SUBDIRS from Makefile.am +and test/Makefile.am, thus fixing make distclean (Closes: #442488). +(debian/patches/fix-distclean.patch added) + * Regenerate all Makefile.in. (debian/patches/regen-autotools.patch +refreshed) + * Delete config/config.cache during clean, for a smaller Debian diff + + -- Simon McVittie <[EMAIL PROTECTED]> Sun, 06 Apr 2008 14:41:47 + + alps-light1 (1.2.2-2.1) unstable; urgency=medium * Non-maintainer upload. diff -u alps-light1-1.2.2/debian/patches/series alps-light1-1.2.2/debian/patches/series --- alps-light1-1.2.2/debian/patches/series +++ alps-light1-1.2.2/debian/patches/series @@ -3,2 +3,4 @@ fix-LIBADD.patch +cstring.patch +fix-distclean.patch regen-autotools.patch diff -u alps-light1-1.2.2/debian/patches/regen-autotools.patch alps-light1-1.2.2/debian/patches/regen-autotools.patch --- alps-light1-1.2.2/debian/patches/regen-autotools.patch +++ alps-light1-1.2.2/debian/patches/regen-autotools.patch @@ -1,15 +1,20 @@ Index: alps-light1-1.2.2/Makefile.in === alps-light1-1.2.2.orig/Makefile.in 2005-07-01 23:12:40.0 +0200 -+++ alps-light1-1.2.2/Makefile.in 2005-07-01 23:16:35.0 +0200 -@@ -39,16 +39,42 @@ - @[EMAIL PROTECTED] = tool example - @[EMAIL PROTECTED] = CITATIONS.txt LICENSE.txt README config/preamble.in - @[EMAIL PROTECTED] = LICENSE-light.txt README-light config/preamble-light.in +--- alps-light1-1.2.2.orig/Makefile.in 2004-11-10 02:01:19.0 + alps-light1-1.2.2/Makefile.in 2008-04-06 14:27:36.0 + +@@ -36,19 +36,44 @@ + PRE_UNINSTALL = : + POST_UNINSTALL = : + host_triplet = @host@ [EMAIL PROTECTED]@am__append_1 = tool example [EMAIL PROTECTED]@am__append_2 = CITATIONS.txt LICENSE.txt README config/preamble.in [EMAIL PROTECTED]@am__append_3 = LICENSE-light.txt README-light config/preamble-light.in -DIST_COMMON = README $(am__configure_deps) \ - $(am__dist_noinst_DATA_DIST) $(dist_noinst_SCRIPTS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/config.site.in \ [EMAIL PROTECTED]@am__append_1 = CITATIONS.txt LICENSE.txt README config/preamble.in [EMAIL PROTECTED]@am__append_2 = LICENSE-light.txt README-light config/preamble-light.in +DIST_COMMON = $(am__configure_deps) $(am__dist_noinst_DATA_DIST) \ + $(dist_noinst_SCRIPTS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/config/config.site.in \ @@ -53,7 +58,7 @@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -@@ -67,7 +93,18 @@ +@@ -67,7 +92,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_HEADER = $(top_builddir)/src/alps/config.h \ $(top_builddir)/src/boost/po_utf8_codecvt_facet.cpp @@ -73,7 +78,82 @@ SCRIPTS = $(dist_noinst_SCRIPTS) SOURCES = DIST_SOURCES = -@@ -264,15 +301,15 @@ +@@ -86,7 +122,7 @@ + DATA = $(dist_noinst_DATA) $(nodist_data_DATA) $(nodist_pkgdata_DATA) + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = lib tool example test src doc . ++DIST_SUBDIRS = $(SUBDIRS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + top_distdir = $(distdir) + am__remove_distdir = \ +@@ -155,6 +191,7 @@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ ++GREP = @GREP@ + HAVE_MPI_FALSE = @HAVE_MPI_FALSE@ + HAVE_MPI_TRUE = @HAVE_MPI_TRUE@ + HAVE_PVM_FALSE = @HAVE_PVM_FALSE@ +@@ -206,12 +243,9 @@ + XML_CPPFLAGS = @XML_CPPFLAGS@ + XML_LDFLAGS = @XML_LDFLAGS@ + XML_LIBS = @XML_LIBS@ +-ac_ct_AR = @ac_ct_AR@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +@@ -226,33 +260,42 @@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ ++datarootdir = @datarootdir@ + docdir = @docdir@ ++dvi
Bug#470969: alps-light1: diff for NMU version 1.2.2-2.2
tags 470969 + patch thanks Hi, Attached is a proposed diff for an alps-light1 1.2.2-2.2 NMU. Regards, Simon diff -u alps-light1-1.2.2/debian/rules alps-light1-1.2.2/debian/rules --- alps-light1-1.2.2/debian/rules +++ alps-light1-1.2.2/debian/rules @@ -12,6 +12,10 @@ DEB_INSTALL_DOCS_ALL := $(shell cat debian/docs) DEB_DH_MAKESHLIBS_ARGS_ALL := -V +clean:: rm-config-cache +rm-config-cache: + rm -f config/config.cache + $(patsubst %,binary-predeb/%,$(DEB_PACKAGES)) :: binary-predeb/%: binary-fixup/% cat debian/common-description >> debian/$(cdbs_curpkg).substvars diff -u alps-light1-1.2.2/debian/changelog alps-light1-1.2.2/debian/changelog --- alps-light1-1.2.2/debian/changelog +++ alps-light1-1.2.2/debian/changelog @@ -1,3 +1,17 @@ +alps-light1 (1.2.2-2.2) unstable; urgency=low + + * Non-maintainer upload. + * #include to fix FTBFS with g++-4.3 as g++ (Closes: #470969). +(debian/patches/cstring.patch added) + * Fix double build by removing nonexistent SUBDIRS from Makefile.am +and test/Makefile.am, thus fixing make distclean. +(debian/patches/fix-distclean.patch added) + * Regenerate all Makefile.in. (debian/patches/regen-autotools.patch +refreshed) + * Delete config/config.cache during clean, for a smaller Debian diff + + -- Simon McVittie <[EMAIL PROTECTED]> Sun, 06 Apr 2008 14:41:47 + + alps-light1 (1.2.2-2.1) unstable; urgency=medium * Non-maintainer upload. diff -u alps-light1-1.2.2/debian/patches/series alps-light1-1.2.2/debian/patches/series --- alps-light1-1.2.2/debian/patches/series +++ alps-light1-1.2.2/debian/patches/series @@ -3,2 +3,4 @@ fix-LIBADD.patch +cstring.patch +fix-distclean.patch regen-autotools.patch diff -u alps-light1-1.2.2/debian/patches/regen-autotools.patch alps-light1-1.2.2/debian/patches/regen-autotools.patch --- alps-light1-1.2.2/debian/patches/regen-autotools.patch +++ alps-light1-1.2.2/debian/patches/regen-autotools.patch @@ -1,15 +1,20 @@ Index: alps-light1-1.2.2/Makefile.in === alps-light1-1.2.2.orig/Makefile.in 2005-07-01 23:12:40.0 +0200 -+++ alps-light1-1.2.2/Makefile.in 2005-07-01 23:16:35.0 +0200 -@@ -39,16 +39,42 @@ - @[EMAIL PROTECTED] = tool example - @[EMAIL PROTECTED] = CITATIONS.txt LICENSE.txt README config/preamble.in - @[EMAIL PROTECTED] = LICENSE-light.txt README-light config/preamble-light.in +--- alps-light1-1.2.2.orig/Makefile.in 2004-11-10 02:01:19.0 + alps-light1-1.2.2/Makefile.in 2008-04-06 14:27:36.0 + +@@ -36,19 +36,44 @@ + PRE_UNINSTALL = : + POST_UNINSTALL = : + host_triplet = @host@ [EMAIL PROTECTED]@am__append_1 = tool example [EMAIL PROTECTED]@am__append_2 = CITATIONS.txt LICENSE.txt README config/preamble.in [EMAIL PROTECTED]@am__append_3 = LICENSE-light.txt README-light config/preamble-light.in -DIST_COMMON = README $(am__configure_deps) \ - $(am__dist_noinst_DATA_DIST) $(dist_noinst_SCRIPTS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/config.site.in \ [EMAIL PROTECTED]@am__append_1 = CITATIONS.txt LICENSE.txt README config/preamble.in [EMAIL PROTECTED]@am__append_2 = LICENSE-light.txt README-light config/preamble-light.in +DIST_COMMON = $(am__configure_deps) $(am__dist_noinst_DATA_DIST) \ + $(dist_noinst_SCRIPTS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/config/config.site.in \ @@ -53,7 +58,7 @@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -@@ -67,7 +93,18 @@ +@@ -67,7 +92,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_HEADER = $(top_builddir)/src/alps/config.h \ $(top_builddir)/src/boost/po_utf8_codecvt_facet.cpp @@ -73,7 +78,82 @@ SCRIPTS = $(dist_noinst_SCRIPTS) SOURCES = DIST_SOURCES = -@@ -264,15 +301,15 @@ +@@ -86,7 +122,7 @@ + DATA = $(dist_noinst_DATA) $(nodist_data_DATA) $(nodist_pkgdata_DATA) + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = lib tool example test src doc . ++DIST_SUBDIRS = $(SUBDIRS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + top_distdir = $(distdir) + am__remove_distdir = \ +@@ -155,6 +191,7 @@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ ++GREP = @GREP@ + HAVE_MPI_FALSE = @HAVE_MPI_FALSE@ + HAVE_MPI_TRUE = @HAVE_MPI_TRUE@ + HAVE_PVM_FALSE = @HAVE_PVM_FALSE@ +@@ -206,12 +243,9 @@ + XML_CPPFLAGS = @XML_CPPFLAGS@ + XML_LDFLAGS = @XML_LDFLAGS@ + XML_LIBS = @XML_LIBS@ +-ac_ct_AR = @ac_ct_AR@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +@@ -226,33 +260,42 @@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ ++datarootdir = @datarootdir@ + docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + ho
