* dh_client -k should not be  used for deb generation since we are building a 
single target.
* .svn directories are being included due to an unchaged rule in Makefile.in 
from old CVS times, so we fix this (thanks lintian!).
* Append SVN release number to deb builds if it is not stable with svnversion 
until we find a better method.
* Change the sed substitution command for #VERSION# so every entry in the 
Debian changelog gets substituted.
* Put the real version number in configure and configure.ac.

:P
-- 
Rafael Rodríguez

http://unrincon.blogspot.com
http://cornerofcode.blogspot.com
Index: debian/rules
===================================================================
--- debian/rules	(revisión: 7271)
+++ debian/rules	(copia de trabajo)
@@ -59,7 +59,7 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_clean
 	dh_installdirs
 
 	# Add here commands to install the package into debian/amsn.
Index: configure.ac
===================================================================
--- configure.ac	(revisión: 7271)
+++ configure.ac	(copia de trabajo)
@@ -6,7 +6,7 @@
 
 
 APPNAME=amsn
-APPVERSION=0.97b
+APPVERSION=0.96rc1
 APPRELEASE=1
 APPSTABLE=no
 
Index: Makefile.in
===================================================================
--- Makefile.in	(revisión: 7271)
+++ Makefile.in	(copia de trabajo)
@@ -35,12 +35,11 @@
 
 # misc
 PACKAGE		:= @APPNAME@
-ifeq (@APPSTABLE@,yes)
 BASEVERSION	:= @APPVERSION@
+ifeq (@APPSTABLE@,yes)
 RELEASEVERSION	:= @APPRELEASE@
 else
-BASEVERSION     := @[EMAIL PROTECTED]
-RELEASEVERSION  := `cat cvs_date|head -c8`
+RELEASEVERSION  := svn`which svnversion > /dev/null && svnversion`
 endif
 VERSION		:= $(BASEVERSION)-$(RELEASEVERSION)
 
@@ -171,7 +170,7 @@
 	@for p in $?; do \
 			cp -Rf --parents $(srcdir)/$$p $(INSTALL_PREFIX)/$(dstdir)/$(PACKAGE); \
 		done
-	find $(INSTALL_PREFIX)/$(dstdir)/$(PACKAGE) -name CVS -print | xargs rm -Rf
+	find $(INSTALL_PREFIX)/$(dstdir)/$(PACKAGE) -name '.svn' -print | xargs rm -Rf
 	@for p in $(FILES_TO_EXCLUDE); do \
 			rm -Rf $(INSTALL_PREFIX)/$(dstdir)/$(PACKAGE)/$$p; \
 		done
@@ -206,7 +205,7 @@
 deb: all
 	mkdir -p ./distrib/DEB
 
-	sed "1s/#VERSION#/${VERSION}/" debian/changelog.in > debian/changelog
+	sed "s/#VERSION#/${VERSION}/" debian/changelog.in > debian/changelog
 	fakeroot debian/rules clean
 	fakeroot debian/rules binary VERSION=${VERSION}
 
Index: configure
===================================================================
--- configure	(revisión: 7274)
+++ configure	(copia de trabajo)
@@ -1317,7 +1317,7 @@
 
 
 APPNAME=amsn
-APPVERSION=0.97b
+APPVERSION=0.96rc1
 APPRELEASE=1
 APPSTABLE=no
 
Index: debian/changelog.in
===================================================================
--- debian/changelog.in	(revisión: 7271)
+++ debian/changelog.in	(copia de trabajo)
@@ -1,3 +1,10 @@
+amsn (#VERSION#) experimental; urgency=low
+
+  * Don't include .svn dirs in the generated packages!
+  * -k is not needed in dh_client since we are building a single target.
+
+ -- Rafael Rodríguez <[EMAIL PROTECTED]>  Tue, 19 Sep 2006 17:31:50 +0100
+
 amsn (#VERSION#) stable; urgency=low
 
   [ Phil ]
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Amsn-devel mailing list
Amsn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/amsn-devel

Reply via email to