diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/clean | 1 | ||||
| -rw-r--r-- | debian/libpam0g-dev.install | 2 | ||||
| -rw-r--r-- | debian/libpam0g-dev.install.in | 2 | ||||
| -rwxr-xr-x | debian/rules | 1 |
5 files changed, 10 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index dd2c15dc..7c608a13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -pam (1.1.3-2ubuntu1) UNRELEASED; urgency=low +pam (1.1.3-3) UNRELEASED; urgency=low * Look for /etc/init.d/postgresql, not /etc/init.d/postgresql-8.{2,3}, for service restarts; the latter are obsolete since squeeze. Closes: #631511. + * Move debian/libpam0g-dev.install to debian/libpam0g-dev.install.in + and substitute the multiarch path at build time, so our .a files go to + the multiarch dir instead of to /usr/lib. Thanks to Riku Voipio for + pointing out the bug. - -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 25 Jun 2011 12:04:24 -0500 + -- Steve Langasek <vorlon@debian.org> Fri, 01 Jul 2011 01:42:19 -0700 pam (1.1.3-2) unstable; urgency=low diff --git a/debian/clean b/debian/clean index 4a7c5600..18af497a 100644 --- a/debian/clean +++ b/debian/clean @@ -1,2 +1,3 @@ debian/local/pam_getenv.8 debian/libpam0g-dev.links +debian/libpam0g-dev.install diff --git a/debian/libpam0g-dev.install b/debian/libpam0g-dev.install deleted file mode 100644 index d8f5d831..00000000 --- a/debian/libpam0g-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/security/* -lib/*/*.a usr/lib diff --git a/debian/libpam0g-dev.install.in b/debian/libpam0g-dev.install.in new file mode 100644 index 00000000..827690aa --- /dev/null +++ b/debian/libpam0g-dev.install.in @@ -0,0 +1,2 @@ +usr/include/security/* +lib/@DEB_HOST_MULTIARCH@/*.a usr/lib/@DEB_HOST_MULTIARCH@ diff --git a/debian/rules b/debian/rules index 774e4b72..41bb4ee7 100755 --- a/debian/rules +++ b/debian/rules @@ -35,6 +35,7 @@ override_dh_compress: # .install files don't have "except for" handling, so we need to exclude # our module that doesn't match right here override_dh_install: + sed -e"s/@DEB_HOST_MULTIARCH/$(DEB_HOST_MULTIARCH)/g" $(d)/libpam0g-dev.install.in > $(d)/libpam0g-dev.install ifneq (,$(findstring libpam-modules, $(shell dh_listpackages))) dh_install -plibpam-modules -Xpam_cracklib endif |