[svn:parrot] r43732 - in trunk/ports/debian: . patches

allison at svn.parrot.org allison at svn.parrot.org
Sun Feb 7 01:02:06 UTC 2010


Author: allison
Date: Sun Feb  7 01:02:05 2010
New Revision: 43732
URL: https://trac.parrot.org/parrot/changeset/43732

Log:
Add a patch for the missing DESTDIR flag in the 'install-doc' target.

Added:
   trunk/ports/debian/patches/
   trunk/ports/debian/patches/01_fix_doc_install.patch
   trunk/ports/debian/patches/series
Modified:
   trunk/ports/debian/changelog
   trunk/ports/debian/control.in
   trunk/ports/debian/rules

Modified: trunk/ports/debian/changelog
==============================================================================
--- trunk/ports/debian/changelog	Sun Feb  7 00:31:14 2010	(r43731)
+++ trunk/ports/debian/changelog	Sun Feb  7 01:02:05 2010	(r43732)
@@ -2,11 +2,17 @@
   * New upstream release
   * parrot-devel.install.in
     - Install parrot-nqp binary and supporting library.
+  * debian/patches:
+    - Added 01_fix_doc_install.patch, from upstream, missing DESTDIR
+      flag to new 'install-doc' target needed for package build.
+  * debian/control.in:
+    - Added quilt as Build-Depends for patch.
   * debian/rules:
     - Changed install target from 'install-dev' to 'install', they are
       now identical.
     - Added LD_LIBRARY_PATH to 'install' target, needed for the new parrot-nqp
       binary.
+    - Added quilt support for patch.
 
  -- Allison Randal <allison at parrot.org>  Sat, 06 Feb 2010 19:51:01 +0000
 
@@ -15,7 +21,7 @@
   * debian/rules:
     - New upstream configuration option --disable-rpath allows packages to
       be built without rpath.
-  * parrot-devel.install.in
+  * debian/parrot-devel.install.in
     - Install pbc_to_exe binary and supporting library.
 
  -- Allison Randal <allison at parrot.org>  Fri, 24 Jul 2009 23:54:07 -0700

Modified: trunk/ports/debian/control.in
==============================================================================
--- trunk/ports/debian/control.in	Sun Feb  7 00:31:14 2010	(r43731)
+++ trunk/ports/debian/control.in	Sun Feb  7 01:02:05 2010	(r43732)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Parrot Maintainers <pkg-parrot-devel at lists.alioth.debian.org>
 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
+Build-Depends: debhelper (>= 5.0.0), perl, perl-doc, libgdbm-dev, libreadline-dev, quilt
 Standards-Version: 3.8.1
 
 Package: parrot

Added: trunk/ports/debian/patches/01_fix_doc_install.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/ports/debian/patches/01_fix_doc_install.patch	Sun Feb  7 01:02:05 2010	(r43732)
@@ -0,0 +1,11 @@
+--- parrot-2.0.0.orig/config/gen/makefiles/root.in
++++ parrot-2.0.0/config/gen/makefiles/root.in
+@@ -2664,6 +2664,7 @@
+     --buildprefix=$(BUILDPREFIX) \
+     --prefix=$(PREFIX) \
+     --docdir=$(DOC_DIR) \
++    --destdir=$(DESTDIR) \
+     --versiondir=$(VERSION_DIR) \
+     MANIFEST MANIFEST.generated
+ 
+

Added: trunk/ports/debian/patches/series
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/ports/debian/patches/series	Sun Feb  7 01:02:05 2010	(r43732)
@@ -0,0 +1 @@
+01_fix_doc_install.patch

Modified: trunk/ports/debian/rules
==============================================================================
--- trunk/ports/debian/rules	Sun Feb  7 00:31:14 2010	(r43731)
+++ trunk/ports/debian/rules	Sun Feb  7 01:02:05 2010	(r43732)
@@ -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 --disable-rpath
 	touch configure-stamp
@@ -48,7 +50,7 @@
 	pod2man --section=1 --release="Debian Project" --center="Debian GNU/Linux manual" tools/dev/pbc_to_exe.pir debian/pbc_to_exe.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_merge.1 debian/libparrot$(SOVERSION).install src/main.o installable_pbc_to_exe ext/Parrot-Embed/Makefile.PL test.c test.ldo


More information about the parrot-commits mailing list