releasing version 8.72

Alien/Package/Deb.pm

@@ -334,10 +334,14 @@ sub prep {
 	print OUT $this->name." (".$this->version."-".$this->release.") experimental; urgency=low\n";
 	print OUT "\n";
 	print OUT "  * Converted from .".$this->origformat." format to .deb by alien version $Alien::Version\n";
+	print OUT "  \n";
+	if (defined $this->changelogtext) {
+		my $ct=$this->changelogtext;
+		$ct=~s/^/  /gm;
+		print OUT $ct."\n";
+	}
 	print OUT "\n";
 	print OUT " -- ".$this->username." <".$this->email.">  ".$this->date."\n";
-	print OUT "\n";
-	print OUT $this->changelogtext."\n" if defined $this->changelogtext;
 	close OUT;
 
 	# Control file.

Alien/Package/Tgz.pm

@@ -95,7 +95,7 @@ sub scan {
 	# Strip out any tar extentions.
 	$basename=~s/\.(tgz|tar\.(gz|Z))$//;
 
-	if ($basename=~m/(.*)-(.*?[0-9]+.*)/) {
+	if ($basename=~m/([\w-]+)-([0-9\.?]+).*/) {
 		$this->name($1);
 		$this->version($2);
 	}

debian/changelog

@@ -1,3 +1,13 @@
+alien (8.72) unstable; urgency=low
+
+  * Use debhelper 7, rules file minimisation.
+  * Improve parsing of tgz filenames, to avoid confusion when the filename
+    includes the package type (ie, "noarch"). Patch from Andrej Ricnik-Bay.
+  * When generating a debian changelog file, work around bug #478925 by
+    including the alien changelog text inside the debian changelog entry.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 01 May 2008 15:40:34 -0400
+
 alien (8.71) unstable; urgency=low
 
   * Deal with rpms that relocate ie, /usr into /usr/local, and don't

debian/compat

@@ -1 +1 @@
-4
+7

debian/control

@@ -1,7 +1,7 @@
 Source: alien
 Section: admin
 Priority: optional
-Build-Depends: debhelper (>= 4)
+Build-Depends: debhelper (>= 7)
 Maintainer: Joey Hess <joeyh@debian.org>
 Standards-Version: 3.7.3
 Vcs-Git: git://git.kitenet.net/alien

debian/docs

@@ -0,0 +1,2 @@
+README
+gendiff.txt

debian/rules

@@ -1,47 +1,21 @@
 #!/usr/bin/make -f
+%:
+	dh $@
 
-build: build-stamp
+build:
-build-stamp:
+	dh build
-	dh_testdir
-	perl Makefile.PL
-	$(MAKE)
 	# simple smoke test
 	./alien.pl -V
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	perl Makefile.PL
-	if [ -e Makefile ]; then $(MAKE) realclean; fi
-	dh_clean
-
-binary-arch: build
 
 binary-indep: build
-	dh_testdir
+	dh install --before dh_auto_install
-	dh_testroot
-	dh_clean -k
 	$(MAKE) pure_install INSTALLDIRS=vendor \
 		PREFIX=$(shell pwd)/debian/alien/$(shell perl -MConfig -e 'print $$Config{prefix}') \
 		VARPREFIX=$(shell pwd)/debian/alien
-	# Why does it make this empty directory? Sigh.
+	dh install --after dh_auto_install
-	rm -rf debian/alien/usr/lib
-	dh_installdocs README gendiff.txt
-	dh_installexamples
-	dh_installchangelogs
-	dh_compress
-	dh_fixperms
-	dh_perl
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
 # Not intended for use by anyone except the author.
 announcedir:
 	@echo ${HOME}/src/joeywiki/code/alien/news
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary