@@ -10,6 +10,15 @@

  --

+userv (1.0.1.1potatp.1) unstable; urgency=low
+
+  * NMU
+  * FHS transition (closes #91578)
+  * Corrected location of common licenses
+  * Added -isp to dpkg-gencontrol
+
+ -- Bas Zoetekouw <bas@debian.org>  Wed,  8 Aug 2001 17:42:37 +0200
+
 userv (1.0.1) stable frozen unstable; urgency=high

   IMPORTANT SECURITY FIX:

diff --git a/debian/changelog b/debian/changelog
index 044c131f3b761d397e06909d083e682594fca1f4..5751cd1b1a90ad8f4324c2cb60d0cb94eb9b2f41 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,15 @@ userv (1.0.2) unstable; urgency=low
 
  --
 
 
  --
 

+userv (1.0.1.1potatp.1) unstable; urgency=low
+
+  * NMU 
+  * FHS transition (closes #91578)
+  * Corrected location of common licenses
+  * Added -isp to dpkg-gencontrol
+
+ -- Bas Zoetekouw <bas@debian.org>  Wed,  8 Aug 2001 17:42:37 +0200
+

 userv (1.0.1) stable frozen unstable; urgency=high
 
   IMPORTANT SECURITY FIX:
 userv (1.0.1) stable frozen unstable; urgency=high
 
   IMPORTANT SECURITY FIX:

diff --git a/debian/copyright b/debian/copyright
index f2265a2ea8f4758920dabeac4ed0857851fa5d65..41b1bb3b56b5b6ac1741f53d6f15d051f32e84d4 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,7 +26,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public License with
 General Public License for more details.
 
 You should have received a copy of the GNU General Public License with

-your Debian GNU/Linux system, in /usr/doc/copyright/GPL, or with the
-Debian GNU/Linux userv source package as the file COPYING; if not,
+your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with
+the Debian GNU/Linux userv source package as the file COPYING; if not,

 email me at one of the addresses above or write to the Free Software
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 email me at one of the addresses above or write to the Free Software
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

diff --git a/debian/postinst b/debian/postinst
index ef30f6e3c6c1a9ce464a2340fae75d67f5254036..8e10e0e8b08f08e59e00046c0daee01c731145fe 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -2,3 +2,10 @@
 set -e
 update-rc.d userv defaults 19 50
 /etc/init.d/userv start >/dev/null
 set -e
 update-rc.d userv defaults 19 50
 /etc/init.d/userv start >/dev/null

+
+if [ "$1" = "configure" ]; then
+ if [ -d /usr/doc -a ! -e /usr/doc/userv -a -d /usr/share/doc/userv ]; then
+   ln -sf ../share/doc/userv /usr/doc/userv
+  fi
+fi
+

diff --git a/debian/prerm b/debian/prerm
index bab57073c4a083a3747f95b9815505fa16fe3bce..cfb68f1ee006b6cebf6f4c6dd0a4e4242eea996c 100644 (file)
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,3 +1,8 @@
 #!/bin/sh
 set -e
 /etc/init.d/userv stop >/dev/null
 #!/bin/sh
 set -e
 /etc/init.d/userv stop >/dev/null

+
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/userv ]; then
+   rm -f /usr/doc/userv
+fi
+

diff --git a/debian/rules b/debian/rules
index 569161e7fc5a7671e9f8fe66f95141003ff9d6b7..66c929984674d24c40b1eda14cb9d380bc378067 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -29,8 +29,8 @@ binary-arch:  checkroot build
        install -d debian/tmp/var/run/$(package)/
        cp debian/{postinst,prerm,postrm,conffiles} debian/tmp/DEBIAN/.
        cp debian/initd debian/tmp/etc/init.d/userv
        install -d debian/tmp/var/run/$(package)/
        cp debian/{postinst,prerm,postrm,conffiles} debian/tmp/DEBIAN/.
        cp debian/initd debian/tmp/etc/init.d/userv

-       chmod +x debian/tmp/DEBIAN/{postinst,prerm,postrm}
-       chmod +x debian/tmp/etc/init.d/userv
+       chmod 755 debian/tmp/DEBIAN/{postinst,prerm,postrm}
+       chmod 755 debian/tmp/etc/init.d/userv

        $(MAKE) LDFLAGS=-s INSTALL_PROGRAM='install -c -s' \
                prefix=debian/tmp/usr etcdir=debian/tmp/etc \
                docdir=debian/tmp/usr/doc/userv \
        $(MAKE) LDFLAGS=-s INSTALL_PROGRAM='install -c -s' \
                prefix=debian/tmp/usr etcdir=debian/tmp/etc \
                docdir=debian/tmp/usr/doc/userv \


@@ -42,10 +42,14 @@ binary-arch:        checkroot build
        ln -s changelog.gz debian/tmp/usr/doc/$(package)/changelog.Debian.gz
        gzip -9v debian/tmp/usr/doc/$(package)/changelog debian/tmp/usr/man/man1/*.1
        rm debian/tmp/usr/doc/userv/*.ps
        ln -s changelog.gz debian/tmp/usr/doc/$(package)/changelog.Debian.gz
        gzip -9v debian/tmp/usr/doc/$(package)/changelog debian/tmp/usr/man/man1/*.1
        rm debian/tmp/usr/doc/userv/*.ps

+       -mkdir -p -m 0755 debian/tmp/usr/share/doc
+       mv debian/tmp/usr/doc/* debian/tmp/usr/share/doc/
+       mv debian/tmp/usr/man debian/tmp/usr/share/man
+       rm -rf debian/tmp/usr/doc

        dpkg-shlibdeps daemon client
        dpkg-shlibdeps daemon client

-       dpkg-gencontrol
+       dpkg-gencontrol -isp

        chown -R root.root debian/tmp
        chown -R root.root debian/tmp

-       chmod -R g-ws debian/tmp
+       chmod -R og=rX debian/tmp

        chmod 700 debian/tmp/var/run/userv
        dpkg --build debian/tmp ..
 
        chmod 700 debian/tmp/var/run/userv
        dpkg --build debian/tmp ..