summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Alfarano <cosimo.alfarano@collabora.co.uk>2011-07-28 14:49:33 (GMT)
committerCosimo Alfarano <cosimo.alfarano@collabora.co.uk>2011-07-29 17:43:28 (GMT)
commitbbfc49140e05bc62b6b9aec1f430853ef8d30477 (patch)
treebf2697fc07ed5a14e3ad566fe6fc53eceb40686e
parent6896c59dad7c721eede0a5842dd0be8570398c45 (diff)
downloadlibproxy-bbfc49140e05bc62b6b9aec1f430853ef8d30477.tar.gz
libproxy-bbfc49140e05bc62b6b9aec1f430853ef8d30477.tar.xz
Upadate debian/ for Maemo
* Use cmake * Port patches to new version
-rw-r--r--debian/changelog6
-rw-r--r--debian/control7
-rw-r--r--debian/libproxy1.install (renamed from debian/libproxy0.install)1
-rw-r--r--debian/old_patches/0001-configure-check-for-D-Bus.patch (renamed from debian/patches/0001-configure-check-for-D-Bus.patch)0
-rw-r--r--debian/old_patches/0003-configure-add-m4-stuff.patch (renamed from debian/patches/0003-configure-add-m4-stuff.patch)0
-rw-r--r--debian/old_patches/0004-build-fix-link-flags.patch (renamed from debian/patches/0004-build-fix-link-flags.patch)4
-rw-r--r--debian/old_patches/0006-gnome-fix-mode-check.patch (renamed from debian/patches/0006-gnome-fix-mode-check.patch)4
-rw-r--r--debian/old_patches/0009-configure-remove-x11-xmu-checks.patch (renamed from debian/patches/0009-configure-remove-x11-xmu-checks.patch)0
-rw-r--r--debian/old_patches/01_pac_http.patch (renamed from debian/patches/01_pac_http.patch)0
-rw-r--r--debian/patches/0001-print-suffix-even-if-the-list-is-empty-in-libproxy.patch30
-rw-r--r--debian/patches/0007-gnome-do-case-insensitive-cmp.patch56
-rw-r--r--debian/patches/0008-gnome-disable-session-detection.patch34
-rw-r--r--debian/patches/series10
-rwxr-xr-xdebian/rules34
14 files changed, 115 insertions, 71 deletions
diff --git a/debian/changelog b/debian/changelog
index 32c31c6..1925e9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libproxy (0.4.7-1+maemo0) unstable; urgency=low
+
+ * New upstream release
+
+ -- Cosimo Alfarano <cosimo.alfarano@collabora.co.uk> Thu, 28 Jul 2011 17:23:17 +0100
+
libproxy (0.3.1-2) unstable; urgency=low
[ Emilio Pozuelo Monfort ]
diff --git a/debian/control b/debian/control
index a20b192..12350a8 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Simon McVittie <simon.mcvittie@collabora.co.uk>,
Build-Depends: cdbs,
debhelper (>= 5),
gnome-pkg-tools,
- autotools-dev,
+ cmake,
libdbus-1-dev,
# /!\ we have a build-depends loop with webkit
gconf2,
@@ -18,11 +18,10 @@ Vcs-Git: git://gitorious.org/gnome-essentials/libproxy.git
Vcs-Browser: https://gitorious.org/gnome-essentials/libproxy
Homepage: http://code.google.com/p/libproxy/
-Package: libproxy0
+Package: libproxy1
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Recommends: libwebkit-1.0-2 | libmozjs2d
Description: automatic proxy configuration management library (shared)
libproxy is a lightweight library which makes it easy to develop
applications proxy-aware with a simple and stable API.
@@ -34,7 +33,7 @@ Architecture: any
Section: libdevel
Depends: ${shlibs:Depends},
${misc:Depends},
- libproxy0 (= ${binary:Version})
+ libproxy1 (= ${binary:Version})
Description: automatic proxy configuration management library (devel)
libproxy is a lightweight library which makes it easy to develop
applications proxy-aware with a simple and stable API.
diff --git a/debian/libproxy0.install b/debian/libproxy1.install
index f2ea5e7..18c3894 100644
--- a/debian/libproxy0.install
+++ b/debian/libproxy1.install
@@ -1,2 +1,3 @@
debian/tmp/usr/lib/libproxy.so.*
debian/tmp/usr/lib/libproxy/*/modules
+debian/tmp/usr/libexec/*
diff --git a/debian/patches/0001-configure-check-for-D-Bus.patch b/debian/old_patches/0001-configure-check-for-D-Bus.patch
index 42a4072..42a4072 100644
--- a/debian/patches/0001-configure-check-for-D-Bus.patch
+++ b/debian/old_patches/0001-configure-check-for-D-Bus.patch
diff --git a/debian/patches/0003-configure-add-m4-stuff.patch b/debian/old_patches/0003-configure-add-m4-stuff.patch
index 59c600f..59c600f 100644
--- a/debian/patches/0003-configure-add-m4-stuff.patch
+++ b/debian/old_patches/0003-configure-add-m4-stuff.patch
diff --git a/debian/patches/0004-build-fix-link-flags.patch b/debian/old_patches/0004-build-fix-link-flags.patch
index 5ed9585..efb1575 100644
--- a/debian/patches/0004-build-fix-link-flags.patch
+++ b/debian/old_patches/0004-build-fix-link-flags.patch
@@ -5,8 +5,8 @@ Subject: [PATCH] build: fix link flags
Signed-off-by: Felipe Contreras <felipe.contreras@nokia.com>
---- a/src/modules/Makefile.am
-+++ b/src/modules/Makefile.am
+--- a/libproxy/modules/Makefile.am
++++ b/libproxy/modules/Makefile.am
@@ -51,14 +51,14 @@ config_file_la_LIBADD = ../
# GConf/GNOME Config Module
config_gnome_la_SOURCES = config_gnome.c xhasclient.c
diff --git a/debian/patches/0006-gnome-fix-mode-check.patch b/debian/old_patches/0006-gnome-fix-mode-check.patch
index ef4d2c1..1e3d25b 100644
--- a/debian/patches/0006-gnome-fix-mode-check.patch
+++ b/debian/old_patches/0006-gnome-fix-mode-check.patch
@@ -1,5 +1,5 @@
---- a/src/modules/config_gnome.c
-+++ b/src/modules/config_gnome.c
+--- a/libproxy/modules/config_gnome.cpp
++++ b/libproxy/modules/config_gnome.cpp
@@ -142,14 +142,13 @@ _get_config(pxConfigModule *s, pxURL *ur
}
}
diff --git a/debian/patches/0009-configure-remove-x11-xmu-checks.patch b/debian/old_patches/0009-configure-remove-x11-xmu-checks.patch
index ac05bb2..ac05bb2 100644
--- a/debian/patches/0009-configure-remove-x11-xmu-checks.patch
+++ b/debian/old_patches/0009-configure-remove-x11-xmu-checks.patch
diff --git a/debian/patches/01_pac_http.patch b/debian/old_patches/01_pac_http.patch
index 5f1e951..5f1e951 100644
--- a/debian/patches/01_pac_http.patch
+++ b/debian/old_patches/01_pac_http.patch
diff --git a/debian/patches/0001-print-suffix-even-if-the-list-is-empty-in-libproxy.patch b/debian/patches/0001-print-suffix-even-if-the-list-is-empty-in-libproxy.patch
new file mode 100644
index 0000000..e9b163a
--- /dev/null
+++ b/debian/patches/0001-print-suffix-even-if-the-list-is-empty-in-libproxy.patch
@@ -0,0 +1,30 @@
+From a5462466c5a224b38ed87814dc9477c17c920d6f Mon Sep 17 00:00:00 2001
+From: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+Date: Thu, 28 Jul 2011 18:58:34 +0100
+Subject: [PATCH] print suffix even if the list is empty in libproxy
+
+Bug: http://code.google.com/p/libproxy/issues/detail?id=164
+Reviewed-by: Nicolas Dufresne (upstream)
+Applied-Upstream: 0.4.8
+---
+ libproxy/modules/pxgconf.cpp | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/libproxy/modules/pxgconf.cpp b/libproxy/modules/pxgconf.cpp
+index d6276a8..641922b 100644
+--- a/libproxy/modules/pxgconf.cpp
++++ b/libproxy/modules/pxgconf.cpp
+@@ -30,7 +30,9 @@ static int print_value(const GConfValue *value, const char *suffix) {
+ return printf("false%s", suffix);
+ case GCONF_VALUE_LIST:
+ cursor = gconf_value_get_list(value);
+- for ( ; cursor ; cursor = g_slist_next(cursor))
++ if (g_slist_length (cursor) == 0)
++ count += printf("%s", suffix);
++ else for ( ; cursor ; cursor = g_slist_next(cursor))
+ count += print_value((const GConfValue *) cursor->data, cursor->next ? "," : suffix);
+ return count;
+ case GCONF_VALUE_PAIR:
+--
+1.7.5.4
+
diff --git a/debian/patches/0007-gnome-do-case-insensitive-cmp.patch b/debian/patches/0007-gnome-do-case-insensitive-cmp.patch
index 28bd93a..149bc96 100644
--- a/debian/patches/0007-gnome-do-case-insensitive-cmp.patch
+++ b/debian/patches/0007-gnome-do-case-insensitive-cmp.patch
@@ -1,29 +1,31 @@
---- a/src/modules/config_gnome.c
-+++ b/src/modules/config_gnome.c
-@@ -145,13 +145,15 @@ _get_config(pxConfigModule *s, pxURL *ur
- char *curl = NULL;
+From: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+Date: Thu, 28 Jul 2011 18:58:34 +0100
+Subject: [PATCH] /system/proxy/mode is capitalized in Maemo
+
+Let libproxy behave corrently under both formats
+
+Origin: Maemo
+Forwarded: not-needed, Maemo only
+
+--- a/libproxy/modules/config_gnome.cpp
++++ b/libproxy/modules/config_gnome.cpp
+@@ -183,13 +183,17 @@ public:
+ this->read_data();
- // Mode is direct://
-+ /* Maemo specific: /system/proxy/mode can be set all capitalized, strcasecmp
-+ * need to be used */
- /* Maemo specific: return direct also if gconf key is not set/present */
- if (px_strdict_get(self->data, "/system/proxy/mode") == NULL ||
-- !strcmp(px_strdict_get(self->data, "/system/proxy/mode"), "none"))
-+ !strcasecmp(px_strdict_get(self->data, "/system/proxy/mode"), "none"))
- curl = px_strdup("direct://");
+ // Mode is wpad:// or pac+http://...
+- if (this->data[PROXY_MODE] == "auto") {
++ /* Maemo Specific: GConf might have the value capitalized, check against
++ * it too */
++ if (this->data[PROXY_MODE] == "auto" || this->data[PROXY_MODE] == "AUTO") {
+ string pac = this->data[PROXY_AUTOCONFIG_URL];
+ return url::is_valid(pac) ? url(string("pac+") + pac) : url("wpad://");
+ }
- // Mode is wpad:// or pac+http://...
-- else if (!strcmp(px_strdict_get(self->data, "/system/proxy/mode"), "auto"))
-+ else if (!strcasecmp(px_strdict_get(self->data, "/system/proxy/mode"), "auto"))
- {
- if (px_url_is_valid(px_strdict_get(self->data, "/system/proxy/autoconfig_url")))
- curl = px_strcat("pac+", px_strdict_get(self->data, "/system/proxy/autoconfig_url"), NULL);
-@@ -160,7 +162,7 @@ _get_config(pxConfigModule *s, pxURL *ur
- }
-
- // Mode is http://... or socks://...
-- else if (!strcmp(px_strdict_get(self->data, "/system/proxy/mode"), "manual"))
-+ else if (!strcasecmp(px_strdict_get(self->data, "/system/proxy/mode"), "manual"))
- {
- char *type = px_strdup("http");
- char *host = NULL;
+ // Mode is http://... or socks://...
+- else if (this->data[PROXY_MODE] == "manual") {
++ /* Maemo Specific: GConf might have the value capitalized, check against
++ * it too */
++ else if (this->data[PROXY_MODE] == "manual" || this->data[PROXY_MODE] == "MANUAL") {
+ string type, host, port;
+ bool auth = this->data[PROXY_USE_AUTHENTICATION] == "true";
+ string username = url::encode(this->data[PROXY_AUTH_USER], URL_ALLOWED_IN_USERINFO_ELEMENT);
diff --git a/debian/patches/0008-gnome-disable-session-detection.patch b/debian/patches/0008-gnome-disable-session-detection.patch
index 02305bc..99137ee 100644
--- a/debian/patches/0008-gnome-disable-session-detection.patch
+++ b/debian/patches/0008-gnome-disable-session-detection.patch
@@ -1,13 +1,23 @@
---- a/src/modules/config_gnome.c
-+++ b/src/modules/config_gnome.c
-@@ -260,8 +260,9 @@ _constructor()
- bool
- px_module_load(pxModuleManager *self)
- {
-- // If we are running in GNOME, then make sure this plugin is registered.
-+ /* Maemo specific: don't check X11 clients, just register the Gnome module
- if (!x_has_client("gnome-session", "gnome-settings-daemon", "gnome-panel", NULL))
- return false;
-+ */
- return px_module_manager_register_module(self, pxConfigModule, _constructor, _destructor);
+From: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+Date: Thu, 28 Jul 2011 18:58:34 +0100
+Subject: [PATCH] config_gnome is always used
+
+Do not try to detect if we're using gnome, it's always true for Maemo
+
+Origin: Maemo
+Forwarded: not-needed, Maemo only
+
+--- a/libproxy/modules/config_gnome.cpp
++++ b/libproxy/modules/config_gnome.cpp
+@@ -301,9 +301,8 @@ static base_extension** gnome_config_ext
}
+
+ static bool gnome_config_extension_test() {
+- return (getenv("GNOME_DESKTOP_SESSION_ID")
+- || (getenv("DESKTOP_SESSION")
+- && string(getenv("DESKTOP_SESSION")) == "gnome"));
++ /* Maemo Specific: we are using Gnome for sure, don't bother to check */
++ return true;
+ }
+
+ MM_MODULE_INIT(gnome_config_extension,
diff --git a/debian/patches/series b/debian/patches/series
index 5148487..2aeacd4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,3 @@
-01_pac_http.patch
-0001-configure-check-for-D-Bus.patch
-# disabled: already in upstream 0002-configure-add-AM_PROG_CC_C_O.patch
-0003-configure-add-m4-stuff.patch
-0004-build-fix-link-flags.patch
-#disabled for now 0005-px-wpad-fallback.patch
-0006-gnome-fix-mode-check.patch
+0001-print-suffix-even-if-the-list-is-empty-in-libproxy.patch
0007-gnome-do-case-insensitive-cmp.patch
0008-gnome-disable-session-detection.patch
-0009-configure-remove-x11-xmu-checks.patch
-TEST.path
diff --git a/debian/rules b/debian/rules
index eb4e93a..75d24b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,31 +1,35 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/autotools.mk
+DH_VERBOSE=1
+
+include /usr/share/cdbs/1/class/cmake.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/gnome.mk
+# gnome class depedns on autotools
+#include /usr/share/cdbs/1/class/gnome.mk
# this is Maemo, not Debian
#include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-SHLIBVER := 0.3.1
+#SHLIBVER := 0.4.7
libproxy := $(shell sed -nr 's/^Package:[[:space:]]*(libproxy[0-9]+)[[:space:]]*$$/\1/p' debian/control)
-DEB_DH_MAKESHLIBS_ARGS_$(libproxy) = -V '$(libproxy) (>= $(SHLIBVER))'
+#DEB_DH_MAKESHLIBS_ARGS_$(libproxy) = -V '$(libproxy) (>= $(SHLIBVER))'
DEB_DH_SHLIBDEPS_ARGS_$(libproxy) := -Xmodules
-DEB_CONFIGURE_EXTRA_FLAGS += --without-dotnet \
- --without-direct \
- --without-python \
- --without-webkit \
- --without-mozjs \
- --without-networkmanager \
- --without-wpad \
- --without-kde4 \
- --without-file \
+DEB_CMAKE_EXTRA_FLAGS += -DWITH_DOTNET="OFF" \
+ -DWITH_KDE4="OFF" \
+ -DWITH_MOZJS="OFF" \
+ -DWITH_WEBKIT="OFF" \
+ -DWITH_NM="OFF" \
+ -DWITH_PERL="OFF" \
+ -DWITH_PYTHON="OFF" \
+ -DWITH_VALA="OFF" \
+ -DWITH_GNOME3="OFF" \
+ -DWITH_GNOME="ON"
-binary-install/python-libproxy::
- dh_pysupport -p$(cdbs_curpkg)
+#binary-install/python-libproxy::
+# dh_pysupport -p$(cdbs_curpkg)
#binary-install/$(libproxy)::
# rm debian/$(libproxy)/usr/lib/libproxy/*/modules/wpad_dnsdevolution.so