r17568 - in /desktop/experimental/ekiga/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Nov 14 14:40:29 2008
New Revision: 17568

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17568
Log:
Cleanup further, removing old clean rules, gtkonly stuff, commented out stuff...

Modified:
    desktop/experimental/ekiga/debian/changelog
    desktop/experimental/ekiga/debian/rules

Modified: desktop/experimental/ekiga/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/changelog?rev=17568&op=diff
==============================================================================
--- desktop/experimental/ekiga/debian/changelog (original)
+++ desktop/experimental/ekiga/debian/changelog Fri Nov 14 14:40:29 2008
@@ -21,7 +21,8 @@
     install; thanks Ubuntu and Martin Pitt; closes: #505535.
   * Also let the -dbg depend on ${misc:Depends}.
   * Cleanup rules; in particular, use dpkg-parsechangelog and honor
-    distclean/clean failures.
+    distclean/clean failures, remove old clean rules, commented out stuff,
+    gtk-only stuff.
 
  -- Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>  Sat, 27 Sep 2008 10:00:00 +0200
 

Modified: desktop/experimental/ekiga/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/rules?rev=17568&op=diff
==============================================================================
--- desktop/experimental/ekiga/debian/rules (original)
+++ desktop/experimental/ekiga/debian/rules Fri Nov 14 14:40:29 2008
@@ -27,48 +27,26 @@
 config.status: patch-stamp
 	dh_testdir
 	rm -f config.cache
-	#rm -rf build-gtkonly
-	#mkdir build-gtkonly
-	#cd build-gtkonly ; ./autogen.sh $(confflags) --disable-gnome
 	CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-	./configure $(confflags)
+	    ./configure $(confflags)
 	touch $@
 
 build: build-stamp
 
 build-stamp: config.status
 	dh_testdir
-	$(MAKE) LDFLAGS="$(LDFLAGS)"
-	#$(MAKE) -C build-gtkonly
+	$(MAKE)
 	touch $@
 
 clean:: clean-patched unpatch
 clean-patched:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp patch-stamp  # for debhelper v6
-	rm -f debian/files*
-	rm -f xml-i18n-extract xml-i18n-merge xml-i18n-update
+	rm -vf build-stamp patch-stamp
 	[ ! -f Makefile ] || $(MAKE) clean distclean
-	rm -rf po/.intltool-merge-cache
-	rm -rf intltool-extract intltool-merge intltool-update
-	rm -f pixmaps/inline_emoticons.h
-	rm -f pixmaps/inlines.h
-	rm -f build-stamp config.status
-	# Clean out what make distclean didn't clean out...
-	#rm -f ekiga*.desktop
-	#rm -f help/C/ekiga*-C.omf.out help/C/Makefile.in help/Makefile.in
-	#rm -f ekiga*.schemas
-	#rm -f intltool-extract intltool-extract.in
-	#rm -rf intltool-merge intltool-merge.in intltool-modules
-	#rm -f intltool-update intltool-update.in
-	#rm -rf lib/Makefile.in lib/widgets/Makefile.in lib/xdap/Makefile.in man/Makefile.in pixmaps/Makefile.in po/Makefile.in.in sounds/Makefile.in src/Makefile.in xdap_data/Makefile.in
-	#rm -f ltmain.sh
-	#rm -f missing mkinstalldirs
-	#rm -f pixmaps/inline_emoticons.h pixmaps/inlines.h
-	#rm -f po/*.gmo
-	#rm -f sounds/ekiga*.soundlist
-	#rm -f stamp-h.in
+	rm -rvf po/.intltool-merge-cache
+	rm -vf pixmaps/inline_emoticons.h
+	rm -vf pixmaps/inlines.h
 	dh_clean
 
 install: build
@@ -77,21 +55,13 @@
 	dh_clean -k
 	dh_installdirs
 	cd po/; intltool-update -p
-	#GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/ekiga
-	#$(MAKE) -C build-gtkonly install DESTDIR=$(CURDIR)/debian/ekiga-gtkonly
-	#mkdir -p debian/ekiga/usr/share/bug/ekiga
-	#echo 'Send-To: Ekiga Snapshots Bugs <master at buildserver.net>' >$(CURDIR)/debian/ekiga/usr/share/bug/ekiga/control
-	#cp debian/bugs.script debian/ekiga/usr/share/bug/ekiga/script
-	#chmod 0755 debian/ekiga/usr/share/bug/ekiga/script
-	#cp debian/bugs.presubj debian/ekiga/usr/share/bug/ekiga/presubj
 
 binary-indep: build install
 
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	#"", -gtkonly have docs in /usr/share/doc, while -dbg uses links
 	dh_installdocs -A -Nekiga-dbg
 	dh_install
 	dh_installmenu
@@ -112,7 +82,7 @@
 		set -- $$(echo $$s | tr ' ' '\n' | sort); \
 		f=$$1; shift; \
 		for d; do \
-		  echo "symlinking duplicate Gnome help file $$d to $$f"; \
+		  echo "symlinking duplicate GNOME help file $$d to $$f"; \
 		  rm $$d; ln -s /$$f $$d; \
 		done; \
 	      done; \