r147: Initial Import

diff --git a/debian/changelog b/debian/changelog
index b93b147164e1cc010bae1d1f605b1d65d0dc71b6..09eea31157595301ec4496b52dffde58be112885 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debhelper (1.2.12) unstable; urgency=low
+
+  * examples/*: moved dh_makeshlibs call to before dh_installdeb call.
+    (#29762). This is just so if you replace dh_makeshlibs with something
+    that generates debian/shlibs, it still gets installed properly.
+  * dh_suidregister: use names instead of uid's and gid's, at request of
+    suidregister maintainer (#29802).
+
+ -- Joey Hess <joeyh@master.debian.org>  Sat, 21 Nov 1998 13:13:10 -0800
+
 debhelper (1.2.11) unstable; urgency=low
 
   * dh_movefiles: if given absolute filenames to move (note that that is

diff --git a/dh_suidregister b/dh_suidregister
index 86188cd46751679196150c04456ec11e1741affb..d5b10ebd33ae05392bc40c474bff3c1e829a2b83 100755 (executable)
--- a/dh_suidregister
+++ b/dh_suidregister
@@ -47,8 +47,11 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
                # fill in the blanks in the autoscript files.
                # Fill with the owner, group, and perms of the file.
                (undef,undef,$mode,undef,$uid,$gid,undef) = stat("$TMP/$file");
+               # Now come up with the user and group names for the uid and gid.
+               $user=getpwuid($uid);
+               $group=getgrgid($gid);
                # Note that I have to print mode in ocal, stripping file type.
-               $sedstr=sprintf("s:#FILE#:$file:;s/#PACKAGE#/$PACKAGE/;s/#OWNER#/$uid/;s/#GROUP#/$gid/;s/#PERMS#/%#o/",
+               $sedstr=sprintf("s:#FILE#:$file:;s/#PACKAGE#/$PACKAGE/;s/#OWNER#/$user/;s/#GROUP#/$group/;s/#PERMS#/%#o/",
                                $mode & 07777);
 
                autoscript($PACKAGE,"postinst","postinst-suid",$sedstr);

diff --git a/examples/rules b/examples/rules
index e1a9c260c13492d68bf8d8666d5be9ce065112d2..091a67a61ed44cc4c44e7ebffa1a485590c84843 100755 (executable)
--- a/examples/rules
+++ b/examples/rules
@@ -61,8 +61,8 @@ binary-arch: build install
        dh_suidregister
        dh_installdeb
        dh_shlibdeps
-       dh_gencontrol
 #      dh_makeshlibs
+       dh_gencontrol
        dh_md5sums
        dh_builddeb
 

diff --git a/examples/rules.multi b/examples/rules.multi
index c43020076e4f75a152f5c91ec19c86597b7f523a..c7426b2eb8f309a0df3b887b175a2ceeb202d2bd 100755 (executable)
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -84,8 +84,8 @@ binary-arch: build install
        dh_suidregister -a
        dh_installdeb -a
        dh_shlibdeps -a
-       dh_gencontrol -a
 #      dh_makeshlibs -a
+       dh_gencontrol -a
        dh_md5sums -a
        dh_builddeb -a