Summary: Merge was stuck in merge-o-matic due to Diff3 conflict markers. Now resolved. Test Plan: check if this is indeed correct merge according to ubuntu standards. Reviewers: wxl, kc2bez Reviewed By: wxl, kc2bez Differential Revision: https://phab.lubuntu.me/D104
		
			
				
	
	
		
			194 lines
		
	
	
		
			5.8 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			194 lines
		
	
	
		
			5.8 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| lxqt-build-tools (0.8.0-1ubuntu1) hirsute; urgency=medium
 | |
| 
 | |
|   * Merge from Debian unstable. No other changes.
 | |
| 
 | |
|  -- Raman Sarda <theloudspeaker@ubuntu.com>  Sat, 16 Jan 2021 02:10:00 +0530
 | |
| 
 | |
| lxqt-build-tools (0.8.0-1) unstable; urgency=medium
 | |
| 
 | |
|   * Team upload.
 | |
| 
 | |
|   [ Sophie Brun ]
 | |
|   * Update the debian/upstream/signing-key.asc
 | |
|   * New upstream version 0.8.0
 | |
|   * Move the specific lxqt build scripts in usr/share/lxqt-build-tools/bin
 | |
|   * Bump Standards-Version to 4.5.1 (no changes)
 | |
|   * Update debian/copyright
 | |
| 
 | |
|   [ Raphael Hertzog ]
 | |
|   * Drop ${shlib:Depends} as this is an arch all package
 | |
| 
 | |
|  -- Sophie Brun <sophie@offensive-security.com>  Wed, 16 Dec 2020 09:51:50 +0100
 | |
| 
 | |
| lxqt-build-tools (0.7.0-0ubuntu1) groovy; urgency=medium
 | |
| 
 | |
|   * New upstream release.
 | |
|     - Update the upstream signing key.
 | |
|   * Bump Standards-version to 4.5.0, no changes needed.
 | |
|   * Run wrap-and-sort.
 | |
| 
 | |
|  -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 03 Jun 2020 22:06:40 -0500
 | |
| 
 | |
| lxqt-build-tools (0.6.0-3) unstable; urgency=medium
 | |
| 
 | |
|   * Switched to gbp
 | |
|   * Bumped Standards-Version to 4.4.0, no changes needed
 | |
|   * Added debin/bin/gbp-buildpackage - first iteration
 | |
|   * Added debian/bin/gbp-import-orig - first iteration
 | |
|   * Fixed .gitignore
 | |
| 
 | |
|  -- Alf Gaida <agaida@siduction.org>  Mon, 26 Aug 2019 02:31:21 +0200
 | |
| 
 | |
| lxqt-build-tools (0.6.0-2ubuntu1) disco; urgency=medium
 | |
| 
 | |
|   * Merge from Debian testing. Remaining changes:
 | |
|     - Update Vcs-* and Maintainer to Lubuntu values.
 | |
| 
 | |
|  -- Rik Mills <rikmills@kubuntu.org>  Wed, 27 Mar 2019 17:07:06 +0000
 | |
| 
 | |
| lxqt-build-tools (0.6.0-2) unstable; urgency=medium
 | |
| 
 | |
|   * Removed libqt5xdg-dev - would introduce a cycle dependency when used
 | |
|     with libqtxdg
 | |
| 
 | |
|  -- Alf Gaida <agaida@siduction.org>  Sun, 24 Feb 2019 15:31:13 +0100
 | |
| 
 | |
| lxqt-build-tools (0.6.0-1) unstable; urgency=medium
 | |
| 
 | |
|   * Cherry-picking new upstream release 0.6.0
 | |
|   * Bumped Standards to 4.3.0, no changes needed
 | |
|   * Dropped d/compat, use debhelper-compat = 12, no changes needed
 | |
|   * Fixed years in d/copyright
 | |
|   * Fixed d/lintian-overrides
 | |
| 
 | |
|  -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 13:11:49 +0100
 | |
| 
 | |
| lxqt-build-tools (0.6.0-0ubuntu1) disco; urgency=medium
 | |
| 
 | |
|   * New upstream release.
 | |
|   * Bump Standards-version to 4.3.0, no changes needed.
 | |
|   * Bump debhelper compat to 12, no changes needed.
 | |
| 
 | |
|  -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 25 Jan 2019 22:01:43 -0600
 | |
| 
 | |
| lxqt-build-tools (0.5.0-1) unstable; urgency=medium
 | |
| 
 | |
|   * Cherry-picking new upstream release 0.5.0
 | |
| 
 | |
|  -- Alf Gaida <agaida@siduction.org>  Wed, 23 May 2018 02:50:35 +0200
 | |
| 
 | |
| lxqt-build-tools (0.5.0-0ubuntu1) cosmic; urgency=medium
 | |
| 
 | |
|   * New upstream release.
 | |
|   * Update Vcs-* and Maintainer to Lubuntu values.
 | |
|   * Update copyright.
 | |
|   * Update build depends.
 | |
| 
 | |
|  -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 21 May 2018 21:42:16 -0500
 | |
| 
 | |
| lxqt-build-tools (0.4.0-7) unstable; urgency=medium
 | |
| 
 | |
|   * Really fixed VCS fields
 | |
|   * Fixed watch file
 | |
| 
 | |
|  -- Alf Gaida <agaida@siduction.org>  Sun, 29 Apr 2018 23:12:38 +0200
 | |
