r15822 - in /packages/unstable/update-manager/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Sat May  3 22:02:20 2008
New Revision: 15822

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15822
Log:
pre-clean:: hack to have patches in place when running clean_i18n.

Modified:
    packages/unstable/update-manager/debian/changelog
    packages/unstable/update-manager/debian/rules

Modified: packages/unstable/update-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/changelog?rev=15822&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/changelog (original)
+++ packages/unstable/update-manager/debian/changelog Sat May  3 22:02:20 2008
@@ -3,7 +3,8 @@
   * Let update-manager-core depend on ${shlibs:Depends}; thanks Niko Tyni.
   * New patch, 60_register-clean-i18n, registers clean_i18n command in
     setup.py.
-  * Call setup.py clean_i18n ala CDBS in clean::; closes: #442755.
+  * Call setup.py clean_i18n ala CDBS in patched-clean:: which is a prereq of
+    clean::, but with patches applied; closes: #442755.
 
  -- Loic Minier <lool at dooz.org>  Thu, 17 Jan 2008 18:46:19 +0100
 

Modified: packages/unstable/update-manager/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/rules?rev=15822&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/rules (original)
+++ packages/unstable/update-manager/debian/rules Sat May  3 22:02:20 2008
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 
 DEB_PYTHON_SYSTEM := pysupport
+
+# patched-clean are run when the patches are still in place
+clean:: patched-clean
 
 include /usr/share/cdbs/1/rules/buildcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -9,15 +12,15 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 #include /usr/share/gnome-pkg-tools/1/rules/ubuntu-get-source.mk
 
+patched-clean:: apply-patches
+	cd $(DEB_SRCDIR) && python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean_i18n
+
 clean::
 	-find po/mo -name \*mo -exec rm {} \;
 	-for pofile in po/*.debackup; do \
 		if [ $${pofile} = 'po/*.debackup' ]; then break; fi; \
 		mv $${pofile} $$(echo $${pofile} | sed 's,.debackup$$,,'); \
 	done
-
-clean::
-	cd $(DEB_SRCDIR) && python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean_i18n
 
 post-patches::
 	-for pofile in debian/pos/*.po; do \