From 2c1589bd7ef514c2b20eaca7603015235eaa88e9 Mon Sep 17 00:00:00 2001 From: joey Date: Fri, 16 Jan 2004 03:21:43 +0000 Subject: [PATCH] * Do not register conffiles in /etc when generating a deb; debhelper v3 takes care of that. --- Alien/Package/Deb.pm | 4 ++-- COPYING => GPL | 0 alien.spec.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename COPYING => GPL (100%) diff --git a/Alien/Package/Deb.pm b/Alien/Package/Deb.pm index 7752e05..373a2a1 100644 --- a/Alien/Package/Deb.pm +++ b/Alien/Package/Deb.pm @@ -368,8 +368,8 @@ sub prep { print OUT $this->binary_info."\n"; close OUT; - # Conffiles, if any. - my @conffiles=@{$this->conffiles}; + # Conffiles, if any. Note that debhelper takes care of files in /etc. + my @conffiles=grep { $_ !~ /^\/etc/ } @{$this->conffiles}; if (@conffiles) { open (OUT, ">$dir/debian/conffiles") || die "$dir/debian/conffiles: $!"; print OUT join("\n", @conffiles)."\n"; diff --git a/COPYING b/GPL similarity index 100% rename from COPYING rename to GPL diff --git a/alien.spec.in b/alien.spec.in index 596fb99..7e2803a 100644 --- a/alien.spec.in +++ b/alien.spec.in @@ -31,4 +31,4 @@ find $RPM_BUILD_ROOT -not -type d -printf "/%%P\n" | \ %files -f manifest %defattr(-,root,root) -%doc debian/changelog COPYING README alien.lsm +%doc debian/changelog GPL README alien.lsm