Drop PAM entirely, it was specific to Debian anyway

diff --git a/debian/changelog b/debian/changelog
index 8dde2dc..e70426b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cvs (2:1.12.13+real-5) xunstable; urgency=low
+
+  * Drop PAM entirely, it was specific to Debian anyway
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Sat, 07 May 2011 01:00:39 +0001
+
 cvs (2:1.12.13+real-4) unstable; urgency=low
 
   * Renamed .orig.tar.gz due to archive pathname conflict

diff --git a/debian/control b/debian/control
index c01c312..be3c4af 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/control,v 1.14 2011/05/07 01:00:46 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/control,v 1.15 2011/05/10 13:16:26 tg Exp $
 #
 Source: cvs
 Section: vcs
@@ -6,7 +6,7 @@ Priority: optional
 Maintainer: Thorsten Glaser <tg@mirbsd.de>
 Homepage: http://www.nongnu.org/cvs/
 Build-Depends: debhelper (>= 5), autotools-dev, bsdmainutils, groff,
- libbsd-dev, libkrb5-dev | heimdal-dev, libpam0g-dev, texi2html, texinfo,
+ libbsd-dev, libkrb5-dev | heimdal-dev, texi2html, texinfo,
  texlive-latex-base, zlib1g-dev
 Standards-Version: 3.9.2
 # First word is the $CVSROOT (-d arg) string, second word the module.

diff --git a/debian/copyright b/debian/copyright
index 0254eb7..d6348e9 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianised by Thorsten Glaser <tg@mirbsd.de> on
 Wed Sep 15 21:52:29 UTC 2010.
 
-$MirOS: contrib/hosted/tg/deb/cvs/debian/copyright,v 1.3 2011/05/06 23:28:42 tg Exp $
+$MirOS: contrib/hosted/tg/deb/cvs/debian/copyright,v 1.4 2011/05/10 13:16:26 tg Exp $
 
 It was downloaded from:
 http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.gz
@@ -16,8 +16,5 @@ but contains code from gnulib which raises the minimum required version
 of that licence to 2. On Debian systems, it can be found at
 (GPLv1) /usr/share/common-licenses/GPL-1 and GPL-2.
 
-The file pam was copied from the previous Debian package's (by
-Steve McIntyre) cvs.pam file. (It can probably go away.)
-
 Development of this package was partially sponsored by tarent GmbH.
 The packaging is covered by the same licence as GNU CVS itself.

diff --git a/debian/pam b/debian/pam
deleted file mode 100644 (file)
index 66905d0..0000000
--- a/debian/pam
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# /etc/pam.d/cvs - specify the PAM behaviour of CVS
-#
-
-# We fall back to the system default in /etc/pam.d/common-*
-
-@include common-auth
-@include common-account
-
-# We don't use password or session modules at all
-# @include common-password
-# @include common-session

diff --git a/debian/rules b/debian/rules
index 1d326ee..4d94f7e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/rules,v 1.5 2011/05/06 22:58:43 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/rules,v 1.6 2011/05/10 13:16:26 tg Exp $
 #-
 # -*- makefile -*-
 # Sample debian/rules that uses debhelper.
@@ -43,10 +43,9 @@ CONFIGURE_ARGS:=     --prefix=/usr \
                        --mandir=/usr/share/man \
                        --sysconfdir=/etc \
                        --disable-dependency-tracking \
-                       --disable-maintainer-mode
-CONFIGURE_ARGS+=       --enable-pam \
-                       --with-hardcoded-pam-service-name=cvs
-CONFIGURE_ARGS+=       --disable-nls \
+                       --disable-maintainer-mode \
+                       --disable-pam \
+                       --disable-nls \
                        --enable-client \
                        --enable-password-authenticated-client \
                        --enable-server \
@@ -116,7 +115,6 @@ debian/.install_stamp: debian/.build_stamp
        cat src/ChangeLog src/ChangeLog-97 src/ChangeLog-96 src/ChangeLog-9395 \
            src/ChangeLog-9194 >debian/stagedir/clogs/ChangeLog.src
        cp contrib/ChangeLog debian/stagedir/clogs/ChangeLog.contrib
-       cp contrib/pam/ChangeLog debian/stagedir/clogs/ChangeLog.pam
        cp diff/ChangeLog debian/stagedir/clogs/ChangeLog.diff
        cp m4/ChangeLog debian/stagedir/clogs/ChangeLog.m4
        cp man/ChangeLog debian/stagedir/clogs/ChangeLog.man
@@ -135,16 +133,7 @@ binary-arch: build install
        dh_testroot
        dh_installchangelogs debian/stagedir/clogs/ChangeLog
        dh_installdocs
-#      dh_installexamples
        dh_install
-#      dh_installmenu
-#      dh_installdebconf
-#      dh_installlogrotate
-#      dh_installemacsen
-       dh_installpam
-#      dh_installmime
-#      dh_installinit
-#      dh_installcron
        dh_installinfo
        dh_installman
        dh_link
@@ -152,9 +141,6 @@ binary-arch: build install
        dh_compress
        cd debian/cvs/usr/share/cvs/contrib && chmod +x descend.sh rcs2sccs.sh
        dh_fixperms
-#      dh_perl
-#      dh_python
-#      dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol