r20769 - in /trunk/libauthen-smb-perl: debian/changelog debian/control debian/patches/ debian/patches/include_string.patch debian/patches/series debian/rules smbval/smblib.c

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Fri Jun 6 12:16:28 UTC 2008


Author: gregoa
Date: Fri Jun  6 12:16:28 2008
New Revision: 20769

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20769
Log:
* Split changes in smbval/smblib.c out into a separate patch; add quilt
  framework.
* Refresh debian/rules; now uses build-arch for creating the package.

Added:
    trunk/libauthen-smb-perl/debian/patches/
    trunk/libauthen-smb-perl/debian/patches/include_string.patch
    trunk/libauthen-smb-perl/debian/patches/series
Modified:
    trunk/libauthen-smb-perl/debian/changelog
    trunk/libauthen-smb-perl/debian/control
    trunk/libauthen-smb-perl/debian/rules
    trunk/libauthen-smb-perl/smbval/smblib.c

Modified: trunk/libauthen-smb-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-smb-perl/debian/changelog?rev=20769&op=diff
==============================================================================
--- trunk/libauthen-smb-perl/debian/changelog (original)
+++ trunk/libauthen-smb-perl/debian/changelog Fri Jun  6 12:16:28 2008
@@ -1,5 +1,6 @@
 libauthen-smb-perl (0.91-4) UNRELEASED; urgency=low
 
+  [ Xavier Oswald ]
   * New maintainer is Debian Perl Group 
   * Add compat file
   * Add watch file
@@ -15,6 +16,11 @@
     - add myself as uploader
     - change Section from web to perl
     - update Standards-Version to 3.7.3
+
+  [ gregor herrmann ]
+  * Split changes in smbval/smblib.c out into a separate patch; add quilt
+    framework.
+  * Refresh debian/rules; now uses build-arch for creating the package.
 
  -- Xavier Oswald <x.oswald at free.fr>  Thu, 21 Feb 2008 14:09:32 +0100
 

Modified: trunk/libauthen-smb-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-smb-perl/debian/control?rev=20769&op=diff
==============================================================================
--- trunk/libauthen-smb-perl/debian/control (original)
+++ trunk/libauthen-smb-perl/debian/control Fri Jun  6 12:16:28 2008
@@ -1,6 +1,6 @@
 Source: libauthen-smb-perl
 Section: perl
-Build-Depends: debhelper (>= 5), perl (>= 5.8)
+Build-Depends: debhelper (>= 5), perl (>= 5.8), quilt (>= 0.40)
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Xavier Oswald <x.oswald at free.fr>

Added: trunk/libauthen-smb-perl/debian/patches/include_string.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-smb-perl/debian/patches/include_string.patch?rev=20769&op=file
==============================================================================
--- trunk/libauthen-smb-perl/debian/patches/include_string.patch (added)
+++ trunk/libauthen-smb-perl/debian/patches/include_string.patch Fri Jun  6 12:16:28 2008
@@ -1,0 +1,13 @@
+Author: Will Lowe <lowe at debian.org>
+Bug: #226525
+
+--- libauthen-smb-perl.orig/smbval/smblib.c
++++ libauthen-smb-perl/smbval/smblib.c
+@@ -25,6 +25,7 @@
+ 
+ #include "config.h"
+ #include <malloc.h>
++#include <string.h>
+ 
+ int SMBlib_errno;
+ int SMBlib_SMB_Error;

Added: trunk/libauthen-smb-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-smb-perl/debian/patches/series?rev=20769&op=file
==============================================================================
--- trunk/libauthen-smb-perl/debian/patches/series (added)
+++ trunk/libauthen-smb-perl/debian/patches/series Fri Jun  6 12:16:28 2008
@@ -1,0 +1,1 @@
+include_string.patch

Modified: trunk/libauthen-smb-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-smb-perl/debian/rules?rev=20769&op=diff
==============================================================================
--- trunk/libauthen-smb-perl/debian/rules (original)
+++ trunk/libauthen-smb-perl/debian/rules Fri Jun  6 12:16:28 2008
@@ -1,14 +1,24 @@
 #!/usr/bin/make -f
-#export PERL_MM_USE_DEFAULT=1
+# 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.
 
-PACKAGE=$(shell dh_listpackages)
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-ifndef PERL
-PERL = /usr/bin/perl
-endif
+# 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
 
-TMP     =$(CURDIR)/debian/$(PACKAGE)
+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
@@ -17,48 +27,49 @@
 endif
 
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
-	touch build-stamp
+	$(MAKE) test
+	touch $@
 
-clean: 
+clean: unpatch
 	dh_testdir
 	dh_testroot
+	dh_clean build-stamp install-stamp
 	[ ! -f Makefile ] || $(MAKE) realclean
-	dh_clean build-stamp install-stamp
 
-install: build install-stamp
-install-stamp:
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	$(MAKE) test
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-	[ ! -d $(TMP)/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/share/perl5
-	touch install-stamp
+	[ ! -d $(TMP)/usr/share/perl5 ] || \
+		rmdir --ignore-fail-on-non-empty --parents --verbose \
+		$(TMP)/usr/share/perl5
+	touch $@
 
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do here for an architecture-dependent package
+
+# Build architecture-dependent files here.
 binary-arch: build install
-
-binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installdocs 
+	dh_installdocs
 	dh_installchangelogs Changes
+	dh_shlibdeps
 	dh_strip
+	dh_perl
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs
 	dh_installdeb
-	dh_perl 
-	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
-source diff:
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build clean binary-indep binary-arch binary install

Modified: trunk/libauthen-smb-perl/smbval/smblib.c
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-smb-perl/smbval/smblib.c?rev=20769&op=diff
==============================================================================
--- trunk/libauthen-smb-perl/smbval/smblib.c (original)
+++ trunk/libauthen-smb-perl/smbval/smblib.c Fri Jun  6 12:16:28 2008
@@ -25,7 +25,6 @@
 
 #include "config.h"
 #include <malloc.h>
-#include <string.h>
 
 int SMBlib_errno;
 int SMBlib_SMB_Error;




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