[debian-edu-commits] debian-edu/slbackup-php.git (#125) - master (branch) updated: debian/0.3-5-83-ge9c8735

Mike Gabriel sunweaver at alioth.debian.org
Fri Mar 22 22:06:31 UTC 2013


The branch, master has been updated
       via  e9c873518e7c1256d404bf168c51467c1f1f0cf4 (commit)
       via  b485d30be7cca2e8d639b95faf58371ec0531813 (commit)
       via  ad0beba3586cbb887fa0728d31851ecc93f256e4 (commit)
       via  6bf0dcfd1d7d02be06a41358841f236b320900c9 (commit)
       via  601f13c780add72382cb3f47c9f486035c2b7f0f (commit)
       via  0a134ae89f71035c271e064cae9d3fafd33a06c9 (commit)
       via  eefe33e23d0691a8c7c222b9f01c723f0675b5d4 (commit)
       via  fba9ea406c75b2e88578f6b09c53c2194d58d085 (commit)
       via  ccc46f6a03c8a1c68174d45a029f5d5d5ffa51ef (commit)
       via  0a3634a7af569f21d184413c22104d2ca1e13860 (commit)
       via  ecb8f44c8d600699a10aeab7716b9fd4b1e55c73 (commit)
       via  72fe08243473f9df4fa0cf4cff88471955aa9a5a (commit)
       via  c54a0417454ee8519db880bb07104951c5e0c082 (commit)
       via  0e8ca51727aa8098a1cbb89fbbd31238c6692f84 (commit)
       via  fb963e548a3cffd16dd05a8da7396cfe5bd7f35c (commit)
       via  89b4c949a9cd83b3192df7317b8f7101cf7c3a87 (commit)
       via  3c77169dfdf82059bbe5269593dfdd52c10581b0 (commit)
       via  1bb5972f1d51735c43b22b15a7717a6ea8a7c89b (commit)
       via  96208813c483e0bdc93f6cf8d21da0bcda7d62d0 (commit)
       via  f68a79e11b90426d7baee08d90dd246c84c6de54 (commit)
       via  5461a7ae35195fb837a98d3ded1b0e2f95b272a1 (commit)
       via  b60a89e8a9f1ccd8ddc9c4562c9f0f2bff2b456b (commit)
       via  c17e25b597b425083ed4204a07278c5b23cdb466 (commit)
       via  3b16f711e65e802bee6679f0408dacec76e6a4e6 (commit)
       via  40e1d2689abfe531dc029e9c397c9e508ce136d1 (commit)
       via  aa63f1c6303f313e748c1666e91dec1ea636617a (commit)
       via  d199838b5b4130334ded50a65a6cca81a41b076c (commit)
       via  c801d0dd88e86f810d66157e6be4891ebb8fa838 (commit)
       via  5a046126feae0662bb12948de6188e31d8d29991 (commit)
       via  b2d37c7fddaeb66e8d8eda7c856adce300724145 (commit)
       via  a81b1cb699b1e3e5f0e518392f7361180e11470f (commit)
       via  001683bbec269e774dd565d46f9f677fe01b4f3d (commit)
       via  8a69349218f145567e68c4db59ba7dc95050ed78 (commit)
       via  9664a72c2768ea2094d1bc22627b01b0c64d6370 (commit)
       via  a54f4452bff65d249a6aa74c7be1fd2356f37788 (commit)
       via  03468a78bfd13e9d2a4285b49789c79979f60e9a (commit)
       via  2271e54879de3377e5a37571d2a69098669607be (commit)
       via  943f01c8b738108f46c90b00ca328e5b355b49a6 (commit)
       via  d069319abc7c68711657dcf812678c2f95425ce6 (commit)
       via  cda362d8e3a2bc7439199eb0aba8bbc0e43b372a (commit)
       via  43a591f89390c751012342f107dfd222dcee4434 (commit)
       via  ab9aa39055c84d6b718e1d3919a223d9349e0262 (commit)
       via  846a5c60389ee4ce4c9d961650b261715f238100 (commit)
       via  67facac926750228225f284135f446330dbe8ac8 (commit)
       via  f2afa3de72d037b25a6c50948137bca76068ae12 (commit)
       via  e7001061ed9b4dc127d98029dbcfa8d5e5b1e70f (commit)
       via  071d5628436190c4aa195a5ea5baa70554275e42 (commit)
       via  23b07069ae6acf7bfa9a31a0ebba52da29b999be (commit)
       via  43aa8f4a6b18f84e91780123eb7f9684c8852d4b (commit)
       via  336d035df77055eabff6053c16d5e6aeed8dc3bd (commit)
       via  c40e4ba7b210cd584dd6c687cd0d048b40815de9 (commit)
       via  07f35188631c681057bcef6c2e94675397d359a0 (commit)
       via  3953607810f8c71ca2ea16ea3e7fd44f767f3c9a (commit)
       via  9ab516944fb5f4f6121a1e93bd12c6207e92312e (commit)
       via  6774adb0c275f342029ed4dec3d7807304e4d6e9 (commit)
       via  23e6c7e825ef7570de4a7840d6dd7f517fa4d8de (commit)
       via  ff0c8b84f95720de80843446a60e96f39cc10dfe (commit)
       via  547c4cdc50b7b5c40b56960268d8f3fdf207821c (commit)
       via  7521db53f58e3417c578b3661d4a351ee4729dc8 (commit)
       via  240d2026ec45a985bfd189d3cf6223eceb8adde2 (commit)
       via  bca97967eda799865459e655cd5ab45c843fd0d9 (commit)
       via  a0a5f5a53caca23171cc9195fd61f702816fc877 (commit)
       via  31032c7cacb59e3e953813ed31061f1b0bb3db1c (commit)
       via  a4fea16dc8659abab018f528450076b73d62e3f5 (commit)
       via  5feb87d4b7ec6b2c94d8c56beb98cbfd2e6433bf (commit)
       via  199215d2693c2942b277e049ac741b8e4553e74c (commit)
      from  aaf5e8f81131f5a3a2891620eecd73105bb15492 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e9c873518e7c1256d404bf168c51467c1f1f0cf4
Merge: b485d30 aaf5e8f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Mar 22 22:57:44 2013 +0100

    Merge branch 'wheezy-updates'
    
    Conflicts (by Mike Gabriel):
    	debian/README.source
    	debian/changelog
    	debian/control
    	debian/rules
    	debian/slbackup.desktop
    	debian/source/format

commit b485d30be7cca2e8d639b95faf58371ec0531813
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 12 14:44:11 2012 +0200

    upload to unstable (debian/0.4.3-1)

commit ad0beba3586cbb887fa0728d31851ecc93f256e4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 12 14:43:51 2012 +0200

    changelog cleanup

commit 6bf0dcfd1d7d02be06a41358841f236b320900c9
Merge: 601f13c 538079e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 12 14:42:24 2012 +0200

    Merge tag 'upstream/0.4.3'
    
    Upstream version 0.4.3
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

commit 601f13c780add72382cb3f47c9f486035c2b7f0f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 12 00:38:00 2012 +0200

    upload to unstable (debian/0.4.2-1)

commit 0a134ae89f71035c271e064cae9d3fafd33a06c9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 12 00:37:14 2012 +0200

    remove all earlier patches, have been included upstream

commit eefe33e23d0691a8c7c222b9f01c723f0675b5d4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 12 00:36:49 2012 +0200

    Revert "upload to unstable (debian/0.4.2-1)"
    
    This reverts commit fba9ea406c75b2e88578f6b09c53c2194d58d085.

commit fba9ea406c75b2e88578f6b09c53c2194d58d085
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 12 00:35:41 2012 +0200

    upload to unstable (debian/0.4.2-1)

commit ccc46f6a03c8a1c68174d45a029f5d5d5ffa51ef
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 12 00:34:50 2012 +0200

    bugs closed re-ordered

commit 0a3634a7af569f21d184413c22104d2ca1e13860
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 12 00:32:47 2012 +0200

    use nonhttps=warn as URL parameter

commit ecb8f44c8d600699a10aeab7716b9fd4b1e55c73
Merge: 72fe082 4f24c2d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 12 00:25:35 2012 +0200

    Merge tag 'upstream/0.4.2'
    
    Upstream version 0.4.2
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog
    	debian/rules

commit 72fe08243473f9df4fa0cf4cff88471955aa9a5a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jul 11 23:32:52 2012 +0200

    /debian/slbackup-php.desktop: Let URL point to http://localhost/slbackup-php.

commit c54a0417454ee8519db880bb07104951c5e0c082
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jul 11 23:31:25 2012 +0200

    /debian/patches/001_no-usr-bin-dir.patch, /debian/patches/002_fix-make-mo-files.patch: Add DEP-3 patch descriptions.

commit 0e8ca51727aa8098a1cbb89fbbd31238c6692f84
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jul 11 23:27:33 2012 +0200

    mark latest version as UNRELEASED

commit fb963e548a3cffd16dd05a8da7396cfe5bd7f35c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jul 11 23:26:10 2012 +0200

    Revert "upload to unstable (debian/0.4.1-1)"
    
    This reverts commit 89b4c949a9cd83b3192df7317b8f7101cf7c3a87.

commit 89b4c949a9cd83b3192df7317b8f7101cf7c3a87
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 22:32:54 2012 +0200

    upload to unstable (debian/0.4.1-1)

commit 3c77169dfdf82059bbe5269593dfdd52c10581b0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 22:32:40 2012 +0200

    /debian/changelog: fix wrong bug number

commit 1bb5972f1d51735c43b22b15a7717a6ea8a7c89b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 22:31:38 2012 +0200

    Revert "upload to unstable (debian/0.4.1-1)"
    
    This reverts commit 96208813c483e0bdc93f6cf8d21da0bcda7d62d0.

commit 96208813c483e0bdc93f6cf8d21da0bcda7d62d0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 22:14:51 2012 +0200

    upload to unstable (debian/0.4.1-1)

commit f68a79e11b90426d7baee08d90dd246c84c6de54
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 22:14:29 2012 +0200

    Revert "Revert "remove duplicate Language: tag from debian/po/sv.po (debconf)""
    
    This reverts commit 3b16f711e65e802bee6679f0408dacec76e6a4e6.

commit 5461a7ae35195fb837a98d3ded1b0e2f95b272a1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 22:14:11 2012 +0200

    Revert "upload to unstable (debian/0.4.1-1)"
    
    This reverts commit b60a89e8a9f1ccd8ddc9c4562c9f0f2bff2b456b.

commit b60a89e8a9f1ccd8ddc9c4562c9f0f2bff2b456b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 22:12:46 2012 +0200

    upload to unstable (debian/0.4.1-1)

commit c17e25b597b425083ed4204a07278c5b23cdb466
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 22:12:28 2012 +0200

    make sure BTS issues get closed with latest changelog entry

commit 3b16f711e65e802bee6679f0408dacec76e6a4e6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 22:09:43 2012 +0200

    Revert "remove duplicate Language: tag from debian/po/sv.po (debconf)"
    
    This reverts commit aa63f1c6303f313e748c1666e91dec1ea636617a.

commit 40e1d2689abfe531dc029e9c397c9e508ce136d1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 22:06:41 2012 +0200

    upload to unstable (debian/0.4.1-1)

commit aa63f1c6303f313e748c1666e91dec1ea636617a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 22:04:41 2012 +0200

    remove duplicate Language: tag from debian/po/sv.po (debconf)

commit d199838b5b4130334ded50a65a6cca81a41b076c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 22:03:25 2012 +0200

    /debian/patches/002_fix-make-mo-files.patch (new): Fix creation of .mo files during package build.

commit c801d0dd88e86f810d66157e6be4891ebb8fa838
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 21:57:48 2012 +0200

    I: slbackup-php: package-contains-empty-directory usr/bin (by patch 001_no-usr-bin-dir.patch)

commit 5a046126feae0662bb12948de6188e31d8d29991
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 21:51:20 2012 +0200

    W: slbackup-php source: dh-clean-k-is-deprecated

commit b2d37c7fddaeb66e8d8eda7c856adce300724145
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 21:46:45 2012 +0200

    /debian/compat: Raise compat level to 7.

commit a81b1cb699b1e3e5f0e518392f7361180e11470f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 21:46:20 2012 +0200

    /debian/watch (new): Provide watch file for upstream source versions.

commit 001683bbec269e774dd565d46f9f677fe01b4f3d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 21:38:04 2012 +0200

    Revert "upload to unstable (debian/0.4.1-1)"
    
    This reverts commit 8a69349218f145567e68c4db59ba7dc95050ed78.

commit 8a69349218f145567e68c4db59ba7dc95050ed78
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 17:00:41 2012 +0200

    upload to unstable (debian/0.4.1-1)

commit 9664a72c2768ea2094d1bc22627b01b0c64d6370
Merge: a54f445 90d69ab
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 16:54:40 2012 +0200

    Merge tag 'upstream/0.4.1'
    
    Upstream version 0.4.1
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog
    	debian/control
    	debian/po/sv.po

commit a54f4452bff65d249a6aa74c7be1fd2356f37788
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 8 16:40:56 2012 +0200

    Drop complete patch series.

commit 03468a78bfd13e9d2a4285b49789c79979f60e9a
Merge: 2271e54 076f534
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 1 12:28:05 2012 +0200

    Merge tag 'upstream/0.4.0'
    
    Upstream version 0.4.0
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog
    	debian/control
    	debian/po/sv.po
    	debian/rules
    	debian/source/format

commit 2271e54879de3377e5a37571d2a69098669607be
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 23:19:37 2012 +0200

    /debian/control: Add Vcs-Git and Vcs-Browser, add Homepage fields (fix lintian issue: P: slbackup-php: no-homepage-field)

commit 943f01c8b738108f46c90b00ca328e5b355b49a6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 23:06:07 2012 +0200

    P: slbackup-php source: unneeded-build-dep-on-quilt

commit d069319abc7c68711657dcf812678c2f95425ce6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 22:21:48 2012 +0200

    whitespace fix

commit cda362d8e3a2bc7439199eb0aba8bbc0e43b372a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 22:21:34 2012 +0200

        100_slbackup-php_fix-language-detection.patch  *  + I: slbackup-php: package-contains-empty-directory usr/bin/

commit 43a591f89390c751012342f107dfd222dcee4434
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 22:19:13 2012 +0200

    * Lintian issues fixed:
      + I: slbackup-php source: quilt-patch-missing-description
        003_slbackup-php_fix-failed-in-status-template.patch
      + I: slbackup-php source: quilt-patch-missing-description
        004_slbackup-php_translate-status-for.patch
      + I: slbackup-php source: quilt-patch-missing-description
        005_slbackup-php_chmod-cron-file.patch
      + I: slbackup-php source: quilt-patch-missing-description
        099_slbackup-php_i18n-pot-po-update.patch
      + I: slbackup-php source: quilt-patch-missing-description
        100_slbackup-php_fix-language-detection.patch

commit ab9aa39055c84d6b718e1d3919a223d9349e0262
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 22:10:37 2012 +0200

    /debian/rules: Remove dh_quilt_(un)patch calls.

commit 846a5c60389ee4ce4c9d961650b261715f238100
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 22:07:36 2012 +0200

    /debian/source/format: Switch to "3.0 (quilt)".

commit 67facac926750228225f284135f446330dbe8ac8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 15:53:52 2012 +0200

    /debian/control: typo fix

commit f2afa3de72d037b25a6c50948137bca76068ae12
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 15:52:23 2012 +0200

    Revert "/debian/control: typo fix"
    
    This reverts commit e7001061ed9b4dc127d98029dbcfa8d5e5b1e70f.

commit e7001061ed9b4dc127d98029dbcfa8d5e5b1e70f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 15:51:56 2012 +0200

    /debian/control: typo fix

commit 071d5628436190c4aa195a5ea5baa70554275e42
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 15:45:48 2012 +0200

    fixing md5 checksum of the upstream tarball, re-importing upstream tarball and re-merging packaging files

commit 23b07069ae6acf7bfa9a31a0ebba52da29b999be
Merge: 43aa8f4 5c3763c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 11 15:37:05 2012 +0200

    Merge tag 'upstream/0.3'
    
    Upstream version 0.3
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog
    	debian/control
    	debian/po/cs.po
    	debian/po/da.po
    	debian/po/de.po
    	debian/po/es.po
    	debian/po/eu.po
    	debian/po/fi.po
    	debian/po/fr.po
    	debian/po/gl.po
    	debian/po/ja.po
    	debian/po/nl.po
    	debian/po/pt.po
    	debian/po/ru.po
    	debian/po/sv.po
    	debian/po/vi.po
    	debian/rules

commit 43aa8f4a6b18f84e91780123eb7f9684c8852d4b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 20 15:42:00 2012 +0200

    New maintainer, package becomes team-maintained: Debian Edu Packaging Team.

commit 336d035df77055eabff6053c16d5e6aeed8dc3bd
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Apr 25 13:00:42 2012 +0200

    release debian/0.3-5

commit c40e4ba7b210cd584dd6c687cd0d048b40815de9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Apr 25 12:59:25 2012 +0200

    Bump Standards to 3.9.3.

commit 07f35188631c681057bcef6c2e94675397d359a0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Apr 25 12:58:58 2012 +0200

    Fix lintian warnings: debian-rules-missing-recommended-target build-arch, debian-rules-missing-recommended-target build-indep.

commit 3953607810f8c71ca2ea16ea3e7fd44f767f3c9a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Apr 25 12:52:12 2012 +0200

    Closing #670095 in changelog after a series of tests.

commit 9ab516944fb5f4f6121a1e93bd12c6207e92312e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Apr 25 12:50:19 2012 +0200

    Run debconf-updatepo during /debian/rules build, not clean. Makes slbackup-php buildable with git-buildpackage.

commit 6774adb0c275f342029ed4dec3d7807304e4d6e9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Apr 25 11:30:16 2012 +0200

    Add patch: 005_slbackup-php_chmod-cron-file.patch. Make sure the remote CRON tab file has file permission 0644.

commit 23e6c7e825ef7570de4a7840d6dd7f517fa4d8de
Author: taffit <taffit at 6e500793-9bee-0310-a5b0-9d0909bd054d>
Date:   Tue Mar 20 02:33:19 2012 +0000

    (fr) Proofread
    
    git-svn-id: svn+ssh://svn.debian.org/svn/debian-edu/trunk/src/slbackup-php@77099 6e500793-9bee-0310-a5b0-9d0909bd054d

commit ff0c8b84f95720de80843446a60e96f39cc10dfe
Author: taffit <taffit at 6e500793-9bee-0310-a5b0-9d0909bd054d>
Date:   Mon Mar 19 22:58:17 2012 +0000

    Add missing semicolon
    
    git-svn-id: svn+ssh://svn.debian.org/svn/debian-edu/trunk/src/slbackup-php@77098 6e500793-9bee-0310-a5b0-9d0909bd054d

commit 547c4cdc50b7b5c40b56960268d8f3fdf207821c
Author: taffit <taffit at 6e500793-9bee-0310-a5b0-9d0909bd054d>
Date:   Mon Mar 19 18:32:52 2012 +0000

    (fr) Proofread [ Cédric Boutillier ] <20120319104436.GA8248 at spin>
    
    git-svn-id: svn+ssh://svn.debian.org/svn/debian-edu/trunk/src/slbackup-php@77097 6e500793-9bee-0310-a5b0-9d0909bd054d

commit 7521db53f58e3417c578b3661d4a351ee4729dc8
Author: taffit <taffit at 6e500793-9bee-0310-a5b0-9d0909bd054d>
Date:   Mon Mar 19 03:14:03 2012 +0000

    “Properly” handle French translation as a patch; remove already existing (as a patch) German translation
    
    git-svn-id: svn+ssh://svn.debian.org/svn/debian-edu/trunk/src/slbackup-php@77089 6e500793-9bee-0310-a5b0-9d0909bd054d

commit 240d2026ec45a985bfd189d3cf6223eceb8adde2
Author: taffit <taffit at 6e500793-9bee-0310-a5b0-9d0909bd054d>
Date:   Mon Mar 19 02:35:48 2012 +0000

    Initial French translation of slbackup-php
    
    git-svn-id: svn+ssh://svn.debian.org/svn/debian-edu/trunk/src/slbackup-php@77088 6e500793-9bee-0310-a5b0-9d0909bd054d

commit bca97967eda799865459e655cd5ab45c843fd0d9
Author: holger <holger at 6e500793-9bee-0310-a5b0-9d0909bd054d>
Date:   Tue Mar 6 22:00:06 2012 +0000

    add changelog entry for wolfgang
    
    git-svn-id: svn+ssh://svn.debian.org/svn/debian-edu/trunk/src/slbackup-php@76937 6e500793-9bee-0310-a5b0-9d0909bd054d

commit a0a5f5a53caca23171cc9195fd61f702816fc877
Author: schweer-guest <schweer-guest at 6e500793-9bee-0310-a5b0-9d0909bd054d>
Date:   Tue Mar 6 21:01:44 2012 +0000

    New translation to German of slbackup-php.pot (backup web page)
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/debian-edu/trunk/src/slbackup-php@76936 6e500793-9bee-0310-a5b0-9d0909bd054d

commit 31032c7cacb59e3e953813ed31061f1b0bb3db1c
Author: mike-gabriel-guest <mike-gabriel-guest at 6e500793-9bee-0310-a5b0-9d0909bd054d>
Date:   Thu Jan 19 15:01:23 2012 +0000

    release slbackup-php 0.3-4 (targeting Debian sid)
    
    git-svn-id: svn+ssh://svn.debian.org/svn/debian-edu/trunk/src/slbackup-php@75558 6e500793-9bee-0310-a5b0-9d0909bd054d

commit a4fea16dc8659abab018f528450076b73d62e3f5
Author: mike-gabriel-guest <mike-gabriel-guest at 6e500793-9bee-0310-a5b0-9d0909bd054d>
Date:   Thu Jan 19 14:59:45 2012 +0000

    slbackup-php: update debconf i18n file headers
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/debian-edu/trunk/src/slbackup-php@75557 6e500793-9bee-0310-a5b0-9d0909bd054d

commit 5feb87d4b7ec6b2c94d8c56beb98cbfd2e6433bf
Author: mike-gabriel-guest <mike-gabriel-guest at 6e500793-9bee-0310-a5b0-9d0909bd054d>
Date:   Thu Jan 19 14:49:43 2012 +0000

    Add upstream Vcs-Browser location to README.Source.
    
    git-svn-id: svn+ssh://svn.debian.org/svn/debian-edu/trunk/src/slbackup-php@75556 6e500793-9bee-0310-a5b0-9d0909bd054d

commit 199215d2693c2942b277e049ac741b8e4553e74c
Author: mike-gabriel-guest <mike-gabriel-guest at 6e500793-9bee-0310-a5b0-9d0909bd054d>
Date:   Thu Jan 19 14:46:57 2012 +0000

    slbackup-php changelog cleanup: bump everything that is not appropriate for squeeze-proposed-updates into version 0.3-4 (targeted for Debian sid)
    
    git-svn-id: svn+ssh://svn.debian.org/svn/debian-edu/trunk/src/slbackup-php@75555 6e500793-9bee-0310-a5b0-9d0909bd054d

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

Summary of changes:
 debian/README.source    |    7 +++++++
 debian/changelog        |    3 ---
 debian/control          |   16 ++++++++++++++--
 debian/rules            |    5 +----
 debian/slbackup.desktop |    2 ++
 debian/source/format    |    2 +-
 debian/watch            |    4 ++++
 7 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 debian/watch

The diff of changes is:
diff --git a/debian/README.source b/debian/README.source
index 5dde0bf..e53b155 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,3 +1,10 @@
+UPSTREAM
+--------
+slbackup and slbackup-php upstream are developed on Alioth SVN:
+http://anonscm.debian.org/viewvc/slbackup/
+
+PATCH SYSTEM
+------------
 This package uses quilt to manage all modifications to the upstream
 source.  Changes are stored in the source package as diffs in
 debian/patches and applied during the build.
diff --git a/debian/changelog b/debian/changelog
index 9277adf..31e9015 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -71,8 +71,6 @@ slbackup-php (0.3-3) unstable; urgency=low
     for last failed backup really show timestamp of the last failed backup
     and not erroneously the timestamp of the last successful backup.
 
-  * Upload sponsored by Petter Reinholdtsen.
-
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 18 Jan 2012 17:05:14 +0100
 
 slbackup-php (0.3-2.2) unstable; urgency=low
@@ -142,7 +140,6 @@ slbackup-php (0.3-1) unstable; urgency=low
     Thanks to everybody who provided a translation!
   * Added translation of slbackup-php itself. 
     Thanks to Daniel Nylander.
-  * 
 
  -- Patrick Winnertz <patrick.winnertz at skolelinux.org>  Fri, 13 Jul 2007 21:16:33 +0200
 
diff --git a/debian/control b/debian/control
index a11afcd..fe7f973 100644
--- a/debian/control
+++ b/debian/control
@@ -8,11 +8,23 @@ Uploaders:
  Morten Werner Olsen <werner at debian.org>,
  Finn-Arne Johansen <faj at bzz.no>
 Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 5), po-debconf, smarty-gettext, php5-cli, quilt (>= 0.46-7~)
