r15613 - in /trunk/libogg-vorbis-header-perl/debian: changelog control rules

Mon Feb 25 20:47:01 UTC 2008

Author: gregoa-guest
Date: Mon Feb 25 20:47:00 2008
New Revision: 15613

URL: http://svn.debian.org/wsvn/?sc=1&rev=15613
Log:
debian/rules:
  - remove DESTDIR variable
  - use $(CURDIR) instead of `pwd`
  - don't ignore errors of make realclean
  - mv dh_clean before make realclean und use it for rm'ing stamp files
  - create install-stamp target
  - use $@ for touching stamp files
  - remove dh_installdirs, dh_link, dh_installman and a few commented out
    other dh_* calls
  - use PREFIX and DESTDIR for make install
  - move removal of /usr/share/perl5 to install-stamp target
  - don't install README anymore
  - enable test suite
  - rewrite CFLAGS generation

Modified:
    trunk/libogg-vorbis-header-perl/debian/changelog
    trunk/libogg-vorbis-header-perl/debian/control
    trunk/libogg-vorbis-header-perl/debian/rules

Modified: trunk/libogg-vorbis-header-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libogg-vorbis-header-perl/debian/changelog?rev=15613&op=diff
==============================================================================

--- trunk/libogg-vorbis-header-perl/debian/changelog (original)
+++ trunk/libogg-vorbis-header-perl/debian/changelog Mon Feb 25 20:47:00 2008
@@ -15,8 +15,22 @@
     (closes: #463557).
   * Set Standards-Version to 3.7.3 (no changes).
   * Set debhelper compatibility level to 6.
+  * debian/rules:
+    - remove DESTDIR variable
+    - use $(CURDIR) instead of `pwd`
+    - don't ignore errors of make realclean
+    - mv dh_clean before make realclean und use it for rm'ing stamp files
+    - create install-stamp target
+    - use $@ for touching stamp files
+    - remove dh_installdirs, dh_link, dh_installman and a few commented out
+      other dh_* calls
+    - use PREFIX and DESTDIR for make install
+    - move removal of /usr/share/perl5 to install-stamp target
+    - don't install README anymore
+    - enable test suite
+    - rewrite CFLAGS generation
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Mon, 25 Feb 2008 21:27:02 +0100
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Mon, 25 Feb 2008 21:46:18 +0100
 
 libogg-vorbis-header-perl (0.03-1) unstable; urgency=low
 

Modified: trunk/libogg-vorbis-header-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libogg-vorbis-header-perl/debian/control?rev=15613&op=diff
==============================================================================
--- trunk/libogg-vorbis-header-perl/debian/control (original)
+++ trunk/libogg-vorbis-header-perl/debian/control Mon Feb 25 20:47:00 2008
@@ -1,7 +1,7 @@
 Source: libogg-vorbis-header-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 6), perl (>= 5.8.0-7), libinline-perl (>=0.44-3), libvorbis-dev(>= 1.0.0-3)
+Build-Depends: debhelper (>= 6), perl (>= 5.8.0-7), libinline-perl (>=0.44-3), libvorbis-dev (>= 1.0.0-3)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Standards-Version: 3.7.3
 Homepage: http://search.cpan.org/dist/Ogg-Vorbis-Header/

Modified: trunk/libogg-vorbis-header-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libogg-vorbis-header-perl/debian/rules?rev=15613&op=diff
==============================================================================
--- trunk/libogg-vorbis-header-perl/debian/rules (original)
+++ trunk/libogg-vorbis-header-perl/debian/rules Mon Feb 25 20:47:00 2008
@@ -17,14 +17,15 @@
 PERL = /usr/bin/perl
 endif
 
-ifndef DESTDIR
-DESTDIR=..
-endif
-TMP     =`pwd`/debian/$(PACKAGE)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
 
-OPTIMIZE = -O2 -Wall
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-OPTIMIZE += -g
+# Allow disabling build optimation by setting noopt in
+# $DEB_BUILD_OPTIONS
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+        CFLAGS += -O0
+else
+        CFLAGS += -O2
 endif
 
 # Do not delete the test.ogg.bak file; it's present in the upstream
@@ -37,29 +38,28 @@
 	# Add here commands to compile the package.
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE) OPTIMIZE="$(OPTIMIZE)" LD_RUN_PATH=""
+	$(MAKE) test
 
-	touch build-stamp
+	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
 
-	# Add here commands to clean up after the build process.
-	-$(MAKE) realclean
+	dh_clean --exclude=$(KEEP_ITEMS) build-stamp install-stamp
+	[ ! -f Makefile ] || $(MAKE) realclean
 
-	dh_clean --exclude=$(KEEP_ITEMS)
-
-install: 
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k --exclude=$(KEEP_ITEMS)
-	dh_installdirs
 
-	# Add here commands to install the package into debian/tmp.
-	#$(MAKE) install DESTDIR=`pwd`/debian/tmp
-	$(MAKE) install PREFIX=$(TMP)/usr
+	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+	[ ! -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
@@ -69,31 +69,20 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installdocs README debian/README.Debian
+	dh_installdocs
 	dh_installchangelogs Changes
 	dh_installexamples test.pl test.ogg test.ogg.bak
-
-	# Remove the reference to /usr/share/perl5/ directory, if it's empty.
-	# (Makefile.PL weirdness: it uses this directory, even if not needed.)
-	[ ! -d $(TMP)/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/share/perl5/
-
-#	dh_installemacsen
-#	dh_installinit
-#	dh_installcron
-	dh_installman
-	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_makeshlibs
 	dh_installdeb
-	dh_perl 
+	dh_perl
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
-	dh_builddeb --destdir=$(DESTDIR)
+	dh_builddeb
 
-source diff:                                                                  
+source diff:
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
 binary: binary-indep binary-arch


