[Blends-commit] r1751 - in blends/trunk/blends: . debian devtools

Debian Pure Blends Subversion Commit noreply at alioth.debian.org
Sat Aug 8 19:21:19 UTC 2009


Author: tille
Date: Sat Aug  8 19:21:19 2009
New Revision: 1751
URL: http://svn.debian.org/viewsvn/blends?rev=1751&view=rev

Log:
Use debhelper 7 in devtools/rules, revert last change to use source:version instead of binary:version and some other minor changes


Added:
   blends/trunk/blends/sources.list.UNRELEASED
Modified:
   blends/trunk/blends/TODO
   blends/trunk/blends/debian/changelog
   blends/trunk/blends/debian/compat
   blends/trunk/blends/debian/control
   blends/trunk/blends/debian/rules
   blends/trunk/blends/devtools/Makefile
   blends/trunk/blends/devtools/blend-gen-control
   blends/trunk/blends/devtools/rules

Modified: blends/trunk/blends/TODO
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/TODO?rev=1751&view=diff&r1=1751&r2=1750&p1=blends/trunk/blends/TODO&p2=blends/trunk/blends/TODO
==============================================================================
--- blends/trunk/blends/TODO	(original)
+++ blends/trunk/blends/TODO	Sat Aug  8 19:21:19 2009
@@ -1,3 +1,5 @@
+Dokumentation: Remark!
+
 sources.list
   It would be a good idea to parse /etc/apt/sources.list for the Debian-Mirror
   which is used on the building box instead of using ftp.debian.org

Modified: blends/trunk/blends/debian/changelog
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/debian/changelog?rev=1751&view=diff&r1=1751&r2=1750&p1=blends/trunk/blends/debian/changelog&p2=blends/trunk/blends/debian/changelog
==============================================================================
--- blends/trunk/blends/debian/changelog	(original)
+++ blends/trunk/blends/debian/changelog	Sat Aug  8 19:21:19 2009
@@ -2,10 +2,15 @@
 
   * devtools/blend-get-names: Enable Blends without prefix "debian-"
     (brdesktop, debichem)
