diff -u parrot-1.0.0/debian/control.in parrot-1.0.0/debian/control.in --- parrot-1.0.0/debian/control.in +++ parrot-1.0.0/debian/control.in @@ -1,9 +1,9 @@ Source: parrot Section: interpreters Priority: optional -Maintainer: Debian Parrot Maintainers -Uploaders: Allison Randal , Nuno Carvalho , Patrick Michaud -Build-Depends: debhelper (>= 5.0.0), perl, perl-doc, libgdbm-dev, libreadline-dev +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Parrot Maintainers +Build-Depends: debhelper (>= 5.0.0), perl, perl-doc, libgdbm-dev, libreadline-dev, quilt Standards-Version: 3.8.1 Package: parrot diff -u parrot-1.0.0/debian/control parrot-1.0.0/debian/control --- parrot-1.0.0/debian/control +++ parrot-1.0.0/debian/control @@ -1,9 +1,9 @@ Source: parrot Section: interpreters Priority: optional -Maintainer: Debian Parrot Maintainers -Uploaders: Allison Randal , Nuno Carvalho , Patrick Michaud -Build-Depends: debhelper (>= 5.0.0), perl, perl-doc, libgdbm-dev, libreadline-dev +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Parrot Maintainers +Build-Depends: debhelper (>= 5.0.0), perl, perl-doc, libgdbm-dev, libreadline-dev, quilt Standards-Version: 3.8.1 Package: parrot diff -u parrot-1.0.0/debian/changelog parrot-1.0.0/debian/changelog --- parrot-1.0.0/debian/changelog +++ parrot-1.0.0/debian/changelog @@ -1,3 +1,17 @@ +parrot (1.0.0-1ubuntu1) karmic; urgency=low + + [ Allison Randal ] + * Merge from Debian unstable. + * Ubuntu remaining changes: + - Add 01-lpia-FTBFS.path : from upstream, fix FTBFS for lpia. + + [ Julien Lavergne ] + - Add quilt support for the patch : + + debian/control.in : Add quilt as build-depends. + + debian/rules : Add quilt support. + + -- Julien Lavergne Fri, 29 May 2009 01:34:42 +0200 + parrot (1.0.0-1) unstable; urgency=low * New upstream release * debian/control.in: @@ -95,6 +109,28 @@ -- Allison Randal Sun, 30 Dec 2007 17:21:45 +0000 +parrot (0.4.13-1ubuntu3) hardy; urgency=low + + * Replace libicu36-dev with libicu-dev. + + -- Steve Kowalik Sun, 16 Dec 2007 11:30:08 +1100 + +parrot (0.4.13-1ubuntu2) gutsy; urgency=low + + * Move debian/control generation to configure-stamp, since the configure + target isn't called by anything, and call it as a stamp target, so it + gets remade every time. + + -- Steve Kowalik Mon, 16 Jul 2007 00:59:22 +1000 + +parrot (0.4.13-1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - Depend on libicu36 and libicu36-dev + - Update maintainer field. + + -- Luke Yelavich Mon, 9 Jul 2007 16:11:36 +1000 + parrot (0.4.13-1) unstable; urgency=low * New upstream release. @@ -107,6 +143,12 @@ -- Florian Ragwitz Mon, 18 Jun 2007 20:08:49 +0200 +parrot (0.4.6-1ubuntu1) feisty; urgency=low + + * Depend on libicu36 and libicu36-dev + + -- Vassilis Pandis Wed, 31 Jan 2007 15:35:09 +0000 + parrot (0.4.6-1) unstable; urgency=low * New upstream release. diff -u parrot-1.0.0/debian/rules parrot-1.0.0/debian/rules --- parrot-1.0.0/debian/rules +++ parrot-1.0.0/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +include /usr/share/quilt/quilt.make + CFLAGS = -Wall -g VERSION = $(shell cat VERSION) SOVERSION = $(VERSION) @@ -29,7 +31,7 @@ touch $@ configure: configure-stamp -configure-stamp: debian-control-stamp +configure-stamp: debian-control-stamp $(QUILT_STAMPFN) dh_testdir perl Configure.pl --prefix=/usr touch configure-stamp @@ -48,7 +50,7 @@ pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" src/pbc_merge.c debian/pbc_merge.1 touch build-stamp -clean: debian-control-stamp +clean: debian-control-stamp unpatch dh_testdir dh_testroot rm -f build-stamp configure-stamp debian-control-stamp debian/parrot.1 debian/parrot_config.1 debian/pbc_dump.1 debian/pbc_disassemble.1 debian/parrot-debugger.1 debian/pbc_info.1 debian/pbc_merge.1 debian/libparrot$(SOVERSION).install src/main.o installable_pbc_to_exe ext/Parrot-Embed/Makefile.PL test.c test.ldo only in patch2: unchanged: --- parrot-1.0.0.orig/debian/patches/series +++ parrot-1.0.0/debian/patches/series @@ -0,0 +1 @@ +01-lpia-FTBFS.path only in patch2: unchanged: --- parrot-1.0.0.orig/debian/patches/01-lpia-FTBFS.path +++ parrot-1.0.0/debian/patches/01-lpia-FTBFS.path @@ -0,0 +1,12 @@ +--- parrot-1.0.0.orig/config/auto/gcc.pm ++++ parrot-1.0.0/config/auto/gcc.pm +@@ -96,7 +96,8 @@ + HAS_aligned_funcptr => 1 + ); + $conf->data->set( HAS_aligned_funcptr => 0 ) +- if $conf->data->get_p5('OSNAME') eq 'hpux'; ++ if ( $conf->data->get_p5('OSNAME') eq 'hpux' ++ || $conf->data->get('archname') =~ /gnulp/); # lpia arch + return 1; + } +