r10623 - in /desktop/unstable/gdm/debian: Xsession changelog copyright extract-locales gdm-autologin.pam gdm.pam gdm.pod gdmflexiserver.pod init postinst postrm prerm rules

lool at users.alioth.debian.org lool at users.alioth.debian.org
Tue May 1 11:42:05 UTC 2007


Author: lool
Date: Tue May  1 11:42:04 2007
New Revision: 10623

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10623
Log:
* Misc cleanups.

Modified:
    desktop/unstable/gdm/debian/Xsession
    desktop/unstable/gdm/debian/changelog
    desktop/unstable/gdm/debian/copyright
    desktop/unstable/gdm/debian/extract-locales
    desktop/unstable/gdm/debian/gdm-autologin.pam
    desktop/unstable/gdm/debian/gdm.pam
    desktop/unstable/gdm/debian/gdm.pod
    desktop/unstable/gdm/debian/gdmflexiserver.pod
    desktop/unstable/gdm/debian/init
    desktop/unstable/gdm/debian/postinst
    desktop/unstable/gdm/debian/postrm
    desktop/unstable/gdm/debian/prerm
    desktop/unstable/gdm/debian/rules

Modified: desktop/unstable/gdm/debian/Xsession
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/Xsession?rev=10623&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/Xsession (original)
+++ desktop/unstable/gdm/debian/Xsession Tue May  1 11:42:04 2007
@@ -139,7 +139,7 @@
 # clean up after xbanner
 freetemp=`which freetemp 2>/dev/null`
 if [ -n "$freetemp" ] ; then
-	"$freetemp"
+        "$freetemp"
 fi
 
 usermodmap="$HOME/.Xmodmap"
@@ -162,11 +162,11 @@
 # if GDM_LANG isn't first in LANGUAGE, then unset it.
 if [ -n "$GDM_LANG" ]; then
     if [ -n "$LANGUAGE" ]; then
-	if echo "$LANGUAGE" | grep -q -- "^$GDM_LANG"; then
-	   :
-	else
-	   unset LANGUAGE
-	fi
+        if echo "$LANGUAGE" | grep -q -- "^$GDM_LANG"; then
+           :
+        else
+           unset LANGUAGE
+        fi
     fi
 fi
 
@@ -191,7 +191,7 @@
 echo "$0: Executing $command failed, will try to run x-terminal-emulator"
 
 if [ -n "$zenity" ] ; then
-	"$zenity" --info --text "`gettextfunc "I could not start your session and so I have started the failsafe xterm session.  Windows now have focus only if you have your cursor above them.  To get out of this mode type 'exit' in the window in the upper left corner"`"
+        "$zenity" --info --text "`gettextfunc "I could not start your session and so I have started the failsafe xterm session.  Windows now have focus only if you have your cursor above them.  To get out of this mode type 'exit' in the window in the upper left corner"`"
 fi
 
 exec x-terminal-emulator -geometry 80x24+0+0

Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=10623&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Tue May  1 11:42:04 2007
@@ -29,8 +29,9 @@
     similarly to CDBS and finally compute MAJOR_MINOR for the GNOME version
     included in the footer of man pages.
   * Update watch file to track all stable releases.
-
- -- Loic Minier <lool at dooz.org>  Tue, 01 May 2007 13:15:30 +0200
+  * Misc cleanups.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 01 May 2007 13:41:57 +0200
 
 gdm (2.16.4-1.1) unstable; urgency=low
 

Modified: desktop/unstable/gdm/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/copyright?rev=10623&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/copyright (original)
+++ desktop/unstable/gdm/debian/copyright Tue May  1 11:42:04 2007
@@ -13,12 +13,12 @@
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
- 
+
     This package is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     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
     along with this package; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA

Modified: desktop/unstable/gdm/debian/extract-locales
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/extract-locales?rev=10623&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/extract-locales (original)
+++ desktop/unstable/gdm/debian/extract-locales Tue May  1 11:42:04 2007
@@ -10,31 +10,31 @@
 
 chdir("/usr/share/i18n/locales") or die "can't find /usr/share/i18n/locales";
 while (<>) {
-	my $language;
-	my $territory;
-	chomp;
-	@line = split / /;
-	($file = $line[0]) =~ s/\..*$//;
-	open F, $file or die "can't open $file\n";
-	while (<F>) {
-		chomp;
-		$title = $1 if /^title\s+"(.*)"/;
-		$language = $1 if /^language\s+"(.*)"/;
-		$territory = $1 if /^territory\s+"(.*)"/;
-		last if /^END LC_IDENTIFICATION/;
-	}
-	close F;
+        my $language;
+        my $territory;
+        chomp;
+        @line = split / /;
+        ($file = $line[0]) =~ s/\..*$//;
+        open F, $file or die "can't open $file\n";
+        while (<F>) {
+                chomp;
+                $title = $1 if /^title\s+"(.*)"/;
+                $language = $1 if /^language\s+"(.*)"/;
+                $territory = $1 if /^territory\s+"(.*)"/;
+                last if /^END LC_IDENTIFICATION/;
+        }
+        close F;
 
-	if ($always_charset and $line[1] and $line[0] =~ s/(\@.*)$//) {
-		my $suffix = $1;
-		$line[1] =~ s/$/$suffix/;
-	}
+        if ($always_charset and $line[1] and $line[0] =~ s/(\@.*)$//) {
+                my $suffix = $1;
+                $line[1] =~ s/$/$suffix/;
+        }
 
-	$language =~ s/ /_/g;
-	$territory =~ s/ /_/g;
-	if (!$always_charset or $line[0] =~ /\./) {
-		print "$language($territory)\t$line[0]\n";
-	} else {
-		print "$language($territory)\t$line[0].$line[1]\n";
-	}
+        $language =~ s/ /_/g;
+        $territory =~ s/ /_/g;
+        if (!$always_charset or $line[0] =~ /\./) {
+                print "$language($territory)\t$line[0]\n";
+        } else {
+                print "$language($territory)\t$line[0].$line[1]\n";
+        }
 }

Modified: desktop/unstable/gdm/debian/gdm-autologin.pam
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdm-autologin.pam?rev=10623&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/gdm-autologin.pam (original)
+++ desktop/unstable/gdm/debian/gdm-autologin.pam Tue May  1 11:42:04 2007
@@ -1,9 +1,9 @@
 #%PAM-1.0
-auth	requisite	pam_nologin.so
-auth	required	pam_env.so readenv=1
-auth	required	pam_env.so readenv=1 envfile=/etc/default/locale
-auth	required	pam_permit.so
+auth    requisite       pam_nologin.so
+auth    required        pam_env.so readenv=1
+auth    required        pam_env.so readenv=1 envfile=/etc/default/locale
+auth    required        pam_permit.so
 @include common-account
-session	required	pam_limits.so
+session required        pam_limits.so
 @include common-session
 @include common-password

Modified: desktop/unstable/gdm/debian/gdm.pam
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdm.pam?rev=10623&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/gdm.pam (original)
+++ desktop/unstable/gdm/debian/gdm.pam Tue May  1 11:42:04 2007
@@ -1,9 +1,9 @@
 #%PAM-1.0
-auth	requisite	pam_nologin.so
-auth	required	pam_env.so readenv=1
-auth	required	pam_env.so readenv=1 envfile=/etc/default/locale
+auth    requisite       pam_nologin.so
+auth    required        pam_env.so readenv=1
+auth    required        pam_env.so readenv=1 envfile=/etc/default/locale
 @include common-auth
 @include common-account
-session	required	pam_limits.so
+session required        pam_limits.so
 @include common-session
 @include common-password

Modified: desktop/unstable/gdm/debian/gdm.pod
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdm.pod?rev=10623&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/gdm.pod (original)
+++ desktop/unstable/gdm/debian/gdm.pod Tue May  1 11:42:04 2007
@@ -16,7 +16,7 @@
 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 
+to start a gdmlogin(8x) on the remote display, or indirect, causing
 a gdmchooser(8x) to be opened.
 
 When managing a display, B<gdm> attempts to execute

Modified: desktop/unstable/gdm/debian/gdmflexiserver.pod
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdmflexiserver.pod?rev=10623&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/gdmflexiserver.pod (original)
+++ desktop/unstable/gdm/debian/gdmflexiserver.pod Tue May  1 11:42:04 2007
@@ -5,7 +5,7 @@
 
 =head1 SYNOPSIS
 
-B<gdmflexiserver>	GNOME options	gdmflexiserver options
+B<gdmflexiserver>       GNOME options   gdmflexiserver options
 
 =head1 DESCRIPTION
 

Modified: desktop/unstable/gdm/debian/init
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/init?rev=10623&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/init (original)
+++ desktop/unstable/gdm/debian/init Tue May  1 11:42:04 2007
@@ -10,7 +10,7 @@
 # Description:       Debian init script for the GNOME Display Manager
 ### END INIT INFO
 #
-# Author:	Ryan Murray <rmurray at debian.org>
+# Author:       Ryan Murray <rmurray at debian.org>
 #
 set -e
 
@@ -34,37 +34,37 @@
 
 case "$1" in
   start)
-  	if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" -a "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" -a "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)" != "$DEBCONF_DAEMON" ]; then
-		log_action_msg "Not starting GNOME Display Manager; it is not the default display manager"
-	else
-		log_daemon_msg "Starting GNOME Display Manager" "gdm"
-		start_daemon $DAEMON
-		log_end_msg $?
-	fi
+        if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" -a "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" -a "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)" != "$DEBCONF_DAEMON" ]; then
+                log_action_msg "Not starting GNOME Display Manager; it is not the default display manager"
+        else
+                log_daemon_msg "Starting GNOME Display Manager" "gdm"
+                start_daemon $DAEMON
+                log_end_msg $?
+        fi
   ;;
   stop)
-	log_daemon_msg "Stopping GNOME Display Manager" "gdm"
-	set +e
-	start-stop-daemon --stop --quiet --pidfile /var/run/gdm.pid \
-		--name gdm --retry 5
-	set -e
-	log_end_msg $?
+        log_daemon_msg "Stopping GNOME Display Manager" "gdm"
+        set +e
+        start-stop-daemon --stop --quiet --pidfile /var/run/gdm.pid \
+                --name gdm --retry 5
+        set -e
+        log_end_msg $?
   ;;
   reload)
-  	log_daemon_msg "Scheduling reload of GNOME Display Manager configuration" "gdm"
-	set +e
-	start-stop-daemon --stop --signal USR1 --quiet --pidfile \
-		/var/run/gdm.pid --name gdm
-	set -e
-	log_end_msg $?
+        log_daemon_msg "Scheduling reload of GNOME Display Manager configuration" "gdm"
+        set +e
+        start-stop-daemon --stop --signal USR1 --quiet --pidfile \
+                /var/run/gdm.pid --name gdm
+        set -e
+        log_end_msg $?
   ;;
   restart|force-reload)
-	$0 stop
-	$0 start
+        $0 stop
+        $0 start
   ;;
   *)
-	echo "Usage: /etc/init.d/gdm {start|stop|restart|reload|force-reload}"
-	exit 1
+        echo "Usage: /etc/init.d/gdm {start|stop|restart|reload|force-reload}"
+        exit 1
   ;;
 esac
 

Modified: desktop/unstable/gdm/debian/postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/postinst?rev=10623&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/postinst (original)
+++ desktop/unstable/gdm/debian/postinst Tue May  1 11:42:04 2007
@@ -15,10 +15,10 @@
 # creating gdm user if he isn't already there
 if ! getent passwd gdm >/dev/null; then
         adduser --system --ingroup gdm --home /var/lib/gdm gdm
-	usermod -c "Gnome Display Manager" gdm
-	usermod -d "/var/lib/gdm"          gdm
-	usermod -g "gdm"                   gdm
-	usermod -s "/bin/false"            gdm
+        usermod -c "Gnome Display Manager" gdm
+        usermod -d "/var/lib/gdm"          gdm
+        usermod -g "gdm"                   gdm
+        usermod -s "/bin/false"            gdm
 fi
 
 if [ -d /var/lib/gdm ]; then

Modified: desktop/unstable/gdm/debian/postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/postrm?rev=10623&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/postrm (original)
+++ desktop/unstable/gdm/debian/postrm Tue May  1 11:42:04 2007
@@ -1,22 +1,23 @@
 #!/bin/sh
+
 if [ "$1" = "purge" ] ; then
-	update-rc.d gdm remove >/dev/null
-	rm -f /etc/default/gdm
-	if [ -d /etc/gdm ]; then
-		rmdir --ignore-fail-on-non-empty /etc/gdm/Init /etc/gdm/PreSession /etc/gdm/PostSession /etc/gdm/PostLogin /etc/gdm/Sessions /etc/gdm 2>/dev/null
-	fi
-	if [ -d /var/lib/gdm ]; then
-		rm -r /var/lib/gdm
-	fi
-	if [ -d /var/log/gdm ]; then
-		rm -r /var/log/gdm
-	fi
-	if getent passwd gdm >/dev/null; then
-		deluser gdm
-	fi
-	if getent group gdm >/dev/null; then
-		delgroup gdm
-	fi
+        update-rc.d gdm remove >/dev/null
+        rm -f /etc/default/gdm
+        if [ -d /etc/gdm ]; then
+                rmdir --ignore-fail-on-non-empty /etc/gdm/Init /etc/gdm/PreSession /etc/gdm/PostSession /etc/gdm/PostLogin /etc/gdm/Sessions /etc/gdm 2>/dev/null
+        fi
+        if [ -d /var/lib/gdm ]; then
+                rm -r /var/lib/gdm
+        fi
+        if [ -d /var/log/gdm ]; then
+                rm -r /var/log/gdm
+        fi
+        if getent passwd gdm >/dev/null; then
+                deluser gdm
+        fi
+        if getent group gdm >/dev/null; then
+                delgroup gdm
+        fi
 fi
 #DEBHELPER#
 exit 0

Modified: desktop/unstable/gdm/debian/prerm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/prerm?rev=10623&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/prerm (original)
+++ desktop/unstable/gdm/debian/prerm Tue May  1 11:42:04 2007
@@ -22,24 +22,24 @@
       db_get shared/default-x-display-manager
       # are we removing the currently selected display manager?
       if [ "$THIS_PACKAGE" = "$RET" ]; then
-	if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
-	  db_get "$RET"/daemon_name
-	  if [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" = "$RET" ]; then
-	    rm "$DEFAULT_DISPLAY_MANAGER_FILE"
-	  fi
-	fi
-	# ask the user to choose a new default
+        if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+          db_get "$RET"/daemon_name
+          if [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" = "$RET" ]; then
+            rm "$DEFAULT_DISPLAY_MANAGER_FILE"
+          fi
+        fi
+        # ask the user to choose a new default
         db_fset shared/default-x-display-manager seen false
         db_input critical shared/default-x-display-manager || true
         db_go
-	# if the display manager file doesn't exist, write it with the path
-	# to the new default display manager
-	if [ ! -e $DEFAULT_DISPLAY_MANAGER_FILE ]; then
-	  db_get shared/default-x-display-manager
-	  echo "Please be sure to run \"dpkg-reconfigure $RET\"."
-	  db_get "$RET"/daemon_name
-	  echo "$RET" > "$DEFAULT_DISPLAY_MANAGER_FILE"
-	fi
+        # if the display manager file doesn't exist, write it with the path
+        # to the new default display manager
+        if [ ! -e $DEFAULT_DISPLAY_MANAGER_FILE ]; then
+          db_get shared/default-x-display-manager
+          echo "Please be sure to run \"dpkg-reconfigure $RET\"."
+          db_get "$RET"/daemon_name
+          echo "$RET" > "$DEFAULT_DISPLAY_MANAGER_FILE"
+        fi
       fi
     fi
   fi
@@ -50,7 +50,7 @@
     nostop=
     for hostname in "" "localhost" "$(hostname)" "$(hostname -f)"; do
       if echo $DISPLAY | grep -q "^$hostname:0.*"; then
-	nostop=yes
+        nostop=yes
       fi
     done
     if [ -z $nostop ]; then

Modified: desktop/unstable/gdm/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/rules?rev=10623&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/rules (original)
+++ desktop/unstable/gdm/debian/rules Tue May  1 11:42:04 2007
@@ -1,9 +1,4 @@
 #!/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
 
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
@@ -15,58 +10,57 @@
 
 DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
+configure_flags += --disable-dependency-tracking \
+		--with-tags= \
+		--prefix=/usr \
+		--libexecdir=\$${prefix}/lib \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--sysconfdir=/etc \
+		--libexecdir=\$${prefix}/lib/gdm \
+		--localstatedir=/var/lib \
+		--with-custom-conf=/etc/gdm/gdm.conf
+
 ifeq (linux,$(DEB_HOST_ARCH_OS))
-	SELINUX_CONFIGURE = --with-selinux
+	configure_flags += --with-selinux
 else
-	SELINUX_CONFIGURE = --without-selinux
+	configure_flags += --without-selinux
 endif
+
+MANPAGES += debian/gdm.8 \
+	debian/gdmlogin.8 \
+	debian/gdmchooser.8 \
+	debian/gdmflexiserver.1
 
 PATCH_DIR := debian/patches
 
 patch: patch-stamp
-
 patch-stamp:
 	dh_testdir
 	# apply patches
-	QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2
+	QUILT_PATCHES=$(PATCH_DIR) \
+		quilt --quiltrc /dev/null push -a || test $$? = 2
 	touch $@
 
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
-	./configure --disable-dependency-tracking --with-tags= --prefix=/usr --libexecdir=\$${prefix}/lib --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=\$${prefix}/lib/gdm --localstatedir=/var/lib $(SELINUX_CONFIGURE) --with-custom-conf=/etc/gdm/gdm.conf
+	./configure $(configure_flags)
 	touch configure-stamp
 
-build: configure-stamp build-stamp
-build-stamp: debian/gdm.8 debian/gdmlogin.8 debian/gdmchooser.8 debian/gdmflexiserver.1
+build: build-stamp
+build-stamp: configure-stamp $(MANPAGES)
 	dh_testdir
-
 	$(MAKE)
 	sh debian/debian-moreblue.shar
-
 	touch build-stamp
-
-clean::
-	dh_testdir
-	dh_testroot
-	-$(MAKE) distclean
-	# unapply patches, if any
-	QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2
-	-rm -rf .pc
-	rm -f build-stamp configure-stamp patch-stamp
-	rm -rf debian/debian-moreblue
-
-	dh_clean debian/gdm.8 debian/gdmlogin.8 debian/gdmchooser.8 debian/gdmflexiserver.1 po/*.gmo po/.intltool-merge-cache config/gnome.desktop config/CDE.desktop config/default.desktop
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
-	# Add here commands to install the package into debian/gdm.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/gdm \
-		install
+	$(MAKE) DESTDIR=$(CURDIR)/debian/gdm install
 	chmod 644 $(CURDIR)/debian/gdm/usr/share/gdm/BuiltInSessions/default.desktop
 	install -m644 debian/gdm.xpm debian/login-photo.xpm debian/gdmDebianLogo.xpm $(CURDIR)/debian/gdm/usr/share/pixmaps/
 	rm $(CURDIR)/debian/gdm/etc/gdm/locale.alias $(CURDIR)/debian/gdm/usr/sbin/gdm $(CURDIR)/debian/gdm/usr/share/gdm/factory-defaults.conf
@@ -80,24 +74,21 @@
 	install -m755 debian/Xsession $(CURDIR)/debian/gdm/etc/gdm/Xsession
 	install -m644 debian/debian-moreblue/* $(CURDIR)/debian/gdm/usr/share/gdm/themes/debian-moreblue/
 
-# 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_installdebconf
 	dh_installdocs
 	dh_installmenu
-#	dh_installlogrotate
+	#dh_installlogrotate
 	dh_scrollkeeper
 	dh_desktop
 	dh_installpam
 	install -m644 debian/gdm-autologin.pam debian/gdm/etc/pam.d/gdm-autologin
 	dh_installinit --noscripts
-	dh_installman debian/gdm.8 debian/gdmlogin.8 debian/gdmchooser.8 debian/gdmflexiserver.1
+	dh_installman $(MANPAGES)
 	dh_installchangelogs ChangeLog
 	dh_link
 	dh_strip
@@ -109,10 +100,33 @@
 	dh_md5sums
 	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch
+clean::
+	dh_testdir
+	dh_testroot
+	-$(MAKE) distclean
+	# unapply patches, if any
+	QUILT_PATCHES=$(PATCH_DIR) \
+		quilt --quiltrc /dev/null pop -a -R || test $$? = 2
+	-rm -rf .pc
+	rm -f build-stamp configure-stamp patch-stamp
+	rm -rf debian/debian-moreblue
+	dh_clean $(MANPAGES) \
+		po/*.gmo po/.intltool-merge-cache \
+		config/gnome.desktop config/CDE.desktop config/default.desktop
+
+%.1: %.pod
+	pod2man --section=1 \
+		--release="GNOME $(MAJOR_MINOR)" \
+		--center="Debian GNU/Linux" \
+		$< \
+		| sed -e 's/debian:://' >$@
 
 %.8: %.pod
-	pod2man --section=8 --release="GNOME $(MAJOR_MINOR)" --center="Debian GNU/Linux" $< | sed -e 's/debian:://'> $@
-%.1: %.pod
-	pod2man --section=8 --release="GNOME $(MAJOR_MINOR)" --center="Debian GNU/Linux" $< | sed -e 's/debian:://'> $@
+	pod2man --section=8 \
+		--release="GNOME $(MAJOR_MINOR)" \
+		--center="Debian GNU/Linux" \
+		$< \
+		| sed -e 's/debian:://' >$@
+
+binary: binary-indep binary-arch
+.PHONY: patch configure build install clean binary-indep binary-arch binary




More information about the pkg-gnome-commits mailing list