-  * devtools/blend-get-control: s/binary:Version/source:Version/
-    to enable binary NMUs (at least in principle, they are not
-    really expected but it just keeps lintian silent in some cases
   * Standards-Version: 3.8.2 (no changes needed)
+  * Move to debhelper 7 short rules file when building Blends
+  * Provide also sources.list.UNRELEASED to enable test builds
+  * debian/rules: drop -k option from dh_clean
+  * devtools/Makefile: Do not use distclean as target to remove
+    automatically created control and tasksel file but rather
+    the proper target.  Rationale: dh_clean calls make distclean
+    which would remove debian/control which has to be prevented
+    for sure.
 
  -- Andreas Tille <tille at debian.org>  Wed, 29 Jul 2009 10:40:04 +0200
 

Modified: blends/trunk/blends/debian/compat
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/debian/compat?rev=1751&view=diff&r1=1751&r2=1750&p1=blends/trunk/blends/debian/compat&p2=blends/trunk/blends/debian/compat
==============================================================================
--- blends/trunk/blends/debian/compat	(original)
+++ blends/trunk/blends/debian/compat	Sat Aug  8 19:21:19 2009
@@ -1 +1 @@
-6
+7

Modified: blends/trunk/blends/debian/control
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/debian/control?rev=1751&view=diff&r1=1751&r2=1750&p1=blends/trunk/blends/debian/control&p2=blends/trunk/blends/debian/control
==============================================================================
--- blends/trunk/blends/debian/control	(original)
+++ blends/trunk/blends/debian/control	Sat Aug  8 19:21:19 2009
@@ -7,7 +7,7 @@
  Cosimo Alfarano <kalfa at debian.org>,
  José L. Redrejo Rodríguez <jredrejo at debian.org>,
  Jonas Smedegaard <dr at jones.dk>
-Build-Depends: debhelper (>= 6.0.7)
+Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: debiandoc-sgml, texlive-latex-base, texlive-latex-extra, 
  texlive-latex-recommended, texlive-fonts-recommended
 Standards-Version: 3.8.2

Modified: blends/trunk/blends/debian/rules
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/debian/rules?rev=1751&view=diff&r1=1751&r2=1750&p1=blends/trunk/blends/debian/rules&p2=blends/trunk/blends/debian/rules
==============================================================================
--- blends/trunk/blends/debian/rules	(original)
+++ blends/trunk/blends/debian/rules	Sat Aug  8 19:21:19 2009
@@ -31,7 +31,7 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_clean
 	dh_installdirs
 	dh_install
 

Modified: blends/trunk/blends/devtools/Makefile
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/devtools/Makefile?rev=1751&view=diff&r1=1751&r2=1750&p1=blends/trunk/blends/devtools/Makefile&p2=blends/trunk/blends/devtools/Makefile
==============================================================================
--- blends/trunk/blends/devtools/Makefile	(original)
+++ blends/trunk/blends/devtools/Makefile	Sat Aug  8 19:21:19 2009
@@ -51,6 +51,8 @@
 	rm -f packages.txt by_vote packages-sorted.txt
 
 distclean: clean
+
+proper: distclean
 	rm -f debian/control
 	rm -f $(BLEND)-tasks.desc
 

Modified: blends/trunk/blends/devtools/blend-gen-control
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/devtools/blend-gen-control?rev=1751&view=diff&r1=1751&r2=1750&p1=blends/trunk/blends/devtools/blend-gen-control&p2=blends/trunk/blends/devtools/blend-gen-control
==============================================================================
--- blends/trunk/blends/devtools/blend-gen-control	(original)
+++ blends/trunk/blends/devtools/blend-gen-control	Sat Aug  8 19:21:19 2009
@@ -192,10 +192,10 @@
 	        if ( $tasksname ) {
 		    print "Depends: $tasksname";
 		    if ( $tasksname =~ /-tasks$/ ) {
-			print ' (= ${source:Version})';
+			print ' (= ${binary:Version})';
 		    }
 		    if ( $hasconfig ) {
-			print ', ' . $prefix . 'config (= ${source:Version})';
+			print ', ' . $prefix . 'config (= ${binary:Version})';
 		    }
 		    print "\n" ;
 	        }

Modified: blends/trunk/blends/devtools/rules
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/devtools/rules?rev=1751&view=diff&r1=1751&r2=1750&p1=blends/trunk/blends/devtools/rules&p2=blends/trunk/blends/devtools/rules
==============================================================================
--- blends/trunk/blends/devtools/rules	(original)
+++ blends/trunk/blends/devtools/rules	Sat Aug  8 19:21:19 2009
@@ -29,15 +29,26 @@
 $(BLEND)-tasks.desc:
 	$(MAKE) -f $(BLENDMKFILE) $(BLEND)-tasks.desc
 
-build: 
-	## Don't build debian/control and tasks.desc at package build time
-	# $(MAKE) -f $(BLENDMKFILE) all
-	dh_testdir
-
-clean:
-	dh_testdir
-	dh_testroot
-	$(MAKE) -f $(BLENDMKFILE) clean
+%:
+	dh $@
+
+override_dh_install:
+	#if grep "^Architecture: " debian/control | grep -q -v "all$" ; then \
+	    echo "$(BLEND_INSTALL_HELPER)" ; \
+	    $(BLEND_INSTALL_HELPER) ; \
+	#fi
+	dh_install $(BLENDNAME)-tasks.desc usr/share/tasksel
+
+override_dh_installdocs:
+	dh_installdocs $(INSTALLREADME)
+
+override_dh_auto_clean:
+	# call make clean instead of distclean
+	make clean
+
+override_dh_clean:
+	# hmmm, that would kill debian/control - so don't do this!
+	# $(MAKE) -f $(BLENDMKFILE) clean
 
 	# Clear apt-get cache
 	rm -rf tmp
@@ -45,18 +56,13 @@
 	rm -f tasks/*~
 	# Remove auto generated post{inst,rm} scripts
 	rm -f debian/$(PREFIX)-*.postinst debian/$(PREFIX)-*.postrm
-	# remove tasksel directory
-	## [ -d tasksel ] && rm -f tasksel/$(PREFIX)-* && rmdir tasksel
 	# remove auto generated files for config package
 	rm -f debian/$(PREFIX)-config.templates debian/$(PREFIX)-config.config \
 	      debian/$(PREFIX)-config.install   debian/$(PREFIX)-config.links  \
 	      debian/90$(PREFIX)-config
 	# remove auto generated debconf template translations
 	rm -rf debian/po
-	# DO NOT Remove auto generated tasksel descriptions - it sticks to the source
-	# rm -f $(BLENDNAME)-tasks.desc
-
-	dh_clean build-stamp
+	dh_clean
 
 get-orig-source: $(BLEND)-tasks.desc debian/control
 	if [ ! -f debian/changelog ] ; then \
@@ -80,71 +86,3 @@
 	# remove auto generated files from SVN dir where it should not be stored
 	rm -f debian/control $(BLEND)-tasks.desc
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	dh_install $(BLENDNAME)-tasks.desc usr/share/tasksel
-
-# Build architecture-dependent files here.
-# Since Debian Edu builds architecture dependant meta packages
-# to have correct Dependencies for every architecture we need
-# to build also binary-arch target
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdocs -a $(INSTALLREADME)
-	dh_installexamples -a
-	dh_installmenu -a
-	dh_installcron -a
-	dh_installman -a
-	dh_installinfo -a
-	dh_lintian -a
-	if grep -q "^Architecture: \+any" debian/control ; then \
-	    echo "$(BLEND_INSTALL_HELPER) for architecture any" ; \
-	    $(BLEND_INSTALL_HELPER) ; \
-	fi
-	dh_install -a
-	dh_installdebconf -a
-	dh_installchangelogs -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdocs -i $(INSTALLREADME)
-	dh_installexamples -i
-	dh_installmenu -i
-	dh_installcron -i
-	dh_installman -i
-	dh_installinfo -i
-	dh_lintian -i
-	if grep -q "^Architecture: \+all" debian/control ; then \
-	    echo "$(BLEND_INSTALL_HELPER) for architecture all" ; \
-	    $(BLEND_INSTALL_HELPER) ; \
-	fi
-	dh_install -i
-	dh_installdebconf -i
-	dh_installchangelogs -i
-	dh_link -i
-	dh_strip -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_shlibdeps -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure debian/control dist

Added: blends/trunk/blends/sources.list.UNRELEASED
==============================================================================
--- (empty file)
+++ blends/trunk/blends/sources.list.UNRELEASED	Sat Aug  8 19:21:19 2009
@@ -0,0 +1,5 @@
+# For testing purposes this sources.list might be useful.  It is a
+# good practice to use UNRELEASED in the changelog as target distribution
+# for not yet finished packages and blends-dev should also work in this
+# case
+deb http://ftp.debian.org/ unstable main



More information about the Blends-commit mailing list