| 
 | |
| lxqt-build-tools (0.4.0-6) unstable; urgency=medium
 | |
| 
 | |
|   * Bumped compat to 11
 | |
|   * Bumped debhelper to >= 11~
 | |
|   * Removed cmake minimum version
 | |
|   * Bumped Standards to 4.1.4
 | |
|   * Changed VCS fields for salsa
 | |
|   * Fixed homepage and Sources url to /lxqt
 | |
|   * Bumped years in copyright
 | |
|   * Removed trailing whitespaces
 | |
| 
 | |
|  -- Alf Gaida <agaida@siduction.org>  Thu, 26 Apr 2018 20:48:51 +0200
 | |
| 
 | |
| lxqt-build-tools (0.4.0-5) unstable; urgency=medium
 | |
| 
 | |
|   * Bumped Standards to 4.1.2
 | |
|   * Removed branch from VCS fields
 | |
|   * Removed debian/gbp.conf
 | |
| 
 | |
|  -- Alf Gaida <agaida@siduction.org>  Thu, 14 Dec 2017 18:28:07 +0100
 | |
| 
 | |
| lxqt-build-tools (0.4.0-4) unstable; urgency=medium
 | |
| 
 | |
|   * Switch to unstable
 | |
| 
 | |
|  -- Alf Gaida <agaida@siduction.org>  Mon, 04 Dec 2017 02:49:26 +0100
 | |
| 
 | |
| lxqt-build-tools (0.4.0-3) experimental; urgency=medium
 | |
| 
 | |
|   * Demote git and lintian to recommends - if not installed some dev-scripts
 | |
|     will not  work, a dev should know how to handle the situation.
 | |
| 
 | |
|  -- Alf Gaida <agaida@siduction.org>  Wed, 25 Oct 2017 01:42:18 +0200
 | |
| 
 | |
| lxqt-build-tools (0.4.0-2) experimental; urgency=medium
 | |
| 
 | |
|   * Fixed symmangle - sort order is defined by LC_ALL, so using
 | |
|     LC_ALL=C is a good idea in the script
 | |
|   * Renamed get-snapshot to git-snapshot
 | |
|   * Bumped qtxdg dependency to >= 3.1.0
 | |
|   * Added lintian-overrides
 | |
| 
 | |
|  -- Alf Gaida <agaida@siduction.org>  Sun, 22 Oct 2017 17:01:49 +0200
 | |
| 
 | |
| lxqt-build-tools (0.4.0-1) experimental; urgency=medium
 | |
| 
 | |
|   * Cherry-picking new upstream release 0.4.0
 | |
|   * Added some pkg-lxqt tools:
 | |
|     - evil: the (in)famous lintian -EvIL ...
 | |
|     - mangle: mangle single symbols
 | |
|     - symmangle: mangle whole symbol files
 | |
|     - git-versions: get current upstream git versions
 | |
|     - get-snapshot: get a git snapshot
 | |
| 
 | |
|  -- Alf Gaida <agaida@siduction.org>  Sat, 23 Sep 2017 16:28:13 +0200
 | |
| 
 | |
| lxqt-build-tools (0.3.2-1) unstable; urgency=medium
 | |
| 
 | |
|   * Cherry-picking upstream version 0.3.2.
 | |
|   * Switched Architecture any --> all
 | |
| 
 | |
|  -- Alf Gaida <agaida@siduction.org>  Sat, 14 Jan 2017 00:55:40 +0100
 | |
| 
 | |
| lxqt-build-tools (0.3.1-1) unstable; urgency=medium
 | |
| 
 | |
|   * Cherry-picking upstream version 0.3.1.
 | |
|   * Bumped years in d/copyright
 | |
| 
 | |
|  -- Alf Gaida <agaida@siduction.org>  Mon, 02 Jan 2017 02:59:25 +0100
 | |
| 
 | |
| lxqt-build-tools (0.3.0-1) unstable; urgency=medium
 | |
| 
 | |
|   * Cherry-picking upstream version 0.3.0.
 | |
|   * Fixed VCS-Fields to branch debian/sid
 | |
| 
 | |
|  -- Alf Gaida <agaida@siduction.org>  Tue, 06 Dec 2016 22:27:16 +0100
 | |
| 
 | |
| lxqt-build-tools (0.2.0-3) unstable; urgency=medium
 | |
| 
 | |
|   * Added missed dependency libqt5xdg-dev (>= 2.0.0)
 | |
| 
 | |
|  -- Alf Gaida <agaida@siduction.org>  Fri, 04 Nov 2016 19:23:20 +0100
 | |
| 
 | |
| lxqt-build-tools (0.2.0-1) unstable; urgency=medium
 | |
| 
 | |
|   * Cherry-picking upstream release 0.2.0
 | |
|   * Added build dependency qtbase5-dev
 | |
|   * Added dependency cmake (>= 3.0.2)
 | |
|   * Switch Architecture to any again
 | |
| 
 | |
|  -- Alf Gaida <agaida@siduction.org>  Sun, 30 Oct 2016 15:39:40 +0100
 | |
| 
 | |
| lxqt-build-tools (0.1.0-1) unstable; urgency=medium
 | |
| 
 | |
|   * Initial release (Closes: #839943)
 | |
| 
 | |
|  -- Alf Gaida <agaida@siduction.org>  Fri, 14 Oct 2016 23:05:03 +0200
 | |
| 
 |