tags 266365 + patch user [EMAIL PROTECTED] usertag 266365 + ubuntu-patch While fixing a segfault on amd64 in Ubuntu (bug https://bugs.launchpad.net/ubuntu/+source/gcal/+bug/102373), we also applied a patch to use the setting of /etc/alternatives/pager to select the pager and to fix some lintian warnings.
Attached is the patch modified for Debian unstable. Regards, Albert
diff -u gcal-3.01.1/debian/changelog gcal-3.01.1/debian/changelog --- gcal-3.01.1/debian/changelog +++ gcal-3.01.1/debian/changelog @@ -1,3 +1,20 @@ +gcal (3.01.1-6) unstable; urgency=low + + * Change quoting of CFLAGS, to prevent FTBFS with latest dpkg version + * Correct lintian warnings: + - Escape minus signs in the gcal manpage + - Bump debhelper compat from 3 (deprecated) to 4 + - Build depend on debhelper >= 4.0.0 + - Use debian/compat instead of DH_COMPAT + - Do not ignore make errors in clean rule + - Bump standards-version from 3.5.5 to 3.7.3 + - Update FSF address in debian/copyright + - Correct spelling error in Debian GNU/Linux in debian/copyright + * Use pager as default pager command, as required by Debian policy 11.4, + by setting PAGER1=pager for the configure command (Closes: #266365) + + -- Albert Damen <[EMAIL PROTECTED]> Mon, 25 Feb 2008 21:30:35 +0100 + gcal (3.01.1-5.1) unstable; urgency=low * NMU diff -u gcal-3.01.1/debian/rules gcal-3.01.1/debian/rules --- gcal-3.01.1/debian/rules +++ gcal-3.01.1/debian/rules @@ -8,10 +8,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This is the debhelper compatability version to use. -export DH_COMPAT=3 - -CFLAGS='-O2 -Wall $$(INC) -pg' +CFLAGS=-O2 -Wall $(INC) -pg ifeq "$(findstring debug,$(DEB_BUILD_OPTIONS))" "debug" CFLAGS += -g endif @@ -20,9 +17,9 @@ build-stamp: dh_testdir - ./configure --prefix=/usr --mandir=\$${prefix}/share/man \ + PAGER1=pager ./configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info --with-included-gettext - $(MAKE) CFLAGS=$(CFLAGS) + $(MAKE) CFLAGS="$(CFLAGS)" touch build-stamp @@ -31,7 +28,7 @@ dh_testroot rm -f build-stamp - -$(MAKE) -i distclean || $(MAKE) -f Makefile.in distclean + [ ! -f Makefile ] || $(MAKE) distclean dh_clean diff -u gcal-3.01.1/debian/control gcal-3.01.1/debian/control --- gcal-3.01.1/debian/control +++ gcal-3.01.1/debian/control @@ -2,8 +2,8 @@ Section: utils Priority: optional Maintainer: Edward Betts <[EMAIL PROTECTED]> -Standards-Version: 3.5.5 -Build-Depends: debhelper (>= 3.0.0), libncurses5-dev +Standards-Version: 3.7.3 +Build-Depends: debhelper (>= 4.0.0), libncurses5-dev Package: gcal Architecture: any diff -u gcal-3.01.1/debian/copyright gcal-3.01.1/debian/copyright --- gcal-3.01.1/debian/copyright +++ gcal-3.01.1/debian/copyright @@ -1,4 +1,4 @@ -This is Debian/GNU Linux's prepackaged version of the GNU cal utility. +This is Debian GNU/Linux's prepackaged version of the GNU cal utility. It was taken over by Edward Betts <[EMAIL PROTECTED]> on Sat, 13 Nov 1999 14:25:53 +0000 @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. only in patch2: unchanged: --- gcal-3.01.1.orig/doc/en/man/gcal.1 +++ gcal-3.01.1/doc/en/man/gcal.1 @@ -94,16 +94,16 @@ .B Gcal as follows: .EX -gcal -h -gcal -? -gcal --help +gcal \-h +gcal \-? +gcal \-\-help respectively, -gcal -hh -gcal -?? -gcal --long-help[=ARG]|[=?] -gcal --usage[=ARG]|[=?] +gcal \-hh +gcal \-?? +gcal \-\-long\-help[=ARG]|[=?] +gcal \-\-usage[=ARG]|[=?] .EE A Hypertext file .I gcal.info only in patch2: unchanged: --- gcal-3.01.1.orig/debian/compat +++ gcal-3.01.1/debian/compat @@ -0,0 +1 @@ +4