[Python-apps-commits] r2106 - in packages/wicd/trunk/debian (README.source changelog rules)

hanska-guest at users.alioth.debian.org hanska-guest at users.alioth.debian.org
Wed Dec 24 10:03:50 UTC 2008


    Date: Wednesday, December 24, 2008 @ 10:03:49
  Author: hanska-guest
Revision: 2106

  - using dh7-style rules
* debian/README.source added

Added:
  packages/wicd/trunk/debian/README.source
Modified:
  packages/wicd/trunk/debian/changelog
  packages/wicd/trunk/debian/rules

Added: packages/wicd/trunk/debian/README.source
===================================================================
--- packages/wicd/trunk/debian/README.source	                        (rev 0)
+++ packages/wicd/trunk/debian/README.source	2008-12-24 10:03:49 UTC (rev 2106)
@@ -0,0 +1,62 @@
+wicd for Debian
+---------------
+
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
+
+ -- David Paleino <d.paleino at gmail.com>  Wed, 24 Dec 2008 10:40:45 +0100

Modified: packages/wicd/trunk/debian/changelog
===================================================================
--- packages/wicd/trunk/debian/changelog	2008-12-24 09:32:49 UTC (rev 2105)
+++ packages/wicd/trunk/debian/changelog	2008-12-24 10:03:49 UTC (rev 2106)
@@ -19,8 +19,10 @@
   * debian/rules:
     - get-orig-source target to ease upstream tarball fetch
     - ensure right permissions are set in install target
+    - using dh7-style rules
+  * debian/README.source added
 
- -- David Paleino <d.paleino at gmail.com>  Wed, 24 Dec 2008 01:43:06 +0100
+ -- David Paleino <d.paleino at gmail.com>  Wed, 24 Dec 2008 10:59:07 +0100
 
 wicd (1.5.2-1) unstable; urgency=low
 

Modified: packages/wicd/trunk/debian/rules
===================================================================
--- packages/wicd/trunk/debian/rules	2008-12-24 09:32:49 UTC (rev 2105)
+++ packages/wicd/trunk/debian/rules	2008-12-24 10:03:49 UTC (rev 2106)
@@ -4,48 +4,31 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CURVER=$(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"-" -f1 )
-
 include /usr/share/quilt/quilt.make
 
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
-	dh_testdir
-	
-	python setup.py configure \
-		--no-install-docs
-	
-	touch $@
-
 build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-
+build-stamp: $(QUILT_STAMPFN)
+	dh build --before dh_auto_configure
+	python setup.py configure --no-install-docs
 	python setup.py build
-
+	dh build --after dh_auto_build
 	touch $@
 
 clean: unpatch
-	dh_testdir
-	dh_testroot
-
+	dh clean --before dh_auto_clean
 	python setup.py clean
+	dh clean --after dh_auto_clean
 	
 	find . \( -name "*.pyc" -o -name "*.pyo" \) -exec rm -rf {} \;
 	find ./init/ \( -name "wicd" -o -name "rc.wicd" \) -exec rm -rf {} \;
 	-rm -rf build/
 
-	dh_clean build-stamp configure-stamp \
-		wpath.py install.log os wicd/wpath.py \
+	dh_clean wpath.py install.log os wicd/wpath.py \
 		man/*.8 man/*.5 scripts/* other/*.sh \
 		other/postinst
 
 install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
+	dh install --before dh_auto_install
 	python setup.py install --root=$(CURDIR)/debian/wicd
 	install -m644 debian/wicd-client.xpm \
 		$(CURDIR)/debian/wicd/usr/share/pixmaps/wicd.xpm
@@ -53,35 +36,13 @@
 	find $(CURDIR)/debian/wicd -name "*.png" -exec chmod 644 {} \;
 	find $(CURDIR)/debian/wicd/etc/wicd/ -type f -exec chmod 644 {} \;
 	find $(CURDIR)/debian/wicd \( -name "*.glade" -o -name "*.conf" -o -name "*.desktop" \) -exec chmod 644 {} \;
+	dh install --after dh_auto_install
 
 binary-arch: build install
+	dh binary-arch
+
 binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGES
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-	dh_installinit
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_pysupport
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh binary-indep
 
 binary: binary-indep binary-arch
-
-get-orig-source:
-	[ -d "../tarballs" ] || mkdir ../tarballs
-	uscan \
-		--force-download \
-		--download-version $(CURVER) \
-		--rename \
-		--destdir ../tarballs
-
 .PHONY: build clean binary-indep binary-arch binary install




More information about the Python-apps-commits mailing list