[Pkg-cli-apps-commits] [SCM] galaxium branch, master, updated. 093f9f0e67006574119ecb3a06f565d544f66397

[David Paleino]

The following commit has been merged in the master branch:
commit 093f9f0e67006574119ecb3a06f565d544f66397
Author: David Paleino <d.paleino at gmail.com>
Date:   Sat May 30 14:59:53 2009 +0200

    Use dh7-style debian/rules

diff --git a/debian/compat b/debian/compat
index 1e8b314..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control b/debian/control
index 116c201..2330f65 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.
 Uploaders: David Paleino <d.paleino at gmail.com>,
  Devid Antonio Filoni <d.filoni at ubuntu.com>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 6),
+Build-Depends: debhelper (>= 7.0.52),
  mono-devel (>= 2.0.1),
  automake,
  libgtk2.0-cil (>= 2.10.2),
@@ -17,9 +17,9 @@ Build-Depends: debhelper (>= 6),
  libglade2.0-cil (>= 2.10.2),
  libglib2.0-cil (>= 2.10.2),
  libanculus0.3-cil (>= 0.3),
- cli-common-dev (>= 0.4.4),
+ cli-common-dev (>= 0.5.7),
  libswfdec-0.6-90,
- quilt,
+ quilt (>= 0.46-7~),
  libhal-dev (>= 0.5),
  libnotify0.4-cil (>= 0.4.0~)
 Standards-Version: 3.8.0
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..b4627a6
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,2 @@
+build/*.config	/usr/lib/galaxium/
+debian/*.config	/usr/lib/galaxium/
diff --git a/debian/rules b/debian/rules
index 34e9d82..18ad38d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export MONO_SHARED_DIR=$(CURDIR)
-
 include /usr/share/quilt/quilt.make
-
-GOS_TMP=$(CURDIR)/get-orig-source-tmp
+include /usr/share/cli-common/cli.make
 
 CFLAGS = -Wall -g
 
@@ -26,76 +23,32 @@ manpages: galaxium.1
 galaxium.1: debian/galaxium.1.xml
 	$(XP) $<
 
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
-	dh_testdir
-	
-	#--enable-irc --enable-aim --enable-yahoo
-	sh autogen.sh --prefix=/usr --sysconfdir=/etc \
-	--enable-adium \
-	CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-	
-	touch $@
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-gnome
 
 build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE)
+build-stamp:
+	dh --with quilt,cli build
 	touch $@
 
-clean: realclean unpatch
-realclean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
-	-rm -rf auom4te.cache/
-	-rm -rf aclocal.m4 configure install-sh missing
-	find $(CURDIR) -name "Makefile.in" -delete
-	find $(CURDIR) -name "*.o" -delete
-	find $(CURDIR)/build -name "*.dll" -delete
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
+clean:
+	dh --with quilt,cli $@
+	#-rm -rf auom4te.cache/
+	#-rm -rf aclocal.m4 configure install-sh missing
+	#find $(CURDIR) -name "Makefile.in" -delete
+	#find $(CURDIR) -name "*.o" -delete
+	#find $(CURDIR)/build -name "*.dll" -delete
+
+install: install-stamp
+install-stamp: build
+	dh --with cli install
+	#-rm -rf $(CURDIR)/debian/galaxium/usr/lib/pkgconfig
+	touch $@
 
-	$(MAKE) DESTDIR=$(CURDIR)/debian/galaxium install
-	
-	-rm -rf $(CURDIR)/debian/galaxium/usr/lib/pkgconfig
-	install -m644 $(CURDIR)/build/*.config $(CURDIR)/debian/galaxium/usr/lib/galaxium/
-	install -m644 $(CURDIR)/debian/*.config $(CURDIR)/debian/galaxium/usr/lib/galaxium/
+binary-indep:
 
-binary-indep: build install
 binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installmenu
-	dh_installman
-	dh_link
-	dh_strip
-	dh_clistrip
-	dh_compress
-	dh_fixperms
-	dh_clifixperms
-	dh_shlibdeps
-	dh_clideps
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-get-orig-source:
-	rm -rf $(GOS_TMP); mkdir -p $(GOS_TMP)
-	wget http://galaxium.googlecode.com/files/galaxium_0.7.2.tar.gz -O $(GOS_TMP)/galaxium_0.7.2.tar.gz
-	tar -C $(GOS_TMP) -xvf $(GOS_TMP)/galaxium_0.7.2.tar.gz
-	rm $(GOS_TMP)/galaxium-0.7.2/build/libmimic.so
-	tar -C $(GOS_TMP) -zcf $(CURDIR)/galaxium_0.7.2+ds1.orig.tar.gz galaxium-0.7.2/
-	rm -rf $(GOS_TMP)
+	dh --with cli $@
 	
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install

-- 
galaxium