diff -Nru debtags-1.7.9/debian/changelog debtags-1.7.9ubuntu1/debian/changelog --- debtags-1.7.9/debian/changelog 2009-01-23 10:55:19.000000000 -0500 +++ debtags-1.7.9ubuntu1/debian/changelog 2009-06-09 15:10:55.000000000 -0400 @@ -1,3 +1,19 @@ +debtags (1.7.9ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #385245), remaining changes: + + debian/control: + - Build-Depend on the build1 version of libept-dev + + debian/rules: + - Use simple-patchsys + - Install a zipped vocabulary to /usr/share/debtags + + debian/patches/10_no_security_team_vocab.patch: + - Don't use Debian's security team's tags + + debian/patches/12_sources_usr_share.patch: + - Point sources.list at /usr/share/debtags instead of apt:// + * Made previous in-source changes into above patches + + -- Michael Terry Tue, 09 Jun 2009 14:32:31 -0400 + debtags (1.7.9) unstable; urgency=low * Build with new libept @@ -17,6 +33,29 @@ -- Enrico Zini Fri, 23 Jan 2009 14:02:57 +0100 +debtags (1.7.7ubuntu3) jaunty; urgency=low + + * debian/patches/02_fix_ftbfs.diff: + - fix build failure + + -- Michael Vogt Tue, 10 Feb 2009 21:35:20 +0100 + +debtags (1.7.7ubuntu2) jaunty; urgency=low + + * rebuild against latest libept + + -- Michael Vogt Mon, 09 Feb 2009 16:36:06 +0100 + +debtags (1.7.7ubuntu1) jaunty; urgency=low + + * Merge with Debian, remaining changes: + - edit sources.list to use /usr/share/debtags instead of apt:/ + - include vocabulary.gz installed to /usr/share/debtags (edit Makefile.am) + - edit get_tabs and get_vocabulary to use anonymous svn and rerun autogen.sh + * Add patch kubuntu_01_api_fix.diff for libept API change + + -- Jonathan Riddell Thu, 20 Nov 2008 17:17:56 +0000 + debtags (1.7.7) unstable; urgency=low * Updated tag vocabulary @@ -30,6 +69,15 @@ -- Enrico Zini Mon, 30 Jun 2008 16:59:53 +0200 +debtags (1.7.5ubuntu1) intrepid; urgency=low + + * Merge with Debian, remaining changes: + - edit sources.list to use /usr/share/debtags instead of apt:/ + - include vocabulary.gz installed to /usr/share/debtags (edit Makefile.am) + - edit get_tabs and get_vocabulary to use anonymous svn and rerun autogen.sh + + -- Jonathan Riddell Wed, 11 Jun 2008 16:31:10 +0000 + debtags (1.7.5) unstable; urgency=low * Depend on new libept. Closes: #472796, #472911 @@ -60,6 +108,33 @@ -- Bas Wijnen Thu, 13 Mar 2008 11:16:22 +0100 +debtags (1.7.3ubuntu4) hardy; urgency=low + + * Fix build failure with g++-4.3. + + -- Matthias Klose Thu, 24 Jan 2008 17:38:27 +0000 + +debtags (1.7.3ubuntu3) hardy; urgency=low + + * Rebuild for new libept + + -- Jonathan Riddell Tue, 18 Dec 2007 15:00:58 +0000 + +debtags (1.7.3ubuntu2) gutsy; urgency=low + + * rebuild against latest libept + + -- Michael Vogt Fri, 03 Aug 2007 22:02:24 +0200 + +debtags (1.7.3ubuntu1) gutsy; urgency=low + + * Merge with Debian, remaining changes: + - edit sources.list to use /usr/share/debtags instead of apt:/ + - include vocabulary.gz installed to /usr/share/debtags (edit Makefile.am) + - edit get_tabs and get_vocabulary to use anonymous svn and rerun autogen.sh + + -- Jonathan Riddell Wed, 11 Jul 2007 09:16:29 +0000 + debtags (1.7.3) unstable; urgency=low * Allow to install extra tag sources in /etc/debtags/sources.list.d/ @@ -83,6 +158,33 @@ -- Enrico Zini Tue, 12 Jun 2007 20:05:16 +0100 +debtags (1.7.0ubuntu2really1.6.6ubuntu6) gutsy; urgency=low + + * Recompile for new apt + + -- Sarah Hobbs Mon, 09 Jul 2007 14:39:17 +1000 + +debtags (1.7.0ubuntu2really1.6.6ubuntu5) gutsy; urgency=low + + * Revert to 1.6.6ubuntu5 until we port Adept to new debtags + + -- Jonathan Riddell Mon, 25 Jun 2007 17:47:10 +0100 + +debtags (1.7.0ubuntu2) gutsy; urgency=low + + * Recompile for new apt + + -- Jonathan Riddell Wed, 20 Jun 2007 19:55:15 +0100 + +debtags (1.7.0ubuntu1) gutsy; urgency=low + + * Merge with Debian, remaining changes: + - edit sources.list to use /usr/share/debtags instead of apt:/ + - include vocabulary.gz installed to /usr/share/debtags (edit Makefile.am) + - edit get_tabs and get_vocabulary to use anonymous svn and rerun autogen.sh + + -- Jonathan Riddell Thu, 14 Jun 2007 12:25:35 +0100 + debtags (1.7.0) unstable; urgency=low * Fixed documentation of search and grep. Closes: #397516, #399102. @@ -95,6 +197,40 @@ -- Enrico Zini Sat, 09 Jun 2007 21:33:27 +0100 +debtags (1.6.6ubuntu5) feisty; urgency=low + + * Rebuilt against new apt + + -- Jonathan Riddell Mon, 26 Feb 2007 20:51:38 +0000 + +debtags (1.6.6ubuntu4) feisty; urgency=low + + * Rebuilt against new apt + + -- Anthony Mercatante Wed, 07 Feb 2007 00:28:22 +0100 + +debtags (1.6.6ubuntu3) feisty; urgency=low + + * Re-run autogen.sh since vocabulary and tags were missing due + to svn access issue during latest run. + + -- Anthony Mercatante Wed, 17 Jan 2007 23:59:22 +0100 + +debtags (1.6.6ubuntu2) feisty; urgency=low + + * Re-run autogen.sh making sure libept and taglib are installed, + fixes build failure + + -- Jonathan Riddell Tue, 16 Jan 2007 14:44:09 +0000 + +debtags (1.6.6ubuntu1) feisty; urgency=low + + * Merge with Debian, remaining changes: + - edit sources.list to use /usr/share/debtags instead of apt:/ + - include vocabulary.gz installed to /usr/share/debtags (edit Makefile.am) + + -- Jonathan Riddell Thu, 7 Dec 2006 10:27:07 +0000 + debtags (1.6.6) unstable; urgency=high * Build-Depend on new libept. Closes: bug#400994. @@ -111,6 +247,14 @@ -- Enrico Zini Sat, 18 Nov 2006 18:35:46 +0100 +debtags (1.6.4ubuntu1) feisty; urgency=low + + * Merge with Debian, remaining changes: + - edit sources.list to use /usr/share/debtags instead of apt:/ + - include vocabulary.gz installed to /usr/share/debtags (edit Makefile.am) + + -- Jonathan Riddell Fri, 24 Nov 2006 15:11:45 +0000 + debtags (1.6.4) unstable; urgency=low * Depends on new libept, which creates ~/.debtags if it is needed and @@ -150,6 +294,20 @@ -- Enrico Zini Wed, 4 Oct 2006 10:03:56 +0200 +debtags (1.5.5ubuntu2) edgy; urgency=low + + * Add file:///usr/share/debtags/ to sources.list, unlike Debian we + don't ship Tags in our apt Packages list + * Include vocabulary.gz in /usr/share/debtags/ + + -- Jonathan Riddell Tue, 22 Aug 2006 14:17:09 +0000 + +debtags (1.5.5ubuntu1) edgy; urgency=low + + * rebuild against latest apt + + -- Michael Vogt Tue, 15 Aug 2006 16:06:57 +0200 + debtags (1.5.5) unstable; urgency=low * Added dumpavail command. diff -Nru debtags-1.7.9/debian/control debtags-1.7.9ubuntu1/debian/control --- debtags-1.7.9/debian/control 2009-01-23 10:55:19.000000000 -0500 +++ debtags-1.7.9ubuntu1/debian/control 2009-06-09 13:00:06.000000000 -0400 @@ -1,9 +1,10 @@ Source: debtags Section: admin Priority: optional -Maintainer: Enrico Zini +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Enrico Zini Uploaders: Arnaud Fontaine -Build-Depends: c++abi2-dev, cdbs, debhelper (>> 4.1), dh-buildinfo, pkg-config, apt, libept-dev (>= 0.5.26), libept-dev (<< 0.6), zlib1g-dev, python-dev, python-docutils, libtagcoll2-dev (>= 2.0.4), libtagcoll2-dev (<<2.1), libwibble-dev (>= 0.1.15), libwibble-dev (<< 0.2) +Build-Depends: c++abi2-dev, cdbs, debhelper (>> 4.1), dh-buildinfo, pkg-config, apt, libept-dev (>= 0.5.26build1), libept-dev (<< 0.6), zlib1g-dev, python-dev, python-docutils, libtagcoll2-dev (>= 2.0.4), libtagcoll2-dev (<<2.1), libwibble-dev (>= 0.1.15), libwibble-dev (<< 0.2) Standards-Version: 3.8.0.0 Vcs-Svn: svn://svn.debian.org/svn/debtags/debtags/1.7 Vcs-Browser: http://svn.debian.org/wsvn/debtags/debtags/1.7 diff -Nru debtags-1.7.9/debian/patches/10_no_security_team_vocab.patch debtags-1.7.9ubuntu1/debian/patches/10_no_security_team_vocab.patch --- debtags-1.7.9/debian/patches/10_no_security_team_vocab.patch 1969-12-31 19:00:00.000000000 -0500 +++ debtags-1.7.9ubuntu1/debian/patches/10_no_security_team_vocab.patch 2009-06-09 14:28:54.000000000 -0400 @@ -0,0 +1,35 @@ +# +# Description: Don't include Debian's security team's tags in the vocabulary +# UbuntuSpecific: Debian's security tags don't apply to us +# +diff -Nur -x '*.orig' -x '*~' debtags-1.7.9.final/vocabulary debtags-1.7.9.final.new/vocabulary +--- debtags-1.7.9.final/vocabulary 2009-06-09 14:27:55.000000000 -0400 ++++ debtags-1.7.9.final.new/vocabulary 2009-06-09 14:28:32.000000000 -0400 +@@ -2580,27 +2580,3 @@ + + Tag: vi + Description: VI Editor +- +- +-Facet: secteam +-Description: Security status +- +-Tag: secteam::etch-unsupported +-Description: No security support on etch +- The security team can not offer security support in Debian Etch for this +- package. +- +-Tag: secteam::lenny-unsupported +-Description: No security support on lenny +- The security team can not offer security support in Debian Lenny for this +- package. +- +-Tag: secteam::etch-limited-support +-Description: Limited scope of security support, see README.Debian +- Security support for this package is limited in covered functionality +- or to specific use cases. Please see README.Debian for details. +- +-Tag: secteam::lenny-limited-support +-Description: Limited scope of security support, see README.Debian +- Security support for this package is limited in covered functionality +- or to specific use cases. Please see README.Debian for details. diff -Nru debtags-1.7.9/debian/patches/12_sources_usr_share.patch debtags-1.7.9ubuntu1/debian/patches/12_sources_usr_share.patch --- debtags-1.7.9/debian/patches/12_sources_usr_share.patch 1969-12-31 19:00:00.000000000 -0500 +++ debtags-1.7.9ubuntu1/debian/patches/12_sources_usr_share.patch 2009-06-09 14:32:14.000000000 -0400 @@ -0,0 +1,22 @@ +# +# Description: Ship vocabulary in /usr/share and point at it, not apt:// +# UbuntuSpecific: We don't ship our tags in the apt database, like Debian does +# +diff -Nur -x '*.orig' -x '*~' debtags-1.7.9.final/sources.list debtags-1.7.9.final.new/sources.list +--- debtags-1.7.9.final/sources.list 2008-06-30 09:58:13.000000000 -0400 ++++ debtags-1.7.9.final.new/sources.list 2009-06-09 12:42:42.000000000 -0400 +@@ -7,7 +7,7 @@ + # To contribute tags, please visit http://debtags.alioth.debian.org/todo.html + + # Reviewed tag data from the APT Packages file +-tags apt:// ++#tags apt:// + + + # Package rating from http://www.iterating.org +@@ -41,3 +41,5 @@ + # similar to /var/lib/debtags/vocabulary. + # + #tags file:/etc/debtags/mytags ++ ++tags file:///usr/share/debtags/ diff -Nru debtags-1.7.9/debian/rules debtags-1.7.9ubuntu1/debian/rules --- debtags-1.7.9/debian/rules 2008-06-30 09:58:13.000000000 -0400 +++ debtags-1.7.9ubuntu1/debian/rules 2009-06-09 15:02:08.000000000 -0400 @@ -2,9 +2,13 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk DEB_CONFIGURE_EXTRA_FLAGS += --disable-shared +binary-install/debtags:: + gzip -9 -c $(DEB_DESTDIR)/usr/share/debtags/vocabulary > $(DEB_DESTDIR)/usr/share/debtags/vocabulary.gz + # Store build information common-binary-post-install-arch common-binary-post-install-indep:: dh_buildinfo Binary files /tmp/x9sP0mLyWL/debtags-1.7.9/tags-current.gz and /tmp/AgCc7e0Pn7/debtags-1.7.9ubuntu1/tags-current.gz differ