Changeset 1083

Timestamp:

08/09/10 02:37:04 (3 years ago)

Author:

bruno

Message:

• Other fixes for lintian in project-builder

Files:

• devel/pb/lib/ProjectBuilder/Env.pm (modified) (3 diffs)
• pbconf/devel/project-builder/deb/rules (modified) (3 diffs)

devel/pb/lib/ProjectBuilder/Env.pm

@@ -172 +172 @@
 # Detect the root dir for hosting all the content generated with pb
 #
-=over 4 
+=pod
 
  Tree will look like this:
@@ -205 +205 @@
  (*) By default, if no relocation in .pbrc, dev dir is taken in the maint pbdefdir (when appropriate)
  Names under a pbproj and the corresponding pbconf should be similar
+
+=back 
 
 =cut
@@ -1079 +1081 @@
 }
 
-=back 
-
 =head1 WEB SITES
 

pbconf/devel/project-builder/deb/rules

@@ -10 +10 @@
 #export DH_VERBOSE=1
 
+# 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
+
+ifndef PERL
+PERL = /usr/bin/perl
+endif
+
 # Define package name variable for a one-stop change.
 PACKAGE_NAME = PBPKG
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -O0
-else
-    CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-    INSTALL_PROGRAM += -s
-endif
 
 build: build-stamp
@@ -35 +27 @@
 
         # Add here commands to compile the package.
-        perl Makefile.PL
+        $(PERL) Makefile.PL INSTALLDIRS=vendor PBKEYWORD=$(CURDIR)/PBFINALDIR MANDIR=/usr/share/man
         $(MAKE)
         touch $@
@@ -58 +50 @@
         $(MAKE) install DESTDIR=$(CURDIR)/debian/PBPKG
 
+# Build architecture-dependent files here.
+binary-arch: build install
+    # We have nothing to do by default.
+    #
 # Build architecture-independent files here.
 binary-indep: build install
-    # We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
             dh_testdir
             dh_testroot
             dh_installchangelogs ChangeLog
             dh_installdocs
-            dh_installexamples
-                #       dh_install
-                #       dh_installmenu
-                #       dh_installdebconf
-                #       dh_installlogrotate
-                #       dh_installemacsen
-                #       dh_installpam
-                #       dh_installmime
-                #       dh_python
-                #       dh_installinit
-                #       dh_installcron
-                #       dh_installinfo
+            #       dh_installexamples
+            #       dh_install
+            #       dh_installmenu
+            #       dh_installdebconf
+            #       dh_installlogrotate
+            #       dh_installemacsen
+            #       dh_installpam
+            #       dh_installmime
+            #       dh_python
+            #       dh_installinit
+            #       dh_installcron
+            #       dh_installinfo
             dh_installman
+            dh_perl
             dh_strip
             dh_compress
             dh_fixperms
-                                #       dh_perl
-                                #       dh_makeshlibs
+            #       dh_makeshlibs
             dh_installdeb
-            dh_shlibdeps
+            #       dh_shlibdeps
             dh_gencontrol
             dh_md5sums