+Build-Depends:
+ debhelper (>= 7.0.50~),
+ po-debconf,
+Homepage: http://anonscm.debian.org/gitweb/?p=debian-edu/upstream/slbackup-php.git;a=summary
+Vcs-Git: git://git.debian.org/debian-edu/slbackup-php.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-edu/slbackup-php.git;a=summary
 
 Package: slbackup-php
 Architecture: all
-Depends: ${misc:Depends}, libapache2-mod-php5, apache2, smarty3, ssh, php5-cli, smarty-gettext (>= 1.0b1-7)
+Depends:
+ ${misc:Depends},
+ libapache2-mod-php5,
+ apache2,
+ ssh,
+ php5-cli,
+ smarty3,
+ smarty-gettext (>= 1.0b1-7),
 Description: Web-based administration tool for slbackup
  Slbackup-php provides the necessary functions to maintain a slbackup
  repository.
diff --git a/debian/rules b/debian/rules
index 1b7e3c7..100995b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,14 +22,12 @@ clean:
 	dh_testroot
 	rm -f build-stamp
 	[ ! -f Makefile ] || $(MAKE) clean
-	dh_quilt_unpatch
 	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
-	dh_quilt_patch
+	dh_clean
 	-$(MAKE) mo-files
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/slbackup-php prefix=/usr
@@ -42,7 +40,6 @@ binary-indep: build install
 	dh_testroot
 	dh_installchangelogs 
 	dh_installdocs ./ChangeLog 
-	#dh_installdocs 
 	mv $(CURDIR)/debian/slbackup-php/usr/share/doc/slbackup-php/ChangeLog $(CURDIR)/debian/slbackup-php/usr/share/doc/slbackup-php/changelog
 	dh_installcron
 	dh_installdebconf
diff --git a/debian/slbackup.desktop b/debian/slbackup.desktop
index 1b00406..19c3018 100644
--- a/debian/slbackup.desktop
+++ b/debian/slbackup.desktop
@@ -4,6 +4,8 @@ Name=slbackup-php
 GenericName=SLBackup configuration tool
 Comment=Webpage for configuring slbackup
 Version=1.0
+TryExec=x-www-browser http://localhost/slbackup-php/?nonhttps=warn
+Exec=x-www-browser http://localhost/slbackup-php/?nonhttps=warn
 TryExec=x-www-browser http://localhost/slbackup-php/
 Exec=x-www-browser http://localhost/slbackup-php/
 Terminal=false
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..b06bbc3
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+http://alioth.debian.org/frs/?group_id=30229 \
+  /frs/download.php/.*/slbackup-php-(.*)\.tar\.gz
+


hooks/post-receive
-- 
slbackup-php.git (Debian package slbackup-php)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "slbackup-php.git" (Debian package slbackup-php).




More information about the debian-edu-commits mailing list