[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, ubuntu, created. 6b3b14f7b8c59b3114bb2327ded19b56e5a671da

John Goerzen jgoerzen at complete.org
Wed Apr 20 07:42:49 UTC 2011 

The branch, ubuntu has been created
        at  6b3b14f7b8c59b3114bb2327ded19b56e5a671da (commit)

- Shortlog ------------------------------------------------------------
commit 6b3b14f7b8c59b3114bb2327ded19b56e5a671da
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:50:49 2010 -0600

    Imported ubuntu 3.0.2-3ubuntu2

commit f274c461029f77e98ce7bde7a5df52d31600b2b6
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:50:32 2010 -0600

    Imported ubuntu 3.0.2-3ubuntu1

commit a0fa5b15e4b6df65225feea8c6f8a49b1afd2d17
Merge: 9b0dfa9 e7f4900
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:49:46 2010 -0600

    Merge commit 'debian/3.0.2-3' into ubuntu
    
    Conflicts:
    	debian/bacula-director-common.bacula-director.init
    	debian/bacula-director-sqlite.postinst
    	debian/bacula-traymonitor.install
    	debian/changelog
    	debian/control
    	debian/po/ja.po
    	debian/rules
    	po/de.po
    
    resolved conflicts with versions from 3.0.2-3ubuntu1

commit 9b0dfa98dfee526f23c7db3316e1c25583679d7d
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:46:58 2010 -0600

    Imported ubuntu 2.4.4-1ubuntu9

commit 9e60c1abcf149c9193529bf4ffab69564140c613
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:46:47 2010 -0600

    Imported ubuntu 2.4.4-1ubuntu8

commit 9b4fee561b7274cc2bdc27bca031a67f44df2ad2
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:46:28 2010 -0600

    Imported ubuntu 2.4.4-1ubuntu7

commit bac6403f10610a1878b2af8b9ba1bcdd39b55d49
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:46:07 2010 -0600

    Imported ubuntu 2.4.4-1ubuntu6

commit 7fd614ee04ceabbeb57281515ecc06be0d28b8d7
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:44:51 2010 -0600

    Imported ubuntu 2.4.4-1ubuntu5

commit 95864fcb4c6f26c6ba272c1067c4996c405d75f3
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:44:36 2010 -0600

    Imported ubuntu 2.4.4-1ubuntu4

commit a7daf03b109dc8296188a94be91fdf43bded5698
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:44:16 2010 -0600

    Imported ubuntu 2.4.4-1ubuntu3

commit e160d16c7057c8ef2acd96b46c1f826d08ea0e32
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:43:53 2010 -0600

    Imported ubuntu 2.4.4-1ubuntu2

commit 6c421f18e81b46dce0c8c36be21bd210324344eb
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:43:04 2010 -0600

    Imported ubuntu 2.4.4-1ubuntu1

commit 9a8354d50e6ff6b8f997c373e8b2e5aa91c37584
Merge: f204924 8ed8b91
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:42:28 2010 -0600

    Merge commit 'debian/2.4.4-1' into ubuntu
    
    Conflicts:
    	debian/changelog
    
    resolved conflict with 2.4.4-1ubuntu1 file

commit f204924195cbc58702cc3e77b86ed2b03f86b92e
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:41:07 2010 -0600

    Imported ubuntu 2.4.3-1ubuntu2

commit 8da043337919e01d7e1503f5f99c3e34eabc4745
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:40:06 2010 -0600

    Imported ubuntu 2.4.3-1ubuntu1

commit 0235276af70634867ca950d0b6fb95c0d9cae613
Merge: 6392b40 447fc0f
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:39:15 2010 -0600

    Merge commit 'debian/2.4.3-1' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/po/ja.po
    	debian/po/sv.po
    
    resolved conflicts from 2.4.3-1ubuntu1

commit 6392b40131df7e5089ac294e76694b1e75b011f1
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:35:15 2010 -0600

    Imported ubuntu 2.4.2-1ubuntu6

commit 943c9fa50afeceb1ac009d9bdbc55824f755f90f
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:34:41 2010 -0600

    Imported ubuntu 2.4.2-1ubuntu5

commit ac5a5e6430088cbf35b36e6ba0150355bd6744ae
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:33:28 2010 -0600

    Imported ubuntu 2.4.2-1ubuntu4

commit 46fcea76c833cffb7fd95f126490635aea864146
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:31:57 2010 -0600

    Imported ubuntu 2.4.2-1ubuntu3

commit 2b5e2cb5ba2638759ec39c3635ab4bcc8812c5b7
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:30:49 2010 -0600

    Imported ubuntu 2.4.2-1ubuntu2

commit d90b36b8494f34a93cd78f8447e64463fd95060f
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:29:46 2010 -0600

    Imported ubuntu 2.4.2-1ubuntu1

commit 65a8e721c94dcada5adadabaf77bb90de61fdf06
Merge: 954b8de b1fde91
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:28:57 2010 -0600

    Merge commit 'debian/2.4.2-1' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/rules
    
    resolve conflicts from 2.4.2-1ubuntu1

commit 954b8de900860dc9431d7cdd290d8b3186568518
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:27:47 2010 -0600

    Imported ubuntu 2.4.1-1ubuntu1

commit fbbba17d579f1b89ef217bb5934778ed7683fdfc
Merge: b534fc0 bc1d2ab
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:27:06 2010 -0600

    Merge commit 'debian/2.4.1-1' into ubuntu
    
    Conflicts:
    	debian/changelog
    	po/fr.po
    
    fix conflicts from 2.4.1-1ubuntu1

commit b534fc0e44589bfe097f8b0ad48ef9ade853dbeb
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:26:10 2010 -0600

    Imported ubuntu 2.4.0-1ubuntu1

commit e2901e34025c26b85d7c0eb59f2191bdff8d238b
Merge: a67ccd4 ef606b0
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:25:15 2010 -0600

    Merge commit 'debian/2.4.0-1' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/control
    
    resolved conflicts with ubuntu 2.4.0-1ubuntu1 versions

commit a67ccd40cc3757d092ea2f69ce74cc6c68a2e804
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:23:45 2010 -0600

    Imported ubuntu 2.2.8-8ubuntu1

commit 3da72dd50dca4e22514e1bb217d5a3817064300b
Merge: f76fc19 8772379
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:22:58 2010 -0600

    Merge commit 'debian/2.2.8-8' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/po/ja.po
    	debian/po/pt.po
    
    conflicts resolved with 2.2.8-8ubuntu1 versions

commit f76fc198e9501cde62d2ef30820176e066a87e33
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:17:37 2010 -0600

    Imported ubuntu 2.2.8-5ubuntu7

commit db16df69c244f6e906f5c741713eae01ea2b3a93
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:16:40 2010 -0600

    Imported ubuntu 2.2.8-5ubuntu6

commit 93651926c13589aad489e1aa6cffd98fdb0d0eb0
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:14:56 2010 -0600

    Imported ubuntu 2.2.8-5ubuntu5

commit 1631718dd556ea84cb3f5220080dc44c5e249bc0
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:13:52 2010 -0600

    Imported ubuntu 2.2.8-5ubuntu4

commit 6995ecec46fc0ff1e18c35a54400940b677e62c2
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:12:43 2010 -0600

    Imported ubuntu 2.2.8-5ubuntu3

commit 5081268512d6dd03e8b20c510bab4c9bd8f4a7a1
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:11:49 2010 -0600

    Imported ubuntu 2.2.8-5ubuntu2

commit 282ec4445fa2895668e846046a260c9ab8845cb5
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Feb 2 10:09:17 2010 -0600

    Imported ubuntu 2.2.8-5ubuntu1

-----------------------------------------------------------------------

-- 
Bacula, a network backup, recovery and verification program

More information about the pkg-bacula-commits mailing list