[svn:parrot] r40122 - in trunk/ports/ubuntu: . patches

allison at svn.parrot.org allison at svn.parrot.org
Thu Jul 16 19:32:02 UTC 2009 

Author: allison
Date: Thu Jul 16 19:32:01 2009
New Revision: 40122
URL: https://trac.parrot.org/parrot/changeset/40122

Log:
[ubuntu] Store packaging details as they went into Ubuntu Karmic (9.10).

Added:
   trunk/ports/ubuntu/patches/
   trunk/ports/ubuntu/patches/01-lpia-FTBFS.path
   trunk/ports/ubuntu/patches/series
   trunk/ports/ubuntu/rules
Deleted:
   trunk/ports/ubuntu/lpia_no_aligned_funcptr.patch
Modified:
   trunk/ports/ubuntu/changelog
   trunk/ports/ubuntu/control.in

Modified: trunk/ports/ubuntu/changelog
==============================================================================
--- trunk/ports/ubuntu/changelog	Thu Jul 16 19:14:27 2009	(r40121)
+++ trunk/ports/ubuntu/changelog	Thu Jul 16 19:32:01 2009	(r40122)
@@ -1,9 +1,16 @@
 parrot (1.0.0-1ubuntu1) karmic; urgency=low
-  * Resynchronize with Debian unstable.
-  * Add a patch to detect the lpia architecture, to correctly configure for
-    unaligned function pointers.
 
- -- Allison Randal <allison at parrot.org>  Thu, 28 May 2009 13:13:12 -0700
+  [ 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 <julien.lavergne at gmail.com>  Fri, 29 May 2009 01:34:42 +0200
 
 parrot (1.0.0-1) unstable; urgency=low
   * New upstream release
@@ -38,12 +45,6 @@
 
  -- Allison Randal <allison at parrot.org>  Wed, 25 Mar 2009 00:45:40 -0500
 
-parrot (0.9.0-1ubuntu1) intrepid; urgency=low
-
-  * New upstream release.
-
- -- Allison Randal <allison at parrot.org>  Tue, 03 Feb 2009 23:21:12 +0000
-
 parrot (0.9.0-1) unstable; urgency=low
 
   * New upstream release
@@ -64,12 +65,6 @@
 
  -- Allison Randal <allison at parrot.org>  Fri, 23 Jan 2009 15:16:25 -0800
 
-parrot (0.8.1-0ubuntu1) intrepid; urgency=low
-
-  * New upstream release
-
- -- Allison Randal <allison at parrot.org>  Fri, 12 Dec 2008 16:40:43 +0800
-
 parrot (0.7.0-1) unstable; urgency=low
 
   * New upstream release
@@ -114,6 +109,12 @@
 
  -- Allison Randal <allison at perl.org>  Sun, 30 Dec 2007 17:21:45 +0000
 
+parrot (0.4.13-1ubuntu4) karmic; urgency=low
+
+  * No-change rebuild for libicu38 -> libicu40 transition.
+
+ -- Steve Kowalik <stevenk at ubuntu.com>  Thu, 04 Jun 2009 08:01:54 +1000
+
 parrot (0.4.13-1ubuntu3) hardy; urgency=low
 
   * Replace libicu36-dev with libicu-dev.

Modified: trunk/ports/ubuntu/control.in
==============================================================================
--- trunk/ports/ubuntu/control.in	Thu Jul 16 19:14:27 2009	(r40121)
+++ trunk/ports/ubuntu/control.in	Thu Jul 16 19:32:01 2009	(r40122)
@@ -1,9 +1,10 @@
 Source: parrot
 Section: interpreters
 Priority: optional
-Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Parrot Maintainers <pkg-parrot-devel at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.0), perl, perl-doc, libgdbm-dev, libreadline-dev
+Uploaders: Allison Randal <allison at parrot.org>, Nuno Carvalho <mestre.smash at gmail.com>, Patrick Michaud <pmichaud at pobox.com>
+Build-Depends: debhelper (>= 5.0.0), perl, perl-doc, libgdbm-dev, libreadline-dev, quilt
 Standards-Version: 3.8.1
 
 Package: parrot

Deleted: trunk/ports/ubuntu/lpia_no_aligned_funcptr.patch
==============================================================================
--- trunk/ports/ubuntu/lpia_no_aligned_funcptr.patch	Thu Jul 16 19:32:01 2009	(r40121)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,12 +0,0 @@
-Index: /trunk/config/auto/gcc.pm
-===================================================================
---- /trunk/config/auto/gcc.pm (revision 37201)
-+++ /trunk/config/auto/gcc.pm (revision 39212)
-@@ -97,5 +97,6 @@
-     );
-     $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;
- }

Added: trunk/ports/ubuntu/patches/01-lpia-FTBFS.path
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/ports/ubuntu/patches/01-lpia-FTBFS.path	Thu Jul 16 19:32:01 2009	(r40122)
@@ -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;
+ }
+ 

Added: trunk/ports/ubuntu/patches/series
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/ports/ubuntu/patches/series	Thu Jul 16 19:32:01 2009	(r40122)
@@ -0,0 +1 @@
+01-lpia-FTBFS.path

Added: trunk/ports/ubuntu/rules
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/ports/ubuntu/rules	Thu Jul 16 19:32:01 2009	(r40122)
@@ -0,0 +1,107 @@
+#!/usr/bin/make -f
+
+include /usr/share/quilt/quilt.make
+
+CFLAGS = -Wall -g
+VERSION = $(shell cat VERSION)
+SOVERSION = $(VERSION)
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+CONTROL_FILES = \
+  debian/control.in \
+  debian/parrot.install.in \
+  debian/parrot-minimal.install.in \
+  debian/parrot-doc.install.in \
+  debian/parrot-devel.install.in \
+  debian/libparrot.install.in \
+  debian/libparrot-dev.install.in
+
+debian-control-stamp: $(CONTROL_FILES) VERSION
+	for infile in $(CONTROL_FILES); do \
+	    outfile=`echo $$infile | sed "s/\.in$$//"`; \
+	    sed -e "s/@VERSION@/$(VERSION)/g" \
+	        -e "s/@SOVERSION@/$(SOVERSION)/g" \
+	            <$$infile >$$outfile; \
+	done
+	touch $@
+
+configure: configure-stamp
+configure-stamp: debian-control-stamp $(QUILT_STAMPFN)
+	dh_testdir
+	perl Configure.pl --prefix=/usr
+	touch configure-stamp
+
+build: build-stamp
+
+build-stamp: configure-stamp 
+	dh_testdir
+	$(MAKE) installable
+	pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" docs/running.pod debian/parrot.1
+	pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" tools/util/parrot-config.pir debian/parrot_config.1
+	pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" src/pbc_dump.c debian/pbc_dump.1
+	pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" src/pbc_disassemble.c debian/pbc_disassemble.1
+	pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" src/parrot_debugger.c debian/parrot_debugger.1
+	pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" src/pbc_info.c debian/pbc_info.1
+	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 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
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_clean 
+
+debian/libparrot$(SOVERSION).install: debian/libparrot.install VERSION
+	cp $< $@
+
+install: build debian/libparrot$(SOVERSION).install
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	$(MAKE) install-dev DESTDIR=$(CURDIR)/debian/tmp
+	dh_installdirs
+	find $(CURDIR)/debian/tmp -type f
+	dh_install --sourcedir=$(CURDIR)/debian/tmp --list-missing
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir -i 
+	dh_testroot -i
+	dh_installchangelogs -i ChangeLog
+	dh_installdocs -i
+	dh_link -plibparrot-dev usr/lib/libparrot.so.$(SOVERSION) usr/lib/libparrot.so
+	dh_compress -pparrot-doc -X.pod
+	dh_compress -plibparrot-dev
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir -a
+	dh_testroot -a
+	dh_installchangelogs -a ChangeLog
+	dh_installman -pparrot-minimal debian/parrot.1
+	dh_installman -pparrot-devel debian/parrot_debugger.1 debian/pbc_disassemble.1 debian/pbc_dump.1 debian/pbc_info.1 debian/pbc_merge.1 debian/parrot_config.1
+	dh_installdocs -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_makeshlibs -plibparrot$(SOVERSION)
+	dh_shlibdeps -a -Llibparrot$(SOVERSION) -l$(CURDIR)/debian/libparrot$(SOVERSION)/usr/lib
+	dh_installdeb -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure

More information about the parrot-commits mailing list