tags 475231 + patch
thanks

You'll find a debdiff that includes changes needed for building against
nautilus 2.22 (in experimental) ready to upload to experimental attached.

-- 
Regards,
Andreas Henriksson
diff -u eiciel-0.9.5.1/debian/changelog eiciel-0.9.5.1/debian/changelog
--- eiciel-0.9.5.1/debian/changelog
+++ eiciel-0.9.5.1/debian/changelog
@@ -1,3 +1,16 @@
+eiciel (0.9.5.1-2.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * debian/rules:
+    - Update to get nautilus extension directory from pkg-config.
+      (Closes: #475231)
+    - Add removal of autogenerated autom4te.cache in clean target.
+  * debian/control: add versioned build-dependency on
+    libnautilus-extension-dev for >= 2.22.0, to make experimental upload pull
+    in the experimental version for testing the 2.0 extensions.
+
+ -- Andreas Henriksson <[EMAIL PROTECTED]>  Thu, 10 Apr 2008 22:53:47 +0200
+
 eiciel (0.9.5.1-2) unstable; urgency=low
 
   * debian/control
diff -u eiciel-0.9.5.1/debian/rules eiciel-0.9.5.1/debian/rules
--- eiciel-0.9.5.1/debian/rules
+++ eiciel-0.9.5.1/debian/rules
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --with-nautilus-extensions-dir=/usr/lib/nautilus/extensions-1.0
+DEB_CONFIGURE_EXTRA_FLAGS := --with-nautilus-extensions-dir=$(shell pkg-config --variable=extensiondir libnautilus-extension)
 DEB_DH_MAKESHLIBS_ARGS_eiciel := -Xlibeiciel-nautilus
 DEB_INSTALL_DOCS_eiciel := -XNEWS
 
@@ -21,11 +21,12 @@
 	touch debian/stamp-bootstrap
 
 binary-install/eiciel::
-	rm -f $(CURDIR)/debian/eiciel/usr/lib/nautilus/extensions-1.0/*.a
-	rm -f $(CURDIR)/debian/eiciel/usr/lib/nautilus/extensions-1.0/*.la
+	rm -f $(CURDIR)/debian/eiciel/$(shell pkg-config --variable=extensiondir libnautilus-extension)/*.a
+	rm -f $(CURDIR)/debian/eiciel/$(shell pkg-config --variable=extensiondir libnautilus-extension)/*.la
 
 # Remove autogenerated files.
 clean::
+	rm -rf autom4te.cache
 	find . -name Makefile.in | xargs rm -f
 	rm -f aclocal.m4
 	rm -f ltmain.sh
diff -u eiciel-0.9.5.1/debian/control eiciel-0.9.5.1/debian/control
--- eiciel-0.9.5.1/debian/control
+++ eiciel-0.9.5.1/debian/control
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Michael Biebl <[EMAIL PROTECTED]>
-Build-Depends: cdbs, debhelper (>= 5.0.0), automake1.9, autoconf, libtool, libacl1-dev, libattr1-dev, libgtkmm-2.4-dev, libnautilus-extension-dev, libgnome2-dev, libgnomeui-dev, libgnomevfs2-dev, pkg-config
+Build-Depends: cdbs, debhelper (>= 5.0.0), automake1.9, autoconf, libtool, libacl1-dev, libattr1-dev, libgtkmm-2.4-dev, libnautilus-extension-dev (>= 2.22.0), libgnome2-dev, libgnomeui-dev, libgnomevfs2-dev, pkg-config
 Standards-Version: 3.7.3
 Homepage: http://rofi.pinchito.com/eiciel/
 
only in patch2:
unchanged:
--- eiciel-0.9.5.1.orig/config.hpp.in
+++ eiciel-0.9.5.1/config.hpp.in
@@ -37,7 +37,7 @@
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
-/* Define if you have the iconv() function. */
+/* Define if you have the iconv() function and it works. */
 #undef HAVE_ICONV
 
 /* Define to 1 if you have the <inttypes.h> header file. */

Reply via email to