Package: licq Version: 1.3.0-2 Severity: normal Followup-For: Bug #276943 This patch solves 2 things: * support for a plugin-msn package * fix of buildfailure when a variable for option --build is not set
-- System Information: Debian Release: testing/unstable APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.6.11.10-sws-sws Locale: LANG=C, LC_CTYPE=C Versions of packages licq depends on: ii libc6 2.3.2.ds1-21 GNU C Library: Shared libraries an ii libgcc1 1:3.4.2-3 GCC support library ii libgpgme6 0.3.16-2 GPGME - GnuPG Made Easy ii libssl0.9.7 0.9.7d-1 SSL shared libraries ii libstdc++5 1:3.3.4-3 The GNU Standard C++ Library v3 ii licq-plugin-autorep 1.3.0-2 autoreply plug-in for Licq ii licq-plugin-console 1.3.0-2 console user interface plug-in for ii licq-plugin-forward 1.3.0-2 forwarder plug-in for Licq ii licq-plugin-jonsgtk 1:0.20+cvs20041001-1 graphical user interface plug-in f ii licq-plugin-kde [li 1.3.0-2 graphical user interface plug-in f ii licq-plugin-mns [li 1.3.0-2 msn plugin ii licq-plugin-osd [li 1.3.0-2 on-screen display plug-in for Licq ii licq-plugin-qt [lic 1.3.0-2 graphical user interface plug-in f ii licq-plugin-rms [li 1.3.0-2 remote management server plug-in f -- no debconf information
diff -u licq-1.3.0/debian/control licq-1.3.0.matthias/debian/control --- licq-1.3.0/debian/control 2005-05-24 09:55:36.000000000 +0200 +++ licq-1.3.0.matthias/debian/control 2005-05-24 09:53:22.000000000 +0200 @@ -129,3 +129,12 @@ this plug-in, you probably shouldn't install it. . Home page: http://www.licq.org/ + +Package: licq-plugin-msn +Architecture: any +Depends: ${shlibs:Depends}, licq (= ${Source-Version}) +Provides: licq-plugin +Description: msn plugin - EXPERIMENTAL + This package provides the means to use the MSN-Network + . + Home page: http://www.licq.org/ Only in licq-1.3.0.matthias/debian/: files Only in licq-1.3.0.matthias/debian/: licq Only in licq-1.3.0.matthias/debian/: licq-dev Only in licq-1.3.0.matthias/debian/: licq-plugin-autoreply Only in licq-1.3.0.matthias/debian/: licq-plugin-autoreply.substvars Only in licq-1.3.0.matthias/debian/: licq-plugin-console Only in licq-1.3.0.matthias/debian/: licq-plugin-console.substvars Only in licq-1.3.0.matthias/debian/: licq-plugin-forwarder Only in licq-1.3.0.matthias/debian/: licq-plugin-forwarder.substvars Only in licq-1.3.0.matthias/debian/: licq-plugin-kde Only in licq-1.3.0.matthias/debian/: licq-plugin-kde.substvars Only in licq-1.3.0.matthias/debian/: licq-plugin-mns Only in licq-1.3.0.matthias/debian/: licq-plugin-msn Only in licq-1.3.0.matthias/debian/: licq-plugin-msn.docs Only in licq-1.3.0.matthias/debian/: licq-plugin-osd Only in licq-1.3.0.matthias/debian/: licq-plugin-osd.substvars Only in licq-1.3.0.matthias/debian/: licq-plugin-qt Only in licq-1.3.0.matthias/debian/: licq-plugin-qt.substvars Only in licq-1.3.0.matthias/debian/: licq-plugin-rms Only in licq-1.3.0.matthias/debian/: licq-plugin-rms.substvars Only in licq-1.3.0.matthias/debian/: licq.postinst.debhelper Only in licq-1.3.0.matthias/debian/: licq.postrm.debhelper Only in licq-1.3.0.matthias/debian/: licq.substvars Common subdirectories: licq-1.3.0/debian/man and licq-1.3.0.matthias/debian/man Only in licq-1.3.0.matthias/debian/: patched Common subdirectories: licq-1.3.0/debian/patches and licq-1.3.0.matthias/debian/patches diff -u licq-1.3.0/debian/rules licq-1.3.0.matthias/debian/rules --- licq-1.3.0/debian/rules 2005-05-24 09:55:36.000000000 +0200 +++ licq-1.3.0.matthias/debian/rules 2005-05-24 09:24:22.000000000 +0200 @@ -3,11 +3,14 @@ include /usr/share/dpatch/dpatch.make .NOTPARALLEL: - -ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) - confflags += --build $(DEB_HOST_GNU_TYPE) +ifeq ($(DEB_HOST_GNU_TYPE),$(THISNOTEXISTS)) + confflags += else - confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) + ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build $(DEB_HOST_GNU_TYPE) + else + confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) + endif endif confflags += --prefix=/usr confflags += --cache-file=$(CURDIR)/config.cache @@ -35,14 +38,14 @@ QTGUI=qt-gui KDEGUI=kde-gui RMS=rms - +MSN=msn prebuild-stamp: patch-stamp cp -a plugins/$(QTGUI) plugins/$(KDEGUI) touch prebuild-stamp build: prebuild-stamp build-stamp -build-stamp: prebuild-stamp build-licq build-autoreply build-console build-forwarder build-kdegui build-osd build-qtgui build-rms +build-stamp: prebuild-stamp build-licq build-autoreply build-console build-forwarder build-kdegui build-osd build-qtgui build-rms build-msn dh_testdir touch build-stamp @@ -144,6 +147,15 @@ cd plugins/$(RMS) && $(MAKE) touch build-rms +configure-msn: patch-stamp + dh_testdir + cd plugins/$(MSN) && ./configure $(confflags) + touch configure-msn + +build-msn: configure-msn + cd plugins/$(MSN) && $(MAKE) + touch build-msn + clean: clean-patched unpatch clean-patched: @@ -157,12 +169,14 @@ rm -f configure-qtgui build-qtgui rm -f configure-kdegui build-kdegui rm -f configure-rms build-rms + rm -f configure-msn build-msn -cd plugins/$(AUTOREPLY) && $(MAKE) distclean -cd plugins/$(CONSOLE) && $(MAKE) distclean -cd plugins/$(FORWARDER) && $(MAKE) distclean -cd plugins/$(OSD) && $(MAKE) distclean -cd plugins/$(QTGUI) && $(MAKE) distclean -cd plugins/$(RMS) && $(MAKE) distclean + -cd plugins/$(MSN) && $(MAKE) distclean -$(MAKE) distclean rm -f po/stamp-po rm -rf plugins/$(KDEGUI) @@ -188,6 +202,7 @@ $(MAKE) -C plugins/$(QTGUI) install DESTDIR=$(CURDIR)/debian/licq-plugin-qt $(MAKE) -C plugins/$(KDEGUI) install DESTDIR=$(CURDIR)/debian/licq-plugin-kde $(MAKE) -C plugins/$(RMS) install DESTDIR=$(CURDIR)/debian/licq-plugin-rms + $(MAKE) -C plugins/$(MSN) install DESTDIR=$(CURDIR)/debian/licq-plugin-msn # install lintian overrides for pkg in $(PACKAGES) ; do \
plugins/msn/README
