~ubuntu-branches/ubuntu/precise/synaptic/precise-proposed

« back to all changes in this revision

Viewing changes to debian/patches/11_use-pkexec.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers, Michael Vogt, Marc Deslauriers
  • Date: 2011-08-17 20:23:46 UTC
  • Revision ID: james.westby@ubuntu.com-20110817202346-4tn1e3mrddsivwg6
Tags: 0.75.2ubuntu5
[ Michael Vogt ]
* debian/control:
  - fix vcs-bzr header

[ Marc Deslauriers ]
* debian/patches/11_use-pkexec.dpatch: fix timestamps to prevent race
  from regenerating the Makefile. (LP: #828315)

Show diffs side-by-side

added added

removed removed

Lines of Context:
5
5
@DPATCH@
6
6
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' synaptic-0.75.2ubuntu4~/data/Makefile.am synaptic-0.75.2ubuntu4/data/Makefile.am
7
7
--- synaptic-0.75.2ubuntu4~/data/Makefile.am    2011-08-02 04:11:58.000000000 -0400
8
 
+++ synaptic-0.75.2ubuntu4/data/Makefile.am     2011-08-17 09:14:39.206426075 -0400
 
8
+++ synaptic-0.75.2ubuntu4/data/Makefile.am     2011-08-11 08:42:16.968978987 -0400
9
9
@@ -1,4 +1,5 @@
10
10
 @INTLTOOL_DESKTOP_RULE@
11
11
+@INTLTOOL_POLICY_RULE@
29
29
+               $(dist_polkit_policy_in_files)
30
30
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' synaptic-0.75.2ubuntu4~/data/Makefile.in synaptic-0.75.2ubuntu4/data/Makefile.in
31
31
--- synaptic-0.75.2ubuntu4~/data/Makefile.in    2011-08-08 08:28:45.000000000 -0400
32
 
+++ synaptic-0.75.2ubuntu4/data/Makefile.in     2011-08-17 09:14:39.206426075 -0400
 
32
+++ synaptic-0.75.2ubuntu4/data/Makefile.in     2011-08-11 08:42:33.818978982 -0400
33
33
@@ -33,7 +33,8 @@
34
34
 PRE_UNINSTALL = :
35
35
 POST_UNINSTALL = :
150
150
 # Otherwise a system limit (for SysV at least) may be exceeded.
151
151
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' synaptic-0.75.2ubuntu4~/data/com.ubuntu.pkecec.synaptic.policy.in synaptic-0.75.2ubuntu4/data/com.ubuntu.pkecec.synaptic.policy.in
152
152
--- synaptic-0.75.2ubuntu4~/data/com.ubuntu.pkecec.synaptic.policy.in   1969-12-31 19:00:00.000000000 -0500
153
 
+++ synaptic-0.75.2ubuntu4/data/com.ubuntu.pkecec.synaptic.policy.in    2011-08-17 09:14:49.246426144 -0400
 
153
+++ synaptic-0.75.2ubuntu4/data/com.ubuntu.pkecec.synaptic.policy.in    2011-08-11 08:40:45.478979011 -0400
154
154
@@ -0,0 +1,19 @@
155
155
+<?xml version="1.0" encoding="UTF-8"?>
156
156
+<!DOCTYPE policyconfig PUBLIC
173
173
+</policyconfig>
174
174
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' synaptic-0.75.2ubuntu4~/data/com.ubuntu.pkexec.synaptic.policy synaptic-0.75.2ubuntu4/data/com.ubuntu.pkexec.synaptic.policy
175
175
--- synaptic-0.75.2ubuntu4~/data/com.ubuntu.pkexec.synaptic.policy      1969-12-31 19:00:00.000000000 -0500
176
 
+++ synaptic-0.75.2ubuntu4/data/com.ubuntu.pkexec.synaptic.policy       2011-08-17 09:14:55.406426186 -0400
 
176
+++ synaptic-0.75.2ubuntu4/data/com.ubuntu.pkexec.synaptic.policy       2011-08-11 08:40:44.388979011 -0400
177
177
@@ -0,0 +1,19 @@
178
178
+<?xml version="1.0" encoding="UTF-8"?>
179
179
+<!DOCTYPE policyconfig PUBLIC