r20770 - in /trunk/libcdk-perl: Cdk/Viewer.pm Makefile.PL debian/changelog debian/control debian/patches/ debian/patches/cdk_viewer.patch debian/patches/makefile.patch debian/patches/series debian/rules

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Fri Jun 6 12:41:57 UTC 2008 

Author: gregoa
Date: Fri Jun  6 12:41:56 2008
New Revision: 20770

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20770
Log:
* Move changes to upstream code under debian/patches; add quilt framework.
* Refresh debian/rules, no functional changes.

Added:
    trunk/libcdk-perl/debian/patches/
    trunk/libcdk-perl/debian/patches/cdk_viewer.patch
    trunk/libcdk-perl/debian/patches/makefile.patch
    trunk/libcdk-perl/debian/patches/series
Modified:
    trunk/libcdk-perl/Cdk/Viewer.pm
    trunk/libcdk-perl/Makefile.PL
    trunk/libcdk-perl/debian/changelog
    trunk/libcdk-perl/debian/control
    trunk/libcdk-perl/debian/rules

Modified: trunk/libcdk-perl/Cdk/Viewer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcdk-perl/Cdk/Viewer.pm?rev=20770&op=diff
==============================================================================
--- trunk/libcdk-perl/Cdk/Viewer.pm (original)
+++ trunk/libcdk-perl/Cdk/Viewer.pm Fri Jun  6 12:41:56 2008
@@ -151,7 +151,7 @@
    # Set the values.
    my $key = Cdk::checkReq ($name, "Key", $params{'Key'});
    my $function = Cdk::checkReq ($name, "Function", $params{'Function'});
-   Cdk::Viewer::Bind ($self->{'Me'}, $key, $params{'Function'});
+   Cdk::Entry::Bind ($self->{'Me'}, $key, $params{'Function'});
 }
 
 #

Modified: trunk/libcdk-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcdk-perl/Makefile.PL?rev=20770&op=diff
==============================================================================
--- trunk/libcdk-perl/Makefile.PL (original)
+++ trunk/libcdk-perl/Makefile.PL Fri Jun  6 12:41:56 2008
@@ -12,10 +12,8 @@
 
 WriteMakefile(
     'NAME'	=> 'Cdk',
-    ($Config::Config{archname} =~ /^hppa-linux/ ?
-     (CCFLAGS => $Config::Config{ccflags}.' -ffunction-sections') : ()),
     'VERSION'	=> '4.09010',
-    'LIBS'	=> ['-lcdk -lncurses'],
-    'INC'	=> '-I/usr/include/cdk',
+    'LIBS'	=> ['-L/usr/local/lib -lcdk -lcurses'],
+    'INC'	=> '-I/usr/include/ncurses -I/usr/local/include/cdk',
     'clean'	=> {FILES => 'Makefile.old'},
 );

Modified: trunk/libcdk-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcdk-perl/debian/changelog?rev=20770&op=diff
==============================================================================
--- trunk/libcdk-perl/debian/changelog (original)
+++ trunk/libcdk-perl/debian/changelog Fri Jun  6 12:41:56 2008
@@ -1,3 +1,10 @@
+libcdk-perl (4.9.10-4) UNRELEASED; urgency=low
+
+  * Move changes to upstream code under debian/patches; add quilt framework.
+  * Refresh debian/rules, no functional changes.
+
+ -- gregor herrmann <gregoa at debian.org>  Fri, 06 Jun 2008 14:36:48 +0200
+
 libcdk-perl (4.9.10-3) unstable; urgency=low
 
   [ gregor herrmann ]

Modified: trunk/libcdk-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcdk-perl/debian/control?rev=20770&op=diff
==============================================================================
--- trunk/libcdk-perl/debian/control (original)
+++ trunk/libcdk-perl/debian/control Fri Jun  6 12:41:56 2008
@@ -8,7 +8,7 @@
 Homepage: http://invisible-island.net/cdk/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libcdk-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libcdk-perl/
-Build-Depends: debhelper (>= 6), perl (>= 5.8), libcdk5-dev
+Build-Depends: debhelper (>= 6), perl (>= 5.8), libcdk5-dev, quilt (>= 0.40)
 
 Package: libcdk-perl
 Architecture: any

Added: trunk/libcdk-perl/debian/patches/cdk_viewer.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcdk-perl/debian/patches/cdk_viewer.patch?rev=20770&op=file
==============================================================================
--- trunk/libcdk-perl/debian/patches/cdk_viewer.patch (added)
+++ trunk/libcdk-perl/debian/patches/cdk_viewer.patch Fri Jun  6 12:41:56 2008
@@ -1,0 +1,15 @@
+Author: Mathew White
+Description: Cdk/Viewer.pm: Fix copy-paste error that prevented bind() from working.
+Bug: #312733
+
+--- libcdk-perl.orig/Cdk/Viewer.pm
++++ libcdk-perl/Cdk/Viewer.pm
+@@ -151,7 +151,7 @@
+    # Set the values.
+    my $key = Cdk::checkReq ($name, "Key", $params{'Key'});
+    my $function = Cdk::checkReq ($name, "Function", $params{'Function'});
+-   Cdk::Entry::Bind ($self->{'Me'}, $key, $params{'Function'});
++   Cdk::Viewer::Bind ($self->{'Me'}, $key, $params{'Function'});
+ }
+ 
+ #

Added: trunk/libcdk-perl/debian/patches/makefile.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcdk-perl/debian/patches/makefile.patch?rev=20770&op=file
==============================================================================
--- trunk/libcdk-perl/debian/patches/makefile.patch (added)
+++ trunk/libcdk-perl/debian/patches/makefile.patch Fri Jun  6 12:41:56 2008
@@ -1,0 +1,19 @@
+Author: Stephen Zander <gibreel at debian.org>
+Description: Add -ffunction-sections for hppa architecture
+Bug: #134027
+
+--- libcdk-perl.orig/Makefile.PL
++++ libcdk-perl/Makefile.PL
+@@ -12,8 +12,10 @@
+ 
+ WriteMakefile(
+     'NAME'	=> 'Cdk',
++    ($Config::Config{archname} =~ /^hppa-linux/ ?
++     (CCFLAGS => $Config::Config{ccflags}.' -ffunction-sections') : ()),
+     'VERSION'	=> '4.09010',
+-    'LIBS'	=> ['-L/usr/local/lib -lcdk -lcurses'],
+-    'INC'	=> '-I/usr/include/ncurses -I/usr/local/include/cdk',
++    'LIBS'	=> ['-lcdk -lncurses'],
++    'INC'	=> '-I/usr/include/cdk',
+     'clean'	=> {FILES => 'Makefile.old'},
+ );

Added: trunk/libcdk-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcdk-perl/debian/patches/series?rev=20770&op=file
==============================================================================
--- trunk/libcdk-perl/debian/patches/series (added)
+++ trunk/libcdk-perl/debian/patches/series Fri Jun  6 12:41:56 2008
@@ -1,0 +1,2 @@
+cdk_viewer.patch
+makefile.patch

Modified: trunk/libcdk-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcdk-perl/debian/rules?rev=20770&op=diff
==============================================================================
--- trunk/libcdk-perl/debian/rules (original)
+++ trunk/libcdk-perl/debian/rules Fri Jun  6 12:41:56 2008
@@ -1,64 +1,76 @@
-#! /usr/bin/make -f
-# -*-makefile-*-
-# debian/rules file for libcdk-perl
+#!/usr/bin/make -f
+# This debian/rules file is provided as a template for normal perl
+# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
+# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
+# be used freely wherever it is useful.
 
-PERL	?= /usr/bin/perl
-PACKAGE	=$(shell dh_listpackages)
-TMP	=$(CURDIR)/debian/$(PACKAGE)
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-# Allow disabling build optimation by setting noopt in
+# If set to a true value then MakeMaker's prompt function will
+# always return the default without waiting for user input.
+export PERL_MM_USE_DEFAULT=1
+
+include /usr/share/quilt/quilt.make
+
+PERL   ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
+
+# Allow disabling build optimisation by setting noopt in
 # $DEB_BUILD_OPTIONS
 CFLAGS = -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -O0
+        CFLAGS += -O0
 else
-    CFLAGS += -O2
+        CFLAGS += -O2
 endif
 
-build:	build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	$(PERL) Makefile.PL INSTALLDIRS=vendor PERL=$(PERL)
-	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=
+	$(PERL) Makefile.PL INSTALLDIRS=vendor
+	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
 	$(MAKE) test
 	touch $@
 
-clean:
-	rm -f build-stamp install-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	dh_clean build-stamp install-stamp
+	[ ! -f Makefile ] || ( touch Makefile && $(MAKE) realclean )
 
 install: install-stamp
 install-stamp: build-stamp
 	dh_testdir
+	dh_testroot
 	dh_clean -k
-
-	$(MAKE) pure_install DESTDIR=$(TMP)
-	# rm empty /usr/share/perl5 directory
-	[ ! -d $(TMP)/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/share/perl5
-
+	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+	[ ! -d $(TMP)/usr/share/perl5 ] || \
+		rmdir --ignore-fail-on-non-empty --parents --verbose \
+		$(TMP)/usr/share/perl5
 	touch $@
 
-binary-indep:
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do here for an architecture-dependent package
 
-binary-arch: install
+# Build architecture-dependent files here.
+binary-arch: build install
 	dh_testdir
 	dh_testroot
-
+	dh_installexamples demos examples/. fulldemo
+	dh_installdocs README
 	dh_installchangelogs CHANGES
-	dh_installdocs README
-	dh_installexamples demos examples/. fulldemo
-
+	dh_shlibdeps
 	dh_strip
+	dh_perl
 	dh_compress -Xexamples
 	dh_fixperms
-	dh_perl
 	dh_installdeb
-	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
-binary:	binary-indep binary-arch
-
-.PHONY:	binary binary-arch binary-indep clean build
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

More information about the Pkg-perl-cvs-commits mailing list