r10625 - in /desktop/unstable/gdm/debian: changelog gdm.install gdm.manpages rules

Tue May 1 12:40:35 UTC 2007

Author: lool
Date: Tue May  1 12:40:35 2007
New Revision: 10625

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10625
Log:
* Rework the install / binary-arch targets completely to me more
  debhelper-ish.
  - Stop shipping *.a and *.la files for Gtk modules.
* Pass --disable-scrollkeeper to configure.

Added:
    desktop/unstable/gdm/debian/gdm.install
    desktop/unstable/gdm/debian/gdm.manpages
Modified:
    desktop/unstable/gdm/debian/changelog
    desktop/unstable/gdm/debian/rules

Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=10625&op=diff
==============================================================================

--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Tue May  1 12:40:35 2007
@@ -31,8 +31,12 @@
   * Update watch file to track all stable releases.
   * Misc cleanups.
   * Bump up Debhelper compatibility level to 5.
-
- -- Loic Minier <lool at dooz.org>  Tue, 01 May 2007 13:49:36 +0200
+  * Rework the install / binary-arch targets completely to me more
+    debhelper-ish.
+    - Stop shipping *.a and *.la files for Gtk modules.
+  * Pass --disable-scrollkeeper to configure.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 01 May 2007 14:20:08 +0200
 
 gdm (2.16.4-1.1) unstable; urgency=low
 

Added: desktop/unstable/gdm/debian/gdm.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdm.install?rev=10625&op=file
==============================================================================
--- desktop/unstable/gdm/debian/gdm.install (added)
+++ desktop/unstable/gdm/debian/gdm.install Tue May  1 12:40:35 2007
@@ -1,0 +1,30 @@
+debian/*.xpm                            usr/share/pixmaps/
+debian/locale.conf                      etc/gdm
+debian/Xsession                         etc/gdm
+debian/debian-moreblue                  usr/share/gdm/themes
+debian/tmp/etc/dm
+debian/tmp/etc/gdm/Init
+debian/tmp/etc/gdm/PreSession
+debian/tmp/etc/gdm/PostSession
+debian/tmp/etc/gdm/gdm.conf
+debian/tmp/etc/gdm/XKeepsCrashing
+debian/tmp/etc/gdm/Xsession
+debian/tmp/etc/gdm/PostLogin
+debian/tmp/etc/gdm/modules
+debian/tmp/etc/pam.d/gdm
+debian/tmp/usr/bin
+debian/tmp/usr/lib/gdm
+debian/tmp/usr/lib/gtk-2.0/modules/*.so
+debian/tmp/usr/sbin/gdmsetup
+debian/tmp/usr/sbin/gdm-binary
+debian/tmp/usr/share/applications
+debian/tmp/usr/share/gdm/themes
+debian/tmp/usr/share/gdm/defaults.conf
+debian/tmp/usr/share/gdm/BuiltInSessions
+debian/tmp/usr/share/gdm/*.glade
+debian/tmp/usr/share/gnome/help/gdm
+debian/tmp/usr/share/icons/hicolor
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/man
+debian/tmp/usr/share/omf/gdm
+debian/tmp/usr/share/pixmaps

Added: desktop/unstable/gdm/debian/gdm.manpages
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdm.manpages?rev=10625&op=file
==============================================================================
--- desktop/unstable/gdm/debian/gdm.manpages (added)
+++ desktop/unstable/gdm/debian/gdm.manpages Tue May  1 12:40:35 2007
@@ -1,0 +1,2 @@
+debian/*.1
+debian/*.8

Modified: desktop/unstable/gdm/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/rules?rev=10625&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/rules (original)
+++ desktop/unstable/gdm/debian/rules Tue May  1 12:40:35 2007
@@ -19,7 +19,8 @@
 		--sysconfdir=/etc \
 		--libexecdir=\$${prefix}/lib/gdm \
 		--localstatedir=/var/lib \
-		--with-custom-conf=/etc/gdm/gdm.conf
+		--with-custom-conf=/etc/gdm/gdm.conf \
+		--disable-scrollkeeper
 
 ifeq (linux,$(DEB_HOST_ARCH_OS))
 	configure_flags += --with-selinux
@@ -55,60 +56,54 @@
 	sh debian/debian-moreblue.shar
 	touch build-stamp
 
-install: build
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(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
-	# special environment settings should be done in /etc/default/gdm
-	mv $(CURDIR)/debian/gdm/usr/sbin/gdm-binary $(CURDIR)/debian/gdm/usr/sbin/gdm
-	# /etc/init.d/gdm should be used for stop/start
-	rm $(CURDIR)/debian/gdm/usr/sbin/gdm-stop $(CURDIR)/debian/gdm/usr/sbin/gdm-restart $(CURDIR)/debian/gdm/usr/sbin/gdm-safe-restart
-	# /usr/share/xsessions/gnome.desktop provided by gnome-session.
-	rm -rf $(CURDIR)/debian/gdm/var/lib/scrollkeeper $(CURDIR)/debian/gdm/usr/share/xsessions $(CURDIR)/debian/gdm/var/lib/log
-	install -m644 debian/locale.conf $(CURDIR)/debian/gdm/etc/gdm/locale.conf
-	install -m755 debian/Xsession $(CURDIR)/debian/gdm/etc/gdm/Xsession
-	install -m644 debian/debian-moreblue/* $(CURDIR)/debian/gdm/usr/share/gdm/themes/debian-moreblue/
+	mkdir debian/tmp
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	touch $@
 
 binary-indep: build install
 
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installdebconf
-	dh_installdocs
-	dh_installmenu
-	#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 $(MANPAGES)
-	dh_installchangelogs ChangeLog
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_installdirs -a
+	dh_install -a
+	#dh_fixperms -a
+	# special environment settings should be done in /etc/default/gdm
+	mv debian/gdm/usr/sbin/gdm-binary debian/gdm/usr/sbin/gdm
+	chmod 755 debian/gdm/etc/gdm/Xsession
+	dh_installdebconf -a
+	dh_installdocs -a
+	dh_installmenu -a
+	#dh_installlogrotate -a
+	dh_scrollkeeper -a
+	dh_desktop -a
+	dh_installpam -a --name=gdm-autologin
+	dh_installinit -a --noscripts
+	dh_installman -a
+	dh_installchangelogs -a ChangeLog
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
 clean::
 	dh_testdir
 	dh_testroot
+	rm -rf debian/tmp
 	-$(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 -f install-stamp build-stamp configure-stamp patch-stamp
 	rm -rf debian/debian-moreblue
 	dh_clean $(MANPAGES) \
 		po/*.gmo po/.intltool-merge-cache \


