tags 424337 + patch
thanks
Here is a proposed patch for this issue. It fixes the distclean target so
that the second build succeeds. Because of a cdbs issue, this change cannot
be represented by a patch in debian/patches/ but must be put directly in the
diff. (cdbs would revert the patch before cleaning the source, thus defeating
the point.)
diff -u gnome-applets-2.22.2/debian/control gnome-applets-2.22.2/debian/control
--- gnome-applets-2.22.2/debian/control
+++ gnome-applets-2.22.2/debian/control
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Guilherme de S. Pastore <[EMAIL PROTECTED]>
-Uploaders: Debian GNOME Maintainers <[EMAIL PROTECTED]>, Josselin Mouette
<[EMAIL PROTECTED]>, Loic Minier <[EMAIL PROTECTED]>, Sebastian Dröge <[EMAIL
PROTECTED]>
+Uploaders: Debian GNOME Maintainers <[EMAIL PROTECTED]>, Josselin Mouette
<[EMAIL PROTECTED]>, Sebastian Dröge <[EMAIL PROTECTED]>
Standards-Version: 3.7.3
Build-Depends: cdbs (>= 0.4.41),
autotools-dev,
diff -u gnome-applets-2.22.2/debian/changelog
gnome-applets-2.22.2/debian/changelog
--- gnome-applets-2.22.2/debian/changelog
+++ gnome-applets-2.22.2/debian/changelog
@@ -1,3 +1,10 @@
+gnome-applets (2.22.2-1.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Fix distclean to allow build twice in a row. Closes: #424337.
+
+ -- Peter Eisentraut <[EMAIL PROTECTED]> Thu, 19 Jun 2008 13:36:10 +0200
+
gnome-applets (2.22.2-1) unstable; urgency=low
[ Josselin Mouette ]
only in patch2:
unchanged:
--- gnome-applets-2.22.2.orig/invest-applet/data/Makefile.am
+++ gnome-applets-2.22.2/invest-applet/data/Makefile.am
@@ -46,8 +46,7 @@
#endif
DISTCLEANFILES = \
- $(server_DATA) \
- $(server_in_files)
+ $(server_in_files:.server.in=.server)
EXTRA_DIST = \
Invest_Applet.server.in.in \
only in patch2:
unchanged:
--- gnome-applets-2.22.2.orig/invest-applet/data/Invest_Applet.server.in
+++ gnome-applets-2.22.2/invest-applet/data/Invest_Applet.server.in
@@ -0,0 +1,25 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:Invest_Applet_Factory" type="exe"
location="/usr/lib/gnome-applets/invest-applet">
+ <oaf_attribute name="repo_ids" type="stringv">
+ <item value="IDL:Bonobo/GenericFactory:1.0"/>
+ <item value="IDL:Bonobo/Unknown:1.0"/>
+ </oaf_attribute>
+ <oaf_attribute name="name" type="string" _value="Invest"/>
+ <oaf_attribute name="description" type="string" _value="Track your
invested money."/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:Invest_Applet" type="factory"
location="OAFIID:Invest_Applet_Factory">
+
+ <oaf_attribute name="repo_ids" type="stringv">
+ <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
+ <item value="IDL:Bonobo/Control:1.0"/>
+ <item value="IDL:Bonobo/Unknown:1.0"/>
+ </oaf_attribute>
+ <oaf_attribute name="name" type="string" _value="Invest"/>
+ <oaf_attribute name="description" type="string" _value="Track your
invested money."/>
+ <oaf_attribute name="panel:category" type="string"
value="Accessories"/>
+ <oaf_attribute name="panel:icon" type="string" value="invest-big.png"/>
+</oaf_server>
+
+</oaf_info>
only in patch2:
unchanged:
--- gnome-applets-2.22.2.orig/invest-applet/data/Makefile.in
+++ gnome-applets-2.22.2/invest-applet/data/Makefile.in
@@ -361,8 +361,7 @@
# $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
#endif
DISTCLEANFILES = \
- $(server_DATA) \
- $(server_in_files)
+ $(server_in_files:.server.in=.server)
EXTRA_DIST = \
Invest_Applet.server.in.in \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
