Removed this - it contained out of date gettext stuff that was screwing up

	* acinclude.m4:
	Removed this - it contained out of date gettext stuff that was
	screwing up my build.

	* config/Default.debian:
	* config/Makefile.am:
	* configure.in:
	* debian/.cvsignore:
	* debian/README.Debian:
	* debian/changelog.in:
	* debian/changelog.old:
	* debian/control:
	* debian/copyright:
	* debian/dirs:
	* debian/docs:
	* debian/ex.doc-base.package:
	* debian/gdm.pod:
	* debian/gdmchooser.pod:
	* debian/gdmlogin.pod:
	* debian/init:
	* debian/postinst:
	* debian/postrm:
	* debian/rules:
	Added Debian build stuff and default config. It shouldn't break
	builds on other platforms, but it might.

23 files changed, 751 insertions, 391 deletions

diff --git a/ChangeLog b/ChangeLog
index d5fa93cc..e6c446e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2001-04-17  Ian McKellar  <ian@eazel.com>
+
+	* acinclude.m4:
+	Removed this - it contained out of date gettext stuff that was 
+	screwing up my build.
+
+	* config/Default.debian:
+	* config/Makefile.am:
+	* configure.in:
+	* debian/.cvsignore:
+	* debian/README.Debian:
+	* debian/changelog.in:
+	* debian/changelog.old:
+	* debian/control:
+	* debian/copyright:
+	* debian/dirs:
+	* debian/docs:
+	* debian/ex.doc-base.package:
+	* debian/gdm.pod:
+	* debian/gdmchooser.pod:
+	* debian/gdmlogin.pod:
+	* debian/init:
+	* debian/postinst:
+	* debian/postrm:
+	* debian/rules:
+	Added Debian build stuff and default config. It shouldn't break
+	builds on other platforms, but it might.
+
 Sun Apr 15 12:58:02 2001  George Lebl <jirka@5z.com>
 
 	* gui/gdmlogin.c: fix mispelling thanks to jrb
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 0655ccda..00000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,389 +0,0 @@
-
-######################################################################
-# progtest.m4 from gettext 0.32
-######################################################################
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper@cygnus.com>, 1996.
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 1
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(AM_PATH_PROG_WITH_TEST,
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-
-######################################################################
-# lcmessage.m4 from gettext 0.32
-######################################################################
-# Check whether LC_MESSAGES is available in <locale.h>.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 1
-
-AC_DEFUN(AM_LC_MESSAGES,
-  [if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES)
-    fi
-  fi])
-
-
-
-######################################################################
-# gettext.m4 from gettext 0.32
-######################################################################
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 3
-
-AC_DEFUN(AM_WITH_NLS,
-  [AC_MSG_CHECKING([whether NLS is requested])
-    dnl Default is enabled NLS
-    AC_ARG_ENABLE(nls,
-      [  --disable-nls           do not use Native Language Support],
-      USE_NLS=$enableval, USE_NLS=yes)
-    AC_MSG_RESULT($USE_NLS)
-    AC_SUBST(USE_NLS)
-
-    USE_INCLUDED_LIBINTL=no
-
-    dnl If we use NLS figure out what method
-    if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS)
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH(included-gettext,
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If gettext or catgets are available (in this order) we
-        dnl use this.  Else we have to fall back to GNU NLS library.
-	dnl catgets is only used if permitted by option --with-catgets.
-	nls_cv_header_intl=
-	nls_cv_header_libgt=
-	CATOBJEXT=NONE
-
-	AC_CHECK_HEADER(libintl.h,
-	  [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
-	    [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
-	       gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
-
-	   if test "$gt_cv_func_gettext_libc" != "yes"; then
-	     AC_CHECK_LIB(intl, bindtextdomain,
-	       [AC_CACHE_CHECK([for gettext in libintl],
-		 gt_cv_func_gettext_libintl,
-		 [AC_TRY_LINK([], [return (int) gettext ("")],
-		 gt_cv_func_gettext_libintl=yes,
-		 gt_cv_func_gettext_libintl=no)])])
-	   fi
-
-	   if test "$gt_cv_func_gettext_libc" = "yes" \
-	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
-	      AC_DEFINE(HAVE_GETTEXT)
-	      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	      if test "$MSGFMT" != "no"; then
-		AC_CHECK_FUNCS(dcgettext)
-		AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-		AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-		  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-		AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-			       return _nl_msg_cat_cntr],
-		  [CATOBJEXT=.gmo
-		   DATADIRNAME=share],
-		  [CATOBJEXT=.mo
-		   DATADIRNAME=lib])
-		INSTOBJEXT=.mo
-	      fi
-	    fi
-	])
-
-        if test "$CATOBJEXT" = "NONE"; then
-	  AC_MSG_CHECKING([whether catgets can be used])
-	  AC_ARG_WITH(catgets,
-	    [  --with-catgets          use catgets functions if available],
-	    nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
-	  AC_MSG_RESULT($nls_cv_use_catgets)
-
-	  if test "$nls_cv_use_catgets" = "yes"; then
-	    dnl No gettext in C library.  Try catgets next.
-	    AC_CHECK_LIB(i, main)
-	    AC_CHECK_FUNC(catgets,
-	      [AC_DEFINE(HAVE_CATGETS)
-	       INTLOBJS="\$(CATOBJS)"
-	       AC_PATH_PROG(GENCAT, gencat, no)dnl
-	       if test "$GENCAT" != "no"; then
-		 AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
-		 if test "$GMSGFMT" = "no"; then
-		   AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
-		    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
-		 fi
-		 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-		   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-		 USE_INCLUDED_LIBINTL=yes
-		 CATOBJEXT=.cat
-		 INSTOBJEXT=.cat
-		 DATADIRNAME=lib
-		 INTLDEPS='$(top_builddir)/intl/libintl.a'
-		 INTLLIBS=$INTLDEPS
-		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-		 nls_cv_header_intl=intl/libintl.h
-		 nls_cv_header_libgt=intl/libgettext.h
-	       fi])
-	  fi
-        fi
-
-        if test "$CATOBJEXT" = "NONE"; then
-	  dnl Neither gettext nor catgets in included in the C library.
-	  dnl Fall back on GNU gettext library.
-	  nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        INTLOBJS="\$(GETTOBJS)"
-        AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
-        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-        AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-        AC_SUBST(MSGFMT)
-	USE_INCLUDED_LIBINTL=yes
-        CATOBJEXT=.gmo
-        INSTOBJEXT=.mo
-        DATADIRNAME=share
-	INTLDEPS='$(top_builddir)/intl/libintl.a'
-	INTLLIBS=$INTLDEPS
-	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-        nls_cv_header_intl=intl/libintl.h
-        nls_cv_header_libgt=intl/libgettext.h
-      fi
-
-      dnl Test whether we really found GNU xgettext.
-      if test "$XGETTEXT" != ":"; then
-	dnl If it is no GNU xgettext we define it as : so that the
-	dnl Makefiles still can work.
-	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-	  : ;
-	else
-	  AC_MSG_RESULT(
-	    [found xgettext programs is not GNU xgettext; ignore it])
-	  XGETTEXT=":"
-	fi
-      fi
-
-      # We need to process the po/ directory.
-      POSUB=po
-    else
-      DATADIRNAME=share
-      nls_cv_header_intl=intl/libintl.h
-      nls_cv_header_libgt=intl/libgettext.h
-    fi
-
-    # If this is used in GNU gettext we have to set USE_NLS to `yes'
-    # because some of the sources are only built for this goal.
-    if test "$PACKAGE" = gettext; then
-      USE_NLS=yes
-      USE_INCLUDED_LIBINTL=yes
-    fi
-
-    dnl These rules are solely for the distribution goal.  While doing this
-    dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.in.
-    for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(USE_INCLUDED_LIBINTL)
-    AC_SUBST(CATALOGS)
-    AC_SUBST(CATOBJEXT)
-    AC_SUBST(DATADIRNAME)
-    AC_SUBST(GMOFILES)
-    AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLDEPS)
-    AC_SUBST(INTLLIBS)
-    AC_SUBST(INTLOBJS)
-    AC_SUBST(POFILES)
-    AC_SUBST(POSUB)
-  ])
-
-AC_DEFUN(AM_GNU_GETTEXT,
-  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-   AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_PROG_RANLIB])dnl
-   AC_REQUIRE([AC_ISC_POSIX])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   AC_REQUIRE([AC_C_CONST])dnl
-   AC_REQUIRE([AC_C_INLINE])dnl
-   AC_REQUIRE([AC_TYPE_OFF_T])dnl
-   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-   AC_REQUIRE([AC_FUNC_MMAP])dnl
-
-   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h values.h sys/param.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
-__argz_count __argz_stringify __argz_next])
-
-   if test "${ac_cv_func_stpcpy+set}" != "set"; then
-     AC_CHECK_FUNCS(stpcpy)
-   fi
-   if test "${ac_cv_func_stpcpy}" = "yes"; then
-     AC_DEFINE(HAVE_STPCPY)
-   fi
-
-   AM_LC_MESSAGES
-   AM_WITH_NLS
-
-   if test "x$CATOBJEXT" != "x"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-   dnl The reference to <locale.h> in the installed <libintl.h> file
-   dnl must be resolved because we cannot expect the users of this
-   dnl to define HAVE_LOCALE_H.
-   if test $ac_cv_header_locale_h = yes; then
-     INCLUDE_LOCALE_H="#include <locale.h>"
-   else
-     INCLUDE_LOCALE_H="\
-/* The system does not provide the header <locale.h>.  Take care yourself.  */"
-   fi
-   AC_SUBST(INCLUDE_LOCALE_H)
-
-   dnl Determine which catalog format we have (if any is needed)
-   dnl For now we know about two different formats:
-   dnl   Linux libc-5 and the normal X/Open format
-   test -d intl || mkdir intl
-   if test "$CATOBJEXT" = ".cat"; then
-     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
-
-     dnl Transform the SED scripts while copying because some dumb SEDs
-     dnl cannot handle comments.
-     sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
-   fi
-   dnl po2tbl.sed is always needed.
-   sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
-
-   dnl In the intl/Makefile.in we have a special dependency which makes
-   dnl only sense for gettext.  We comment this out for non-gettext
-   dnl packages.
-   if test "$PACKAGE" = "gettext"; then
-     GT_NO="#NO#"
-     GT_YES=
-   else
-     GT_NO=
-     GT_YES="#YES#"
-   fi
-   AC_SUBST(GT_NO)
-   AC_SUBST(GT_YES)
-
-   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-   dnl Try to locate is.
-   MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-   fi
-   AC_SUBST(MKINSTALLDIRS)
-
-   dnl *** For now the libtool support in intl/Makefile is not for real.
-   l=
-   AC_SUBST(l)
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.
-   test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
-  ])
diff --git a/config/Default.debian b/config/Default.debian
new file mode 100755
index 00000000..398fd28f
--- /dev/null
+++ b/config/Default.debian
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /etc/X11/Xsession
diff --git a/config/Makefile.am b/config/Makefile.am
index 1f582020..4d09aeb1 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -23,6 +23,7 @@ EXTRA_DIST = \
 	PostSession \
 	PreSession \
 	Default.redhat \
+	Default.debian \
 	Failsafe.redhat
 
 install-data-hook: gdm.conf gnomerc Gnome Failsafe
@@ -51,6 +52,9 @@ install-data-hook: gdm.conf gnomerc Gnome Failsafe
 	if test '!' -f $(sessdir)/Failsafe; then \
 		$(INSTALL_SCRIPT) Failsafe $(sessdir)/Failsafe; \
 	fi
+	if test -e /etc/debian_version; then \
+		$(INSTALL_SCRIPT) $(srcdir)/Default.debian $(sessdir)/Default; \
+	fi
 
 	if test '!' -d $(initdir); then \
 		$(mkinstalldirs) $(initdir); \
diff --git a/configure.in b/configure.in
index ed6a0db9..767ff7c0 100644
--- a/configure.in
+++ b/configure.in
@@ -37,7 +37,8 @@ AC_SUBST(LDFLAGS)
 
 dnl ## internationalization support
 ALL_LINGUAS="az ca cs da de el es et fi fr ga gl hu it ja ko lt nl nn no pl pt_BR ro ru sk sl sv tr uk zh_CN.GB2312 zh_TW.Big5"
-AM_GNOME_GETTEXT
+dnl AM_GNOME_GETTEXT
+AM_GNU_GETTEXT
 
 AC_CHECK_FUNCS([setenv unsetenv])
 
@@ -221,6 +222,18 @@ SESSDIR_TMP="$sysconfdir/gdm/Sessions"
 EXPANDED_SESSDIR=`eval echo $SESSDIR_TMP`
 AC_SUBST(EXPANDED_SESSDIR)
 
+## Stuff for debian/changelog.in
+if test -e "debian/changelog"; then
+  DEBIAN_DATESTAMP=`head -1 debian/changelog| sed -e 's/.*cvs.//' -e 's/).*//'`
+  DEBIAN_DATE=`grep '^ --' debian/changelog | head -1 | sed -e 's/.*  //'`
+else
+  DEBIAN_DATESTAMP=`date +%Y%m%d%H%M%s`
+  DEBIAN_DATE=`date -R`
+fi
+
+AC_SUBST(DEBIAN_DATESTAMP)
+AC_SUBST(DEBIAN_DATE)
+
 prefix=$old_prefix
 exec_prefix=$old_exec_prefix
 
@@ -239,6 +252,7 @@ config/Failsafe
 config/gdm.conf
 config/Gnome
 config/gnomerc
+debian/changelog
 gdm.spec
 ],[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
 
diff --git a/debian/.cvsignore b/debian/.cvsignore
new file mode 100644
index 00000000..4faef453
--- /dev/null
+++ b/debian/.cvsignore
@@ -0,0 +1,2 @@
+*-stamp
+changelog
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 00000000..0eb4ae1a
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,6 @@
+gdm for Debian
+--------------
+
+This was built from CVS...
+
+ -- Ian McKellar <yakk@yakk.net.au>, Mon, 16 Apr 2001 12:06:39 +0800
diff --git a/debian/changelog.in b/debian/changelog.in
new file mode 100644
index 00000000..2f9dd062
--- /dev/null
+++ b/debian/changelog.in
@@ -0,0 +1,10 @@
+gdm (@VERSION@-0.cvs.@DEBIAN_DATESTAMP@) unstable; urgency=low
+
+  * Built from CVS...
+  * Read changelog.old for actual changelog
+
+ -- Ian McKellar <yakk@yakk.net.au>  @DEBIAN_DATE@
+
+Local variables:
+mode: debian-changelog
+End:
diff --git a/debian/changelog.old b/debian/changelog.old
new file mode 100644
index 00000000..d700f41c
--- /dev/null
+++ b/debian/changelog.old
@@ -0,0 +1,257 @@
+gdm (2.0-0.beta4.15) unstable; urgency=low
+
+  * Added xutils dependancy (closes: #76148)
+  * Added patch to remove locale menu, allowing dependancy on locales to
+    be lowered to suggests (closes: #80408)
+  * Apparently X has some issues with all the clients being killed in a row,
+    and doesn't decide to exit.  XDM kills the server instead of the "nice"
+    method, so now we do that, too. (closes: #77163)
+  * Remove non-sensical code that broke %d (closes: #75094)
+  * Add documentation on the face browser (closes: #75091)
+  * It seems updating the cookies already happens, so now the hostname is
+    reread each time the cookies regenerate (closes: #55712)
+  * Remove inappropriate Xsession session.
+  * Fix a syslog() format.
+
+ -- Ryan Murray <rmurray@debian.org>  Sun, 24 Dec 2000 21:43:55 -0800
+
+gdm (2.0-0.beta4.14) unstable; urgency=low
+
+  * Fix file descriptor leak in Xserver logfile.
+
+ -- Ryan Murray <rmurray@debian.org>  Fri,  8 Sep 2000 23:53:49 -0700
+
+gdm (2.0-0.beta4.13) unstable; urgency=low
+
+  * Add -deferglyphs 16 to starting of the X server
+
+ -- Ryan Murray <rmurray@debian.org>  Mon, 21 Aug 2000 22:30:07 -0700
+
+gdm (2.0-0.beta4.12) unstable; urgency=low
+
+  * Remove \n at the end of LANG. (closes: #68331)
+  * Apply uid switch patch (closes: #67364)
+
+ -- Ryan Murray <rmurray@debian.org>  Fri, 11 Aug 2000 04:16:40 -0700
+
+gdm (2.0-0.beta4.11) unstable; urgency=low
+
+  * Allow up to 128 character passwords (Closes: #66727)
+  * Wait until gdm has exited before restarting (Closes: #65446)
+
+ -- Ryan Murray <rmurray@debian.org>  Sun, 16 Jul 2000 13:23:12 -0700
+
+gdm (2.0-0.beta4.10) unstable; urgency=low
+
+  * Update maintainer's e-mail address
+  * Force focus to be on the login window when on the root window and
+    added accelerators for all menus via Alt+letter, including an extra
+    accelerator for ESC to bring down the first menu.  (Closes: #61141, #62837)
+  * Added README.Debian pointing out the manual (Closes: #61609)
+  * Increased delay before restart (didn't close: #65446)
+  * Force English to always be in the language list (Closes: #65538)
+
+ -- Ryan Murray <rmurray@debian.org>  Sun, 18 Jun 2000 18:01:46 -0700
+
+gdm (2.0-0.beta4.9) unstable frozen; urgency=high
+
+  * Fix several security related bugs, including one grave bug
+    (closes: #63255, #61968)
+  * Fix for /etc/environment being read twice (closes: #59042)
+  * Fix for LANG not being set correctly, based on a patch used by
+    redhat (closes: #59044)
+  * Added translations for new locales from CVS.
+  * Removed checking for pidfile in gdm code, as start-stop-daemon does
+    a better job, for Debian.
+  * Added --name to start-stop-daemon line (closes: #59176)
+  * Set default locale in LANG before starting gdmlogin.  This makes
+    GDM's text localized to the setting of DefaultLocale in gdm.conf
+    (closes: #57806)
+  * Changed build system to dbs, from patch system used by egcs at some
+    point.
+  * Fix reference of gdmgreeter in gdmlogin manpage (closes: #63680)
+  * Fix for buffer overflow in xdmcp.c (closes: #63876)
+
+ -- Ryan Murray <rmurray@cyberhqz.com>  Wed, 10 May 2000 02:24:59 -0700
+
+gdm (2.0-0.beta4.8) unstable frozen; urgency=medium
+
+  * Fix for grave password visible bug. (closes: #55886)
+  * Fix for font directive being ignored when gtkrc used (closes: #51374)
+  * Change build process to be more friendly when upstream isn't a CVS version
+  * Added missing build dependancies (closes: #56046)
+  * Moved logfiles to /var/log/gdm (closes: #56018)
+  * Don't start gdm if we're in X on the display it manages, or if it's
+    running (closes: #53992)
+
+ -- Ryan Murray <rmurray@cyberhqz.com>  Sun, 30 Jan 2000 23:16:24 -0800
+
+gdm (2.0-0.beta4.7) unstable frozen; urgency=medium
+
+  * Modified gdm.conf to start up as :0 on vt7, and added conflicts for other
+    display managers.  Release Critical bug fix.  (closes: #53988, #54234)
+  * added dependancy on libpam-modules (closes: #54452)
+  * removed --exec from start-stop-daemon to workaround bug #51953 in dpkg.
+    (closes: #53064)
+  * Added comment for SystemMenu to gdm.conf (closes: #53996)
+  * Made path closer to default login path
+  * Updated Exclude field in gdm.conf
+  * Added text strings describing shutdown/halt
+  * increase purge delay to 15 seconds (closes: #53998)
+
+ -- Ryan Murray <rmurray@cyberhqz.com>  Tue, 18 Jan 2000 00:37:37 -0800
+
+gdm (2.0-0.beta4.6) unstable; urgency=low
+
+  * New maintainer.
+  * Disable XDMCP by default (safer default)
+  * Modified gdm.conf to start up as :1 on vt8 as a default
+  * Updated to Standards-Version 3.1.1
+  * Moved to FHS 2.1 draft (/var/state -> /var/lib)
+  * Applied patch to solve (null) locale/session (Closes: #51846, #52321)
+  * Added pam_env.so to /etc/pam.d/gdm (Closes: #52408)
+  * Applied retry limit patch (Closes: #51103, #53065)
+  * Recompiled with new libesd-dev (Closes: #52245)
+  * Compiled with libwrap0
+  * export MAIL environment variable in Gnome session script (Closes: #53601)
+
+ -- Ryan Murray <rmurray@cyberhqz.com>  Wed, 29 Dec 1999 23:50:43 -0800
+
+gdm (2.0-0.beta4.5) unstable; urgency=low
+
+  * Added a suggests: xsm and corrected /etc/gdm/Sessions/Xsession
+    in order to work even if xsm is not available. Closes: #49632
+  * Enable XDMCP by default. Closes: #49104
+  * Updated the copyright file.
+  * Cleaned the .diff.gz and the rules file.
+  * Corrected the man pages.
+
+ -- Raphael Hertzog <hertzog@debian.org>  Tue,  9 Nov 1999 23:38:24 +0100
+
+gdm (2.0-0.beta4.4) unstable; urgency=low
+
+  * Removed the explicit setting of the virtual terminal. It was
+    causing problem to people who have getty running on vt8 ...
+  * Corrected /etc/gdm/Sessions/Gnome to work with OpenSSH.
+    Closes: #49443
+
+ -- Raphael Hertzog <hertzog@debian.org>  Thu,  4 Nov 1999 19:53:01 +0100
+
+gdm (2.0-0.beta4.3) unstable; urgency=low
+
+  * Session/Gnome: doesn't set the PATH since gdm does already take
+    care of this. Closes: #48310
+  * Session/Xsession: calls freetemp only if it's available. 
+    Closes: #47916
+  * Put a symlink /etc/X11/gdm -> ../gdm. Closes: #46898
+  * Now use /etc/locale.alias instead of its own file. 
+    Closes: #47915 
+
+ -- Raphael Hertzog <hertzog@debian.org>  Wed, 27 Oct 1999 14:33:49 +0200
+
+gdm (2.0-0.beta4.2) unstable; urgency=low
+
+  * Changed gdm.conf to explicitely give the virtual console
+    to use. Default to "vt8 :1" in order to avoid problems.
+    I hope that it closes: #47425, #47451
+
+ -- Raphael Hertzog <hertzog@debian.org>  Sat, 16 Oct 1999 18:37:17 +0200
+
+gdm (2.0-0.beta4.1) unstable; urgency=low
+
+  * New maintainer.
+  * Until a proper solution is found, gdm will conflict with xdm, kdm and
+    wdm. Closes: #46378
+  * Corrected the priority number for init.d scripts K99 -> K01.
+    Closes: #46379
+  * Recommends gnome-session ...
+  * Bug closed by previous NMU :
+    closes: #33471, #35672, #36284, #37780, #38034, #38343, #39433, #39703
+    closes: #40293, #40308, #41157, #42440, #42493, #42636, #43095, #43667
+    closes: #45719, #45916
+
+ -- Raphael Hertzog <hertzog@debian.org>  Tue, 12 Oct 1999 22:26:43 +0200
+
+gdm (2.0-0.beta4) unstable; urgency=low
+
+  * NMU
+  * New upstream version.
+  * Be more careful for creating user/group. Closes: #45916
+
+ -- Raphael Hertzog <hertzog@debian.org>  Thu, 30 Sep 1999 20:54:45 +0200
+
+gdm (2.0-0.beta3) unstable; urgency=low
+
+  * NMU.
+  * New upstream version of gdm (still beta but it does work contrary to
+    gdm1). Closes: #45719
+  * Does show all users (list of exclusion does exist in gdm.conf)
+    Closes: #42440, #42493
+  * The X connection problem is solved with this version. 
+    Closes: #42636, #43667, #43095
+  * The macros stuff has moved in /usr/share/aclocal/gnome. 
+    Closes: #40293
+  * gdm is very kind with xserver badly configured. Closes: #35672
+  * gdm cleans (not too much however) the environment. MAIL is removed.
+    Closes: #33471
+  * gdm does restart well. Closes: #38034
+  * You can select your language/sessions. Closes: #38343
+  * Gdm and xscreensaver do work correctly together. Closes: #39703
+  * Gdmgreeter does start. Closes: #40308
+  * Gdm does use :1 by default. Closes: #36284, #37780, #41157
+  * Gdm does now include /usr/games in the PATH. Closes: #39433
+
+ -- Raphael Hertzog <rhertzog@hrnet.fr>  Tue, 21 Sep 1999 20:25:01 +0200
+
+gdm2 (0+cvs19990428-1) experimental; urgency=low
+
+  * Experimental build of gdm2
+
+ -- Steve Haslam <araqnid@debian.org>  Mon, 17 May 1999 13:09:22 +0100
+
+gdm (1.0.0-6) unstable; urgency=low
+
+  * Don't automatically restart gdm
+  * Change init.d restart behaviour, no longer set -e.
+  * Made substantial changes to /etc/gdm/Sessions/Gnome; removed /etc/gnomerc 
+    as a result
+
+ -- Steve Haslam <araqnid@debian.org>  Wed,  5 May 1999 23:39:08 +0100
+
+gdm (1.0.0-5) unstable; urgency=low
+
+  * Replaced the PAM config again.  
+  * Remove po/*.gmo files when cleaning because changes to them can't be
+    represented in .diff.gz files
+
+ -- Steve Haslam <araqnid@debian.org>  Wed, 21 Apr 1999 17:19:16 +0100
+
+gdm (1.0.0-4) unstable; urgency=low
+
+  * Major rewrite of packaging files- now using .dpatch files to hold changes
+  * Added -lnsl to LIBS when using -lwrap (from cpbs@debian.org)
+
+ -- Steve Haslam <araqnid@debian.org>  Tue, 20 Apr 1999 02:48:32 +0100
+
+gdm (1.0.0-3) unstable; urgency=low
+
+  * Make /etc/gdm/Init/:0 a conffile too
+
+ -- Steve Haslam <araqnid@debian.org>  Sat, 27 Mar 1999 14:08:55 +0000
+
+gdm (1.0.0-2) unstable; urgency=low
+
+  * Use "update-rc.d gdm defaults 99"
+  * Don't strip x mode from /etc/gnomerc
+
+ -- Steve Haslam <araqnid@debian.org>  Mon, 22 Mar 1999 19:55:48 +0000
+
+gdm (1.0.0-1) unstable; urgency=low
+
+  * Initial version.
+
+ -- Steve Haslam <araqnid@debian.org>  Thu, 18 Mar 1999 21:27:20 +0000
+
+Local variables:
+mode: debian-changelog
+End:
diff --git a/debian/control b/debian/control
new file mode 100644
index 00000000..996c3295
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,24 @@
+Source: gdm
+Section: x11
+Priority: optional
+Maintainer: Ryan Murray <rmurray@debian.org>
+Build-Depends: libpam0g-dev, libgnome-dev, libwrap0-dev, debhelper, automake, autoconf, gettext, libtool
+Standards-Version: 3.1.1
+
+Package: gdm
+Architecture: any
+Depends: ${shlibs:Depends}, libpam-modules (>= 0.72-1), xutils, adduser
+Recommends: gnome-session
+Suggests: xsm, locales
+Conflicts: wdm, xdm, kdm
+Description: GNOME Display Manager
+ gdm provides the equivalent of a "login:" prompt for X displays- it
+ pops up a login window and starts an X session.
+ .
+ It provides all the functionality of xdm, including XDMCP support for
+ managing remote displays.
+ .
+ The greeting window is written using the GNOME libraries and hence
+ looks like a GNOME application- even to the extent of supporting
+ themes! By default, the greeter is run as an unprivileged user for
+ security.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 00000000..065dbb3c
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,12 @@
+This package originally Debianised by Steve Haslam <steve@arise.demon.co.uk>,
+10th March 1999. It was maintained by Raphaël Hertzog <hertzog@debian.org>
+until December 1999.  It is now maintained by
+Ryan Murray <rmurray@debian.org>. This packaging was done by 
+Ian McKellar <yakk@yakk.net.au>.
+
+Copyright (C) 1998, 1999 Martin Kasper Petersen <mkp@SunSITE.auc.dk>
+
+Originally obtained from GNOME: ftp.gnome.org
+
+License: GPL
+
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 00000000..6af1307c
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,11 @@
+var/log/gdm
+var/lib/gdm
+usr/share/faces
+usr/share/hosts
+etc/pam.d
+etc/X11
+etc/X11/gdm/Init
+etc/X11/gdm/Sessions
+etc/X11/gdm/PreSession
+etc/X11/gdm/PostSession
+usr/sbin
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 00000000..298cdd55
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,6 @@
+INSTALL
+NEWS
+README
+README.install
+README.install
+TODO
diff --git a/debian/ex.doc-base.package b/debian/ex.doc-base.package
new file mode 100644
index 00000000..5bc80a65
--- /dev/null
+++ b/debian/ex.doc-base.package
@@ -0,0 +1,22 @@
+Document: gdm
+Title: Debian gdm Manual
+Author: <insert document author here>
+Abstract: This manual describes what gdm is
+ and how it can be used to
+ manage online manuals on Debian systems.
+Section: unknown
+
+Format: debiandoc-sgml
+Files: /usr/share/doc/gdm/gdm.sgml.gz
+
+Format: postscript
+Files: /usr/share/doc/gdm/gdm.ps.gz
+
+Format: text
+Files: /usr/share/doc/gdm/gdm.text.gz
+
+Format: HTML
+Index: /usr/share/doc/gdm/html/index.html
+Files: /usr/share/doc/gdm/html/*.html
+
+  
diff --git a/debian/gdm.pod b/debian/gdm.pod
new file mode 100644
index 00000000..543a3a6a
--- /dev/null
+++ b/debian/gdm.pod
@@ -0,0 +1,51 @@
+=head1 NAME
+
+gdm - GNOME Display Manager
+
+=head1 SYNOPSIS
+
+gdm
+
+=head1 DESCRIPTION
+
+B<gdm> is the equivalent of xdm(1x) or wdm(1x), but uses the GNOME
+libraries to provide a GNOME look-and-feel. It provides the GNOME
+equivalent of a "login:" prompt.
+
+The full B<gdm> manual is installed as
+F</usr/share/gnome/help/gdm/C/index.html> on your system. This is only a brief
+summary - the HTML manual is the canonical documentation.
+
+B<gdm> reads F</etc/gdm/gdm.conf> for its configuration. For each
+local display, gdm starts an X server and runs gdmlogin(8x) on that
+display. The main gdm process also listens for XDMCP requests from
+remote displays. These requests can either be direct, causing B<gdm>
+to start a gdmlogin(8x) on the remote display, or indirect, causeing 
+a gdmchooser(8x) to be opened.
+
+When managing a display, B<gdm> attempts to execute
+F</etc/gdm/Init/>I<display>, or F</etc/gdm/Init/Default> if that does
+not exist. When a user logs in, B<gdm> first attempts
+F</etc/gdm/PreSession/>I<display> (or F</etc/gdm/PreSession/Default>),
+and then one of the sessions in F</etc/gdm/Sessions>. When the session
+has completed, B<gdm> attempts to run
+F</etc/gdm/PostSession/>I<display>, or
+F</etc/gdm/PostSession/>I<Default>. Of all these files, only the
+F</etc/gdm/Sessions> one is required to exist.
+
+B<gdm> maintains information about the displays it is managing in
+F</var/lib/gdm>. This includes xauth information, so this directory
+is not readable to normal users.
+
+B<gdm> uses PAM to perform authentication using the config file
+F</etc/pam.d/gdm>.
+
+=head1 AUTHOR
+
+Martin Kasper Petersen <mkp@SunSITE.auc.dk>
+
+This manual page written by Steve Haslam <araqnid@debian.org> for
+Debian GNU/Linux. Updated by Raphaël Hertzog <hertzog@debian.org>.
+Updated by Ryan Murray <rmurray@debian.org>.
+
+=cut
diff --git a/debian/gdmchooser.pod b/debian/gdmchooser.pod
new file mode 100644
index 00000000..afa15707
--- /dev/null
+++ b/debian/gdmchooser.pod
@@ -0,0 +1,26 @@
+=head1 NAME
+
+gdmchooser - GNOME Display Manager host chooser window
+
+=head1 SYNOPSIS
+
+gdmchooser
+
+=head1 DESCRIPTION
+
+B<gdmchooser> is invoked by gdm(8). It displays a list of hosts that
+are candidates for logging into via a gdm(8) daemon or compatible,
+such as xdm(1x) or wdm(1x).
+
+=head1 SEE ALSO
+
+gdm(8)
+
+=head1 AUTHOR
+
+Martin Kasper Petersen <mkp@SunSITE.auc.dk>
+
+This manual page written by Steve Haslam <araqnid@debian.org> for
+Debian GNU/Linux.
+
+=cut
diff --git a/debian/gdmlogin.pod b/debian/gdmlogin.pod
new file mode 100644
index 00000000..9e77630c
--- /dev/null
+++ b/debian/gdmlogin.pod
@@ -0,0 +1,27 @@
+=head1 NAME
+
+gdmlogin - GNOME Display Manager greeting window
+
+=head1 SYNOPSIS
+
+gdmlogin
+
+=head1 DESCRIPTION
+
+B<gdmlogin> is invoked by gdm(8). It displays a GNOME login window
+and obtains a login/password combination from the user. This is then
+sent to the controlling B<gdm> process for verification.
+
+=head1 SEE ALSO
+
+gdm(8)
+
+=head1 AUTHOR
+
+Martin Kasper Petersen <mkp@SunSITE.auc.dk>
+
+This manual page written by Steve Haslam <araqnid@debian.org> for
+Debian GNU/Linux. Updated by Raphaël Hertzog <hertzog@debian.org>.
+Updated by Ryan Murray <rmurray@debian.org>.
+
+=cut
diff --git a/debian/init b/debian/init
new file mode 100644
index 00000000..43453ee4
--- /dev/null
+++ b/debian/init
@@ -0,0 +1,69 @@
+#! /bin/sh
+#
+# skeleton	example file to build /etc/init.d/ scripts.
+#		This file should be used to construct scripts for /etc/init.d.
+#
+#		Written by Miquel van Smoorenburg <miquels@cistron.nl>.
+#		Modified for Debian GNU/Linux
+#		by Ian Murdock <imurdock@gnu.ai.mit.edu>.
+#
+# Version:	@(#)skeleton  1.8  03-Mar-1998  miquels@cistron.nl
+#
+
+# Modified for gdm, Steve Haslam <steve@arise.dmeon.co.uk> 14mar99
+# modified to remove --exec, as it does not work on upgrades. 18jan2000
+# modified to use --name, to detect stale PID files 18mar2000
+# sleep until gdm dies, then restart it 16jul2000
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/gdm
+NAME=gdm
+DESC="GNOME Display Manager"
+
+test -f $DAEMON || exit 0
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --name $NAME --exec $DAEMON
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop  --quiet --pidfile /var/run/$NAME.pid --name $NAME
+	echo "$NAME."
+	;;
+  #reload)
+	#
+	#	If the daemon can reload its config files on the fly
+	#	for example by sending it SIGHUP, do it here.
+	#
+	#	If the daemon responds to changes in its config file
+	#	directly anyway, make this a do-nothing entry.
+	#
+	# echo "Reloading $DESC configuration files."
+	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
+	#	/var/run/$NAME.pid --exec $DAEMON
+  #;;
+  restart|force-reload)
+	#
+	#	If the "reload" option is implemented, move the "force-reload"
+	#	option to the "reload" entry above. If not, "force-reload" is
+	#	just the same as "restart".
+	#
+	$0 stop
+	# gdm may take awhile to shutdown.  We'll wait for it.
+	while start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid --signal 0 --name $NAME; do
+	    sleep 1
+	done
+	$0 start
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/debian/postinst b/debian/postinst
new file mode 100644
index 00000000..6c826eb6
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+set +e 
+
+# is everything in place ?
+if [ ! -x "`which adduser`" ]; then 
+        echo "I need adduser(8) from the adduser.deb package !";
+        exit 1;
+fi
+if [ ! -x "`which addgroup`" ]; then 
+        echo "I need addgroup(8) from the adduser.deb package !";
+        exit 1;
+fi
+if [ ! -x "`which usermod`" ]; then
+        echo "I need usermod(8) from the passwd.deb package !";
+        exit 1;
+fi
+
+# creating gdm group if he isn't already there
+if ! grep -q ^gdm: /etc/group; then
+        echo Adding system group: gdm.
+        addgroup gdm
+fi
+
+# creating gdm user if he isn't already there
+if ! grep -q ^gdm: /etc/passwd; then
+        echo Adding system user: gdm.
+        adduser --system --ingroup gdm --home /var/lib/gdm gdm
+fi
+
+usermod -c "Gnome Display Manager" gdm
+usermod -d "/var/lib/gdm"          gdm
+usermod -g "gdm"                   gdm
+usermod -s "/bin/false"            gdm
+
+set -e
+
+if [ -d /var/lib/gdm ]; then
+  chown -R gdm:gdm /var/lib/gdm
+  chmod 0750 /var/lib/gdm
+fi
+
+# based on xdm's postinst by Branden Robinson
+
+# don't start gdm if we're currently in X on the display it attempts to
+# manage by default.
+nostart=
+gdm_running=
+for hostname in "" "localhost" "$(hostname)" "$(hostname -f)"; do
+  if echo $DISPLAY | grep -q "^$hostname:0.*"; then
+    nostart=yes
+  fi
+done
+
+# or if it's already running
+# NOTE: the binary on disk most likely has changed, so we can't use --exec
+if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/gdm.pid; then
+  nostart=yes
+  gdm_running=yes
+fi
+
+update-rc.d gdm defaults 99 01 >/dev/null
+
+if [ -d /var/state/gdm ]; then
+  if [ "$gdm_running" ]; then
+    echo "Note: obsolete directory /var/state/gdm cannot be removed when gdm"
+    echo "is running.  Reinstall the gdm package (or remove the directory"
+    echo "manually) when gdm is not running."
+  else
+    rm -r /var/state/gdm
+  fi
+fi
+
+[ "$nostart" ] || /etc/init.d/gdm start || true
+
+#DEBHELPER#
diff --git a/debian/postrm b/debian/postrm
new file mode 100644
index 00000000..d2440304
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# Automatically added by dh_installinit
+if [ "$1" = "purge" ] ; then
+	update-rc.d gdm remove >/dev/null
+fi
+# End automatically added section
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 00000000..2df8198c
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,88 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=3
+
+debbuilt = debian/gdm.8 debian/gdmchooser.8 debian/gdmlogin.8
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc/X11
+
+	touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+	#/usr/bin/docbook-to-man debian/gdm.sgml > gdm.1
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) distclean
+
+	dh_clean
+
+install: build $(debbuilt)
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/gdm.
+	$(MAKE) install prefix=$(CURDIR)/debian/gdm/usr sysconfdir=$(CURDIR)/debian/gdm/etc/X11
+
+%.8: %.pod
+	pod2man --section=8 --release="GNOME 1.4" --center="Debian GNU/Linux" $< | sed -e 's/debian:://'> $@
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+#	dh_installdebconf	
+	dh_installdocs
+	dh_installexamples
+	dh_installmenu
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+	dh_installcron
+	dh_installman
+	dh_installinfo
+#	dh_undocumented
+	dh_installchangelogs ChangeLog
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_makeshlibs
+	dh_installdeb
+#	dh_perl
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/po/ChangeLog b/po/ChangeLog
index ba2a5ea1..32ee27fc 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-17  Ian McKellar  <ian@eazel.com>
+
+	* nn.po: Changed the encoding to iso-8859-1 - it was breaking my
+	build and George said that this was the right thing to set it to.
+
 Sun Apr 15 21:59:06 2001  George Lebl <jirka@5z.com>
 
 	* cs.po: update the czech translation a bit
diff --git a/po/nn.po b/po/nn.po
index 8dc420d1..e40bd2bf 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: Gaute Hvoslef Kvalnes <ai98ghk@stud.hib.no>\n"
 "Language-Team: Norwegian (Nynorsk)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: daemon/gdm.